Fixed exchange rate storage in GRN transactions.
[fa-stable.git] / lang / new_language_template / LC_MESSAGES / empty.po
index a3b3a34f26865438c6cd2f66f5a8d2fb87f90afd..40932dd23787ca73ab45be74de586022c8ee7e84 100644 (file)
@@ -8,13 +8,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-13 23:51+0100\n"
+"POT-Creation-Date: 2014-12-25 16:46+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"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../frontaccounting.php:73
@@ -23,257 +23,176 @@ msgid "Main  Menu"
 msgstr ""
 
 #: ../frontaccounting.php:75
-#: ../access/logout.php:17
-#: ../themes/default/renderer.php:52
-#: ../themes/default/renderer.php:78
-#: ../themes/exclusive/renderer.php:42
-#: ../themes/exclusive/renderer.php:51
+#: ../access/logout.php:21
+#: ../themes/default/renderer.php:70
+#: ../themes/default/renderer.php:83
 msgid "Logout"
 msgstr ""
 
-#: ../link_test.php:38
-msgid "Trans Link Test"
-msgstr ""
-
 #: ../access/login.php:13
-#: ../access/sav.login.php:13
+#: ../access/password_reset.php:13
 msgid "Restricted access"
 msgstr ""
 
-#: ../access/login.php:33
-#: ../access/sav.login.php:33
+#: ../access/login.php:27
 msgid "Login as user: demouser and password: password"
 msgstr ""
 
-#: ../access/login.php:37
-#: ../access/sav.login.php:37
+#: ../access/login.php:31
 msgid "Please login here"
 msgstr ""
 
-#: ../access/login.php:45
-#: ../access/login.php:75
-#: ../access/sav.login.php:45
-#: ../access/sav.login.php:75
+#: ../access/login.php:33
+msgid "or"
+msgstr ""
+
+#: ../access/login.php:33
+msgid "request new password"
+msgstr ""
+
+#: ../access/login.php:39
+msgid "Too many failed login attempts.<br>Please wait a while or try later."
+msgstr ""
+
+#: ../access/login.php:52
+#: ../access/login.php:83
 msgid "Authorization timeout"
 msgstr ""
 
-#: ../access/login.php:45
-#: ../access/login.php:82
-#: ../access/sav.login.php:45
-#: ../access/sav.login.php:82
+#: ../access/login.php:52
+#: ../access/login.php:90
 msgid "Login"
 msgstr ""
 
-#: ../access/login.php:82
-#: ../access/sav.login.php:82
-#: ../admin/inst_upgrade.php:137
+#: ../access/login.php:90
+#: ../access/password_reset.php:61
+#: ../admin/inst_upgrade.php:141
 msgid "Version"
 msgstr ""
 
-#: ../access/login.php:85
-#: ../access/sav.login.php:85
+#: ../access/login.php:93
 msgid "User name"
 msgstr ""
 
-#: ../access/login.php:89
-#: ../admin/change_current_user_password.php:78
-#: ../admin/users.php:191
+#: ../access/login.php:97
+#: ../admin/users.php:200
 msgid "Password:"
 msgstr ""
 
-#: ../access/login.php:98
-#: ../access/sav.login.php:98
-#: ../admin/create_coy.php:240
-#: ../admin/create_coy.php:324
+#: ../access/login.php:107
+#: ../access/login.php:114
+#: ../access/password_reset.php:70
+#: ../access/password_reset.php:77
+#: ../admin/create_coy.php:253
+#: ../admin/create_coy.php:336
+#: ../includes/sysnames.inc:194
 msgid "Company"
 msgstr ""
 
-#: ../access/login.php:107
-#: ../access/sav.login.php:107
+#: ../access/login.php:121
 msgid "Login -->"
 msgstr ""
 
-#: ../access/login.php:136
-#: ../access/sav.login.php:137
-#: ../admin/display_prefs.php:111
-#: ../themes/default/renderer.php:123
-#: ../themes/exclusive/renderer.php:154
+#: ../access/login.php:156
+#: ../access/password_reset.php:108
+#: ../admin/display_prefs.php:112
+#: ../themes/default/renderer.php:129
 msgid "Theme:"
 msgstr ""
 
-#: ../access/logout.php:28
+#: ../access/logout.php:32
 msgid "Thank you for using"
 msgstr ""
 
-#: ../access/logout.php:39
+#: ../access/logout.php:43
 msgid "Click here to Login Again."
 msgstr ""
 
-#: ../access/sav.login.php:89
-msgid "Password"
+#: ../access/password_reset.php:31
+#: ../access/password_reset.php:61
+msgid "Password reset"
+msgstr ""
+
+#: ../access/password_reset.php:63
+#: ../reporting/rep103.php:277
+#: ../reporting/rep106.php:88
+#: ../reporting/rep205.php:195
+#: ../reporting/includes/header2.inc:113
+#: ../sales/manage/sales_people.php:99
+msgid "Email"
+msgstr ""
+
+#: ../access/password_reset.php:83
+msgid "Send password -->"
 msgstr ""
 
-#: ../admin/attachments.php:72
+#: ../admin/attachments.php:74
 msgid "Attach Documents"
 msgstr ""
 
-#: ../admin/attachments.php:119
+#: ../admin/attachments.php:86
+msgid "Selected transaction does not exists."
+msgstr ""
+
+#: ../admin/attachments.php:88
+msgid "Select attachment file."
+msgstr ""
+
+#: ../admin/attachments.php:128
 msgid "Attachment has been inserted."
 msgstr ""
 
-#: ../admin/attachments.php:125
+#: ../admin/attachments.php:134
 msgid "Attachment has been updated."
 msgstr ""
 
-#: ../admin/attachments.php:137
+#: ../admin/attachments.php:149
 msgid "Attachment has been deleted."
 msgstr ""
 
-#: ../admin/attachments.php:155
+#: ../admin/attachments.php:167
 #: ../admin/view_print_transaction.php:72
 #: ../gl/inquiry/journal_inquiry.php:47
 #: ../inventory/includes/item_adjustments_ui.inc:47
-#: ../manufacturing/work_order_add_finished.php:203
-#: ../manufacturing/work_order_costs.php:142
+#: ../manufacturing/work_order_add_finished.php:200
+#: ../manufacturing/work_order_costs.php:136
 #: ../manufacturing/work_order_entry.php:377
 #: ../manufacturing/work_order_entry.php:385
-#: ../manufacturing/includes/work_order_issue_ui.inc:157
+#: ../manufacturing/includes/work_order_issue_ui.inc:168
 #: ../sales/inquiry/customer_allocation_inquiry.php:47
 msgid "Type:"
 msgstr ""
 
-#: ../admin/attachments.php:167
-#: ../admin/view_print_transaction.php:126
-#: ../admin/void_transaction.php:164
-#: ../dimensions/inquiry/search_dimensions.php:127
-#: ../dimensions/view/view_dimension.php:54
-#: ../gl/bank_account_reconcile.php:234
-#: ../gl/inquiry/bank_inquiry.php:67
-#: ../gl/inquiry/gl_account_inquiry.php:125
-#: ../gl/inquiry/journal_inquiry.php:120
-#: ../gl/inquiry/journal_inquiry.php:133
-#: ../includes/ui/allocation_cart.inc:263
-#: ../inventory/inquiry/stock_movements.php:76
-#: ../manufacturing/search_work_orders.php:159
-#: ../manufacturing/includes/manufacturing_ui.inc:157
-#: ../manufacturing/includes/manufacturing_ui.inc:200
-#: ../manufacturing/includes/manufacturing_ui.inc:236
-#: ../manufacturing/includes/manufacturing_ui.inc:276
-#: ../manufacturing/includes/manufacturing_ui.inc:280
-#: ../manufacturing/includes/manufacturing_ui.inc:331
-#: ../purchasing/view/view_po.php:115
-#: ../purchasing/view/view_po.php:140
-#: ../purchasing/inquiry/po_search_completed.php:116
-#: ../purchasing/inquiry/po_search.php:130
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:126
-#: ../purchasing/inquiry/supplier_inquiry.php:163
-#: ../purchasing/allocations/supplier_allocation_main.php:95
-#: ../reporting/rep101.php:130
-#: ../reporting/rep201.php:118
-#: ../reporting/rep203.php:91
-#: ../reporting/rep601.php:76
-#: ../reporting/rep704.php:78
-#: ../reporting/rep704.php:81
-#: ../reporting/rep704.php:84
-#: ../reporting/rep710.php:76
-#: ../reporting/includes/doctext.inc:108
-#: ../reporting/includes/doctext.inc:116
-#: ../sales/allocations/customer_allocation_main.php:94
-#: ../sales/view/view_sales_order.php:95
-#: ../sales/view/view_sales_order.php:128
-#: ../sales/view/view_sales_order.php:160
-#: ../sales/inquiry/customer_allocation_inquiry.php:142
-#: ../sales/inquiry/customer_inquiry.php:213
-msgid "#"
-msgstr ""
-
-#: ../admin/attachments.php:167
-#: ../admin/attachments.php:217
-#: ../admin/crm_categories.php:88
-#: ../admin/inst_upgrade.php:137
-#: ../admin/payment_terms.php:127
-#: ../admin/printers.php:84
-#: ../admin/print_profiles.php:148
-#: ../gl/inquiry/tax_inquiry.php:82
-#: ../gl/manage/gl_quick_entries.php:186
-#: ../gl/manage/gl_quick_entries.php:224
-#: ../includes/ui/view_package.php:22
-#: ../inventory/manage/item_codes.php:123
-#: ../inventory/manage/item_units.php:94
-#: ../inventory/manage/movement_types.php:95
-#: ../inventory/manage/sales_kits.php:40
-#: ../inventory/view/view_adjustment.php:56
-#: ../inventory/view/view_transfer.php:56
-#: ../manufacturing/manage/bom_edit.php:70
-#: ../manufacturing/includes/manufacturing_ui.inc:28
-#: ../purchasing/includes/ui/invoice_ui.inc:470
-#: ../purchasing/includes/ui/invoice_ui.inc:482
-#: ../purchasing/po_receive_items.php:62
-#: ../reporting/rep104.php:109
-#: ../reporting/rep105.php:112
-#: ../reporting/rep204.php:82
-#: ../reporting/rep303.php:109
-#: ../reporting/rep303.php:115
-#: ../reporting/rep304.php:114
-#: ../reporting/rep305.php:72
-#: ../reporting/rep401.php:69
-#: ../sales/create_recurrent_invoices.php:98
-#: ../sales/manage/credit_status.php:97
-#: ../sales/manage/recurrent_invoices.php:85
-#: ../sales/inquiry/sales_orders_view.php:284
-#: ../sales/inquiry/sales_orders_view.php:288
-#: ../taxes/tax_groups.php:146
-#: ../taxes/tax_types.php:115
-msgid "Description"
-msgstr ""
-
-#: ../admin/attachments.php:167
-#: ../admin/backups.php:60
-#: ../admin/backups.php:142
-msgid "Filename"
-msgstr ""
-
-#: ../admin/attachments.php:167
-msgid "Size"
-msgstr ""
-
-#: ../admin/attachments.php:167
-msgid "Filetype"
-msgstr ""
-
-#: ../admin/attachments.php:167
-msgid "Date Uploaded"
-msgstr ""
-
-#: ../admin/attachments.php:182
-#: ../admin/create_coy.php:264
-#: ../admin/crm_categories.php:106
+#: ../admin/attachments.php:183
+#: ../admin/create_coy.php:277
+#: ../admin/crm_categories.php:115
 #: ../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:144
+#: ../admin/users.php:153
 #: ../dimensions/inquiry/search_dimensions.php:120
-#: ../gl/inquiry/journal_inquiry.php:111
-#: ../gl/manage/bank_accounts.php:126
-#: ../gl/manage/currencies.php:166
+#: ../gl/inquiry/journal_inquiry.php:118
+#: ../gl/manage/bank_accounts.php:133
+#: ../gl/manage/currencies.php:164
 #: ../gl/manage/exchange_rates.php:94
 #: ../gl/manage/gl_account_classes.php:132
-#: ../gl/manage/gl_account_types.php:148
+#: ../gl/manage/gl_account_types.php:154
 #: ../gl/manage/gl_quick_entries.php:196
 #: ../gl/manage/gl_quick_entries.php:295
-#: ../gl/includes/ui/gl_bank_ui.inc:155
-#: ../gl/includes/ui/gl_journal_ui.inc:122
+#: ../gl/includes/ui/gl_bank_ui.inc:186
+#: ../gl/includes/ui/gl_journal_ui.inc:134
 #: ../includes/ui/contacts_view.inc:64
 #: ../includes/ui/simple_crud_class.inc:52
-#: ../inventory/prices.php:145
-#: ../inventory/purchasing_data.php:144
-#: ../inventory/includes/item_adjustments_ui.inc:87
-#: ../inventory/includes/stock_transfers_ui.inc:79
+#: ../includes/ui/ui_input.inc:961
+#: ../inventory/prices.php:159
+#: ../inventory/purchasing_data.php:165
+#: ../inventory/includes/item_adjustments_ui.inc:91
+#: ../inventory/includes/stock_transfers_ui.inc:83
 #: ../inventory/manage/item_categories.php:121
-#: ../inventory/manage/item_codes.php:138
+#: ../inventory/manage/item_codes.php:140
 #: ../inventory/manage/item_units.php:110
 #: ../inventory/manage/locations.php:161
 #: ../inventory/manage/movement_types.php:106
@@ -281,281 +200,417 @@ msgstr ""
 #: ../manufacturing/search_work_orders.php:109
 #: ../manufacturing/manage/bom_edit.php:86
 #: ../manufacturing/manage/work_centres.php:114
-#: ../manufacturing/includes/work_order_issue_ui.inc:58
-#: ../purchasing/includes/ui/invoice_ui.inc:519
-#: ../purchasing/includes/ui/po_ui.inc:266
-#: ../purchasing/inquiry/po_search_completed.php:101
-#: ../purchasing/inquiry/po_search.php:87
+#: ../manufacturing/includes/work_order_issue_ui.inc:63
+#: ../purchasing/includes/ui/invoice_ui.inc:557
+#: ../purchasing/includes/ui/po_ui.inc:275
+#: ../purchasing/inquiry/po_search_completed.php:108
+#: ../purchasing/inquiry/po_search.php:89
 #: ../sales/manage/credit_status.php:119
 #: ../sales/manage/customer_branches.php:159
-#: ../sales/manage/recurrent_invoices.php:113
+#: ../sales/manage/recurrent_invoices.php:130
 #: ../sales/manage/sales_areas.php:103
 #: ../sales/manage/sales_groups.php:99
 #: ../sales/manage/sales_people.php:119
 #: ../sales/manage/sales_points.php:99
 #: ../sales/manage/sales_types.php:121
-#: ../sales/inquiry/customer_inquiry.php:186
-#: ../sales/inquiry/sales_deliveries_view.php:154
-#: ../sales/inquiry/sales_orders_view.php:123
+#: ../sales/inquiry/sales_deliveries_view.php:156
+#: ../sales/inquiry/sales_orders_view.php:136
 #: ../sales/includes/ui/sales_credit_ui.inc:197
-#: ../sales/includes/ui/sales_order_ui.inc:202
-#: ../taxes/item_tax_types.php:134
-#: ../taxes/tax_groups.php:168
+#: ../sales/includes/ui/sales_order_ui.inc:197
+#: ../taxes/item_tax_types.php:139
+#: ../taxes/sav.tax_types.php:211
+#: ../taxes/sav.tax_types.php:262
+#: ../taxes/tax_groups.php:137
 #: ../taxes/tax_types.php:132
 msgid "Edit"
 msgstr ""
 
-#: ../admin/attachments.php:183
-#: ../gl/inquiry/journal_inquiry.php:128
+#: ../admin/attachments.php:188
+#: ../gl/inquiry/journal_inquiry.php:135
 msgid "View"
 msgstr ""
 
-#: ../admin/attachments.php:184
+#: ../admin/attachments.php:193
 msgid "Download"
 msgstr ""
 
-#: ../admin/attachments.php:185
-#: ../admin/create_coy.php:265
-#: ../admin/crm_categories.php:110
+#: ../admin/attachments.php:198
+#: ../admin/create_coy.php:278
+#: ../admin/crm_categories.php:119
 #: ../admin/fiscalyears.php:166
 #: ../admin/inst_chart.php:80
 #: ../admin/inst_lang.php:109
-#: ../admin/inst_module.php:144
+#: ../admin/inst_module.php:143
 #: ../admin/inst_theme.php:102
 #: ../admin/payment_terms.php:143
 #: ../admin/printers.php:97
 #: ../admin/shipping_companies.php:107
 #: ../admin/tags.php:141
-#: ../admin/users.php:146
+#: ../admin/users.php:155
 #: ../gl/gl_budget.php:137
-#: ../gl/manage/bank_accounts.php:127
-#: ../gl/manage/currencies.php:168
+#: ../gl/manage/bank_accounts.php:134
+#: ../gl/manage/currencies.php:166
 #: ../gl/manage/exchange_rates.php:99
 #: ../gl/manage/gl_account_classes.php:133
-#: ../gl/manage/gl_account_types.php:149
+#: ../gl/manage/gl_account_types.php:155
 #: ../gl/manage/gl_quick_entries.php:197
 #: ../gl/manage/gl_quick_entries.php:296
-#: ../gl/includes/ui/gl_bank_ui.inc:157
-#: ../gl/includes/ui/gl_journal_ui.inc:124
+#: ../gl/includes/ui/gl_bank_ui.inc:188
+#: ../gl/includes/ui/gl_journal_ui.inc:136
 #: ../includes/ui/contacts_view.inc:67
 #: ../includes/ui/simple_crud_class.inc:54
-#: ../includes/ui/ui_input.inc:281
-#: ../inventory/prices.php:146
-#: ../inventory/purchasing_data.php:145
-#: ../inventory/includes/item_adjustments_ui.inc:89
-#: ../inventory/includes/stock_transfers_ui.inc:81
+#: ../includes/ui/ui_input.inc:286
+#: ../inventory/prices.php:160
+#: ../inventory/purchasing_data.php:166
+#: ../inventory/includes/item_adjustments_ui.inc:93
+#: ../inventory/includes/stock_transfers_ui.inc:85
 #: ../inventory/manage/item_categories.php:122
-#: ../inventory/manage/item_codes.php:139
+#: ../inventory/manage/item_codes.php:141
 #: ../inventory/manage/item_units.php:111
 #: ../inventory/manage/locations.php:162
 #: ../inventory/manage/movement_types.php:107
 #: ../inventory/manage/sales_kits.php:56
 #: ../manufacturing/manage/bom_edit.php:87
 #: ../manufacturing/manage/work_centres.php:115
-#: ../manufacturing/includes/work_order_issue_ui.inc:60
-#: ../purchasing/includes/ui/invoice_ui.inc:284
-#: ../purchasing/includes/ui/po_ui.inc:268
+#: ../manufacturing/includes/work_order_issue_ui.inc:65
+#: ../purchasing/includes/ui/invoice_ui.inc:319
+#: ../purchasing/includes/ui/po_ui.inc:277
 #: ../sales/manage/credit_status.php:120
 #: ../sales/manage/customer_branches.php:163
-#: ../sales/manage/recurrent_invoices.php:114
+#: ../sales/manage/recurrent_invoices.php:131
 #: ../sales/manage/sales_areas.php:104
 #: ../sales/manage/sales_groups.php:100
 #: ../sales/manage/sales_people.php:120
 #: ../sales/manage/sales_points.php:100
 #: ../sales/manage/sales_types.php:122
 #: ../sales/includes/ui/sales_credit_ui.inc:199
-#: ../sales/includes/ui/sales_order_ui.inc:204
-#: ../taxes/item_tax_types.php:135
-#: ../taxes/tax_groups.php:169
+#: ../sales/includes/ui/sales_order_ui.inc:199
+#: ../taxes/item_tax_types.php:140
+#: ../taxes/sav.tax_types.php:212
+#: ../taxes/tax_groups.php:138
 #: ../taxes/tax_types.php:133
 msgid "Delete"
 msgstr ""
 
-#: ../admin/attachments.php:211
-#: ../admin/attachments.php:216
+#: ../admin/attachments.php:205
+#: ../admin/view_print_transaction.php:126
+#: ../admin/void_transaction.php:181
+#: ../dimensions/inquiry/search_dimensions.php:127
+#: ../dimensions/view/view_dimension.php:55
+#: ../gl/bank_account_reconcile.php:232
+#: ../gl/inquiry/bank_inquiry.php:70
+#: ../gl/inquiry/gl_account_inquiry.php:126
+#: ../gl/inquiry/journal_inquiry.php:127
+#: ../gl/inquiry/journal_inquiry.php:140
+#: ../includes/ui/allocation_cart.inc:290
+#: ../inventory/inquiry/stock_movements.php:78
+#: ../manufacturing/search_work_orders.php:159
+#: ../manufacturing/includes/manufacturing_ui.inc:157
+#: ../manufacturing/includes/manufacturing_ui.inc:200
+#: ../manufacturing/includes/manufacturing_ui.inc:236
+#: ../manufacturing/includes/manufacturing_ui.inc:276
+#: ../manufacturing/includes/manufacturing_ui.inc:280
+#: ../manufacturing/includes/manufacturing_ui.inc:331
+#: ../purchasing/view/view_po.php:115
+#: ../purchasing/view/view_po.php:140
+#: ../purchasing/inquiry/po_search_completed.php:123
+#: ../purchasing/inquiry/po_search.php:132
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:127
+#: ../purchasing/inquiry/supplier_inquiry.php:174
+#: ../purchasing/allocations/supplier_allocation_main.php:95
+#: ../reporting/rep101.php:118
+#: ../reporting/rep201.php:110
+#: ../reporting/rep203.php:93
+#: ../reporting/rep306.php:141
+#: ../reporting/rep601.php:79
+#: ../reporting/rep602.php:80
+#: ../reporting/rep704.php:83
+#: ../reporting/rep704.php:86
+#: ../reporting/rep704.php:89
+#: ../reporting/rep710.php:78
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:208
+#: ../reporting/includes/doctext.inc:246
+#: ../sales/allocations/customer_allocation_main.php:94
+#: ../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:145
+#: ../sales/inquiry/customer_inquiry.php:201
+msgid "#"
+msgstr ""
+
+#: ../admin/attachments.php:206
+#: ../admin/attachments.php:250
+#: ../admin/crm_categories.php:97
+#: ../admin/inst_upgrade.php:141
+#: ../admin/payment_terms.php:127
+#: ../admin/printers.php:84
+#: ../admin/print_profiles.php:148
+#: ../gl/inquiry/tax_inquiry.php:82
+#: ../gl/manage/gl_quick_entries.php:186
+#: ../gl/manage/gl_quick_entries.php:224
+#: ../includes/ui/view_package.php:32
+#: ../inventory/manage/item_codes.php:125
+#: ../inventory/manage/item_units.php:94
+#: ../inventory/manage/movement_types.php:95
+#: ../inventory/manage/sales_kits.php:40
+#: ../inventory/view/view_adjustment.php:56
+#: ../inventory/view/view_transfer.php:56
+#: ../manufacturing/manage/bom_edit.php:70
+#: ../manufacturing/includes/manufacturing_ui.inc:28
+#: ../purchasing/includes/ui/invoice_ui.inc:507
+#: ../purchasing/includes/ui/invoice_ui.inc:519
+#: ../purchasing/po_receive_items.php:62
+#: ../reporting/rep104.php:111
+#: ../reporting/rep105.php:114
+#: ../reporting/rep204.php:84
+#: ../reporting/rep303.php:121
+#: ../reporting/rep303.php:127
+#: ../reporting/rep304.php:114
+#: ../reporting/rep305.php:101
+#: ../reporting/rep306.php:141
+#: ../reporting/rep307.php:117
+#: ../reporting/rep308.php:230
+#: ../reporting/rep309.php:98
+#: ../reporting/rep401.php:71
+#: ../sales/create_recurrent_invoices.php:134
+#: ../sales/manage/credit_status.php:97
+#: ../sales/manage/recurrent_invoices.php:102
+#: ../sales/inquiry/sales_orders_view.php:318
+#: ../sales/inquiry/sales_orders_view.php:322
+#: ../taxes/sav.tax_types.php:190
+#: ../taxes/tax_groups.php:123
+#: ../taxes/tax_types.php:115
+msgid "Description"
+msgstr ""
+
+#: ../admin/attachments.php:207
+#: ../admin/backups.php:63
+#: ../admin/backups.php:149
+msgid "Filename"
+msgstr ""
+
+#: ../admin/attachments.php:208
+msgid "Size"
+msgstr ""
+
+#: ../admin/attachments.php:209
+msgid "Filetype"
+msgstr ""
+
+#: ../admin/attachments.php:210
+msgid "Date Uploaded"
+msgstr ""
+
+#: ../admin/attachments.php:244
+#: ../admin/attachments.php:249
 msgid "Transaction #"
 msgstr ""
 
-#: ../admin/attachments.php:218
+#: ../admin/attachments.php:251
 msgid "Attached File"
 msgstr ""
 
 #: ../admin/backups.php:21
-#: ../admin/backups.php:111
+#: ../admin/backups.php:40
+#: ../admin/backups.php:114
+#: ../admin/backups.php:142
+#: ../admin/backups.php:155
+#: ../admin/backups.php:173
 msgid "Select backup file first."
 msgstr ""
 
-#: ../admin/backups.php:40
+#: ../admin/backups.php:43
 msgid "Backup and Restore Database"
 msgstr ""
 
-#: ../admin/backups.php:47
+#: ../admin/backups.php:50
 msgid "Backup paths have not been set correctly."
 msgstr ""
 
-#: ../admin/backups.php:48
+#: ../admin/backups.php:51
 msgid "Please contact System Administrator."
 msgstr ""
 
-#: ../admin/backups.php:49
+#: ../admin/backups.php:52
 msgid "cannot find backup directory"
 msgstr ""
 
-#: ../admin/backups.php:59
+#: ../admin/backups.php:62
 msgid "Backup successfully generated."
 msgstr ""
 
-#: ../admin/backups.php:62
+#: ../admin/backups.php:65
 msgid "Database backup failed."
 msgstr ""
 
-#: ../admin/backups.php:95
-#: ../admin/create_coy.php:252
+#: ../admin/backups.php:98
+#: ../admin/create_coy.php:265
 #: ../admin/fiscalyears.php:155
 #: ../admin/inst_lang.php:85
 #: ../admin/inst_lang.php:97
 #: ../dimensions/inquiry/search_dimensions.php:107
-#: ../gl/manage/bank_accounts.php:123
-#: ../gl/manage/currencies.php:164
+#: ../gl/manage/bank_accounts.php:130
+#: ../gl/manage/currencies.php:162
 #: ../gl/manage/gl_account_classes.php:127
 #: ../gl/manage/gl_quick_entries.php:230
 #: ../includes/system_tests.inc:38
 #: ../includes/system_tests.inc:113
 #: ../includes/system_tests.inc:126
-#: ../includes/ui/ui_lists.inc:1638
+#: ../includes/ui/ui_lists.inc:1681
 #: ../purchasing/manage/suppliers.php:123
-#: ../reporting/rep101.php:126
-#: ../reporting/rep102.php:106
-#: ../reporting/rep104.php:103
-#: ../reporting/rep106.php:73
-#: ../reporting/rep201.php:114
-#: ../reporting/rep202.php:108
-#: ../reporting/rep203.php:87
-#: ../reporting/rep303.php:101
-#: ../reporting/rep303.php:105
-#: ../reporting/rep501.php:109
+#: ../reporting/rep101.php:114
+#: ../reporting/rep102.php:114
+#: ../reporting/rep102.php:116
+#: ../reporting/rep104.php:105
+#: ../reporting/rep106.php:75
+#: ../reporting/rep114.php:74
+#: ../reporting/rep201.php:106
+#: ../reporting/rep202.php:118
+#: ../reporting/rep202.php:120
+#: ../reporting/rep203.php:89
+#: ../reporting/rep303.php:113
+#: ../reporting/rep303.php:117
+#: ../reporting/rep402.php:99
+#: ../reporting/rep402.php:134
+#: ../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:124
-#: ../taxes/tax_groups.php:161
+#: ../taxes/item_tax_types.php:129
 msgid "No"
 msgstr ""
 
-#: ../admin/backups.php:135
+#: ../admin/backups.php:139
 msgid "Restore backup completed."
 msgstr ""
 
-#: ../admin/backups.php:141
+#: ../admin/backups.php:148
 msgid "File successfully deleted."
 msgstr ""
 
-#: ../admin/backups.php:146
+#: ../admin/backups.php:153
 msgid "Can't delete backup file."
 msgstr ""
 
-#: ../admin/backups.php:155
+#: ../admin/backups.php:165
 msgid "You can only upload *.sql backup files"
 msgstr ""
 
-#: ../admin/backups.php:161
+#: ../admin/backups.php:168
+msgid "File uploaded to backup directory"
+msgstr ""
+
+#: ../admin/backups.php:171
 msgid "File was not uploaded into the system."
 msgstr ""
 
-#: ../admin/backups.php:167
+#: ../admin/backups.php:180
 msgid "Create backup"
 msgstr ""
 
-#: ../admin/backups.php:168
-#: ../sales/includes/ui/sales_order_ui.inc:587
-#: ../sales/includes/ui/sales_order_ui.inc:634
+#: ../admin/backups.php:181
+#: ../sales/includes/ui/sales_order_ui.inc:580
+#: ../sales/includes/ui/sales_order_ui.inc:636
 msgid "Comments:"
 msgstr ""
 
-#: ../admin/backups.php:169
+#: ../admin/backups.php:182
 msgid "Compression:"
 msgstr ""
 
-#: ../admin/backups.php:171
+#: ../admin/backups.php:184
 msgid "Create Backup"
 msgstr ""
 
-#: ../admin/backups.php:173
+#: ../admin/backups.php:186
 msgid "Backup scripts maintenance"
 msgstr ""
 
-#: ../admin/backups.php:179
+#: ../admin/backups.php:192
 msgid "View Backup"
 msgstr ""
 
-#: ../admin/backups.php:180
+#: ../admin/backups.php:193
 msgid "Download Backup"
 msgstr ""
 
-#: ../admin/backups.php:181
+#: ../admin/backups.php:194
 msgid "Restore Backup"
 msgstr ""
 
-#: ../admin/backups.php:182
+#: ../admin/backups.php:195
 msgid ""
 "You are about to restore database from backup file.\n"
 "Do you want to continue?"
 msgstr ""
 
-#: ../admin/backups.php:184
+#: ../admin/backups.php:197
 msgid "Delete Backup"
 msgstr ""
 
-#: ../admin/backups.php:186
+#: ../admin/backups.php:199
 #, php-format
 msgid ""
 "You are about to remove selected backup file.\n"
 "Do you want to continue ?"
 msgstr ""
 
-#: ../admin/backups.php:192
+#: ../admin/backups.php:205
 msgid "Upload file"
 msgstr ""
 
 #: ../admin/change_current_user_password.php:16
-#: ../admin/change_current_user_password.php:85
-#: ../themes/default/renderer.php:72
-#: ../themes/exclusive/renderer.php:47
+#: ../admin/change_current_user_password.php:99
+#: ../themes/default/renderer.php:77
 msgid "Change password"
 msgstr ""
 
-#: ../admin/change_current_user_password.php:28
+#: ../admin/change_current_user_password.php:33
+msgid "Invalid password entered."
+msgstr ""
+
+#: ../admin/change_current_user_password.php:40
 #: ../admin/users.php:40
 msgid "The password entered must be at least 4 characters long."
 msgstr ""
 
-#: ../admin/change_current_user_password.php:35
+#: ../admin/change_current_user_password.php:47
 #: ../admin/users.php:47
 msgid "The password cannot contain the user login."
 msgstr ""
 
-#: ../admin/change_current_user_password.php:42
+#: ../admin/change_current_user_password.php:54
 msgid "The passwords entered are not the same."
 msgstr ""
 
-#: ../admin/change_current_user_password.php:56
+#: ../admin/change_current_user_password.php:68
 msgid "Password cannot be changed in demo mode."
 msgstr ""
 
-#: ../admin/change_current_user_password.php:61
+#: ../admin/change_current_user_password.php:73
 msgid "Your password has been updated."
 msgstr ""
 
-#: ../admin/change_current_user_password.php:73
-#: ../admin/users.php:180
+#: ../admin/change_current_user_password.php:85
+#: ../admin/users.php:189
 msgid "User login:"
 msgstr ""
 
-#: ../admin/change_current_user_password.php:79
-msgid "Repeat password:"
+#: ../admin/change_current_user_password.php:91
+msgid "Current Password:"
+msgstr ""
+
+#: ../admin/change_current_user_password.php:92
+msgid "New Password:"
+msgstr ""
+
+#: ../admin/change_current_user_password.php:93
+msgid "Repeat New Password:"
 msgstr ""
 
-#: ../admin/change_current_user_password.php:81
+#: ../admin/change_current_user_password.php:95
 msgid "Enter your new password in the fields."
 msgstr ""
 
@@ -579,19 +634,20 @@ msgid ""
 msgstr ""
 
 #: ../admin/company_preferences.php:59
-#: ../inventory/manage/items.php:74
+#: ../inventory/manage/items.php:86
 msgid ""
 "The file size is over the maximum allowed. The maximum size allowed in KB is"
 msgstr ""
 
 #: ../admin/company_preferences.php:64
-#: ../inventory/manage/items.php:79
+#: ../inventory/manage/items.php:76
+#: ../inventory/manage/items.php:91
 msgid "Only graphics files can be uploaded"
 msgstr ""
 
 #: ../admin/company_preferences.php:72
 #: ../admin/company_preferences.php:93
-#: ../inventory/manage/items.php:87
+#: ../inventory/manage/items.php:99
 msgid "The existing image could not be removed"
 msgstr ""
 
@@ -603,182 +659,188 @@ msgstr ""
 msgid "Company setup has been updated."
 msgstr ""
 
-#: ../admin/company_preferences.php:160
+#: ../admin/company_preferences.php:164
 msgid "Name (to appear on reports):"
 msgstr ""
 
-#: ../admin/company_preferences.php:161
+#: ../admin/company_preferences.php:165
 #: ../admin/shipping_companies.php:142
 #: ../includes/ui/contacts_view.inc:109
 #: ../inventory/manage/locations.php:202
-#: ../sales/manage/customers.php:203
-#: ../sales/includes/ui/sales_order_ui.inc:625
+#: ../sales/manage/customers.php:234
+#: ../sales/includes/ui/sales_order_ui.inc:627
 msgid "Address:"
 msgstr ""
 
-#: ../admin/company_preferences.php:162
+#: ../admin/company_preferences.php:166
 msgid "Domicile:"
 msgstr ""
 
-#: ../admin/company_preferences.php:164
+#: ../admin/company_preferences.php:168
 #: ../admin/shipping_companies.php:138
-#: ../purchasing/manage/suppliers.php:105
-#: ../sales/manage/customer_branches.php:260
+#: ../purchasing/manage/suppliers.php:137
+#: ../sales/manage/customer_branches.php:262
 msgid "Phone Number:"
 msgstr ""
 
-#: ../admin/company_preferences.php:165
+#: ../admin/company_preferences.php:169
 #: ../includes/ui/contacts_view.inc:104
-#: ../purchasing/manage/suppliers.php:107
-#: ../sales/manage/customer_branches.php:262
+#: ../purchasing/manage/suppliers.php:140
+#: ../sales/manage/customer_branches.php:264
+#: ../sales/manage/customers.php:258
 msgid "Fax Number:"
 msgstr ""
 
-#: ../admin/company_preferences.php:166
-#: ../admin/users.php:202
+#: ../admin/company_preferences.php:170
+#: ../admin/users.php:211
 msgid "Email Address:"
 msgstr ""
 
-#: ../admin/company_preferences.php:168
+#: ../admin/company_preferences.php:172
+msgid "BCC Address for all outgoing mails:"
+msgstr ""
+
+#: ../admin/company_preferences.php:174
 msgid "Official Company Number:"
 msgstr ""
 
-#: ../admin/company_preferences.php:169
-#: ../purchasing/manage/suppliers.php:88
-#: ../sales/manage/customers.php:205
+#: ../admin/company_preferences.php:175
+#: ../purchasing/manage/suppliers.php:96
+#: ../sales/manage/customers.php:236
 msgid "GSTNo:"
 msgstr ""
 
-#: ../admin/company_preferences.php:171
+#: ../admin/company_preferences.php:177
 msgid "Home Currency:"
 msgstr ""
 
-#: ../admin/company_preferences.php:172
+#: ../admin/company_preferences.php:178
 #: ../gl/gl_budget.php:63
 msgid "Fiscal Year:"
 msgstr ""
 
-#: ../admin/company_preferences.php:173
+#: ../admin/company_preferences.php:179
 msgid "Tax Periods:"
 msgstr ""
 
-#: ../admin/company_preferences.php:173
+#: ../admin/company_preferences.php:179
 msgid "Months."
 msgstr ""
 
-#: ../admin/company_preferences.php:174
+#: ../admin/company_preferences.php:180
 msgid "Tax Last Period:"
 msgstr ""
 
-#: ../admin/company_preferences.php:174
+#: ../admin/company_preferences.php:180
 msgid "Months back."
 msgstr ""
 
-#: ../admin/company_preferences.php:178
+#: ../admin/company_preferences.php:184
 msgid "Company Logo:"
 msgstr ""
 
-#: ../admin/company_preferences.php:179
+#: ../admin/company_preferences.php:185
 msgid "New Company Logo (.jpg)"
 msgstr ""
 
-#: ../admin/company_preferences.php:180
+#: ../admin/company_preferences.php:186
 msgid "Delete Company Logo:"
 msgstr ""
 
-#: ../admin/company_preferences.php:182
+#: ../admin/company_preferences.php:188
 msgid "Use Dimensions:"
 msgstr ""
 
-#: ../admin/company_preferences.php:183
+#: ../admin/company_preferences.php:189
 msgid "Base for auto price calculations:"
 msgstr ""
 
-#: ../admin/company_preferences.php:184
+#: ../admin/company_preferences.php:190
 msgid "No base price list"
 msgstr ""
 
-#: ../admin/company_preferences.php:185
+#: ../admin/company_preferences.php:191
 msgid "Add Price from Std Cost:"
 msgstr ""
 
-#: ../admin/company_preferences.php:187
+#: ../admin/company_preferences.php:193
 msgid "Round to nearest:"
 msgstr ""
 
-#: ../admin/company_preferences.php:190
+#: ../admin/company_preferences.php:196
 msgid "Search Item List"
 msgstr ""
 
-#: ../admin/company_preferences.php:191
+#: ../admin/company_preferences.php:197
 msgid "Search Customer List"
 msgstr ""
 
-#: ../admin/company_preferences.php:192
+#: ../admin/company_preferences.php:198
 msgid "Search Supplier List"
 msgstr ""
 
-#: ../admin/company_preferences.php:194
+#: ../admin/company_preferences.php:200
 msgid "Automatic Revaluation Currency Accounts"
 msgstr ""
 
-#: ../admin/company_preferences.php:195
+#: ../admin/company_preferences.php:201
 msgid "Time Zone on Reports"
 msgstr ""
 
-#: ../admin/company_preferences.php:196
+#: ../admin/company_preferences.php:202
 msgid "Login Timeout:"
 msgstr ""
 
-#: ../admin/company_preferences.php:196
+#: ../admin/company_preferences.php:202
 msgid "seconds"
 msgstr ""
 
-#: ../admin/company_preferences.php:197
+#: ../admin/company_preferences.php:203
 msgid "Version Id"
 msgstr ""
 
-#: ../admin/company_preferences.php:202
-#: ../admin/display_prefs.php:142
+#: ../admin/company_preferences.php:208
+#: ../admin/display_prefs.php:145
 #: ../admin/forms_setup.php:61
-#: ../admin/gl_setup.php:221
+#: ../admin/gl_setup.php:249
 #: ../admin/inst_chart.php:74
 #: ../admin/inst_lang.php:103
-#: ../admin/inst_module.php:138
-#: ../admin/inst_module.php:156
-#: ../admin/inst_module.php:199
+#: ../admin/inst_module.php:137
+#: ../admin/inst_module.php:155
+#: ../admin/inst_module.php:198
 #: ../admin/inst_theme.php:96
 #: ../dimensions/dimension_entry.php:293
-#: ../gl/gl_bank.php:390
+#: ../gl/gl_bank.php:417
 #: ../gl/gl_budget.php:135
 #: ../gl/manage/gl_quick_entries.php:60
-#: ../gl/includes/ui/gl_bank_ui.inc:246
-#: ../gl/includes/ui/gl_journal_ui.inc:221
+#: ../gl/includes/ui/gl_bank_ui.inc:277
+#: ../gl/includes/ui/gl_journal_ui.inc:257
 #: ../includes/ui/db_pager_view.inc:174
 #: ../includes/ui/simple_crud_class.inc:56
 #: ../includes/ui/simple_crud_class.inc:227
-#: ../includes/ui/ui_input.inc:203
-#: ../includes/ui/ui_input.inc:894
-#: ../inventory/adjustments.php:233
-#: ../inventory/cost_update.php:125
-#: ../inventory/reorder_level.php:97
-#: ../inventory/transfers.php:236
-#: ../inventory/includes/item_adjustments_ui.inc:157
-#: ../inventory/includes/stock_transfers_ui.inc:137
+#: ../includes/ui/ui_input.inc:208
+#: ../includes/ui/ui_input.inc:906
+#: ../inventory/adjustments.php:234
+#: ../inventory/cost_update.php:134
+#: ../inventory/reorder_level.php:112
+#: ../inventory/transfers.php:230
+#: ../inventory/includes/item_adjustments_ui.inc:163
+#: ../inventory/includes/stock_transfers_ui.inc:143
 #: ../inventory/manage/sales_kits.php:208
 #: ../manufacturing/work_order_entry.php:457
-#: ../manufacturing/includes/work_order_issue_ui.inc:127
-#: ../purchasing/includes/ui/po_ui.inc:299
-#: ../purchasing/includes/ui/po_ui.inc:434
-#: ../purchasing/po_receive_items.php:326
-#: ../sales/credit_note_entry.php:280
+#: ../manufacturing/includes/work_order_issue_ui.inc:138
+#: ../purchasing/includes/ui/po_ui.inc:308
+#: ../purchasing/includes/ui/po_ui.inc:459
+#: ../purchasing/po_receive_items.php:332
+#: ../sales/credit_note_entry.php:284
 #: ../sales/customer_credit_invoice.php:380
-#: ../sales/customer_delivery.php:509
-#: ../sales/customer_invoice.php:559
-#: ../sales/inquiry/sales_orders_view.php:312
+#: ../sales/customer_delivery.php:563
+#: ../sales/customer_invoice.php:693
+#: ../sales/inquiry/sales_orders_view.php:350
 #: ../sales/includes/ui/sales_credit_ui.inc:293
-#: ../sales/includes/ui/sales_order_ui.inc:237
-#: ../sales/includes/ui/sales_order_ui.inc:555
+#: ../sales/includes/ui/sales_order_ui.inc:232
+#: ../sales/includes/ui/sales_order_ui.inc:546
+#: ../taxes/sav.tax_types.php:255
 msgid "Update"
 msgstr ""
 
@@ -786,199 +848,212 @@ msgstr ""
 msgid "Create/Update Company"
 msgstr ""
 
-#: ../admin/create_coy.php:45
+#: ../admin/create_coy.php:46
+#: ../admin/create_coy.php:52
 msgid "Database settings are not specified."
 msgstr ""
 
-#: ../admin/create_coy.php:56
+#: ../admin/create_coy.php:62
 msgid "This database settings are already used by another company."
 msgstr ""
 
-#: ../admin/create_coy.php:61
+#: ../admin/create_coy.php:67
 msgid ""
 "You cannot have table set without prefix together with prefixed sets in the "
 "same database."
 msgstr ""
 
-#: ../admin/create_coy.php:119
+#: ../admin/create_coy.php:127
 msgid "Error creating Database: "
 msgstr ""
 
-#: ../admin/create_coy.php:119
+#: ../admin/create_coy.php:127
 msgid ", Please create it manually"
 msgstr ""
 
-#: ../admin/create_coy.php:123
+#: ../admin/create_coy.php:131
 msgid "Cannot create new company due to bugs in sql file."
 msgstr ""
 
-#: ../admin/create_coy.php:136
-#: ../admin/create_coy.php:203
+#: ../admin/create_coy.php:149
+#: ../admin/create_coy.php:216
 msgid "Cannot open the configuration file - "
 msgstr ""
 
-#: ../admin/create_coy.php:138
-#: ../admin/create_coy.php:205
+#: ../admin/create_coy.php:151
+#: ../admin/create_coy.php:218
 msgid "Cannot write to the configuration file - "
 msgstr ""
 
-#: ../admin/create_coy.php:140
-#: ../admin/create_coy.php:176
-#: ../admin/create_coy.php:207
+#: ../admin/create_coy.php:153
+#: ../admin/create_coy.php:189
+#: ../admin/create_coy.php:220
 msgid "The configuration file "
 msgstr ""
 
-#: ../admin/create_coy.php:140
-#: ../admin/create_coy.php:176
-#: ../admin/create_coy.php:207
-#: ../admin/db/maintenance_db.inc:248
+#: ../admin/create_coy.php:153
+#: ../admin/create_coy.php:189
+#: ../admin/create_coy.php:220
+#: ../admin/db/maintenance_db.inc:250
 msgid ""
 " is not writable. Change its permissions so it is, then re-run the operation."
 msgstr ""
 
-#: ../admin/create_coy.php:152
+#: ../admin/create_coy.php:165
 msgid "New company has been created."
 msgstr ""
 
-#: ../admin/create_coy.php:152
+#: ../admin/create_coy.php:165
 msgid "Company has been updated."
 msgstr ""
 
-#: ../admin/create_coy.php:169
+#: ../admin/create_coy.php:182
 msgid ""
 "Broken company subdirectories system. You have to remove this company "
 "manually."
 msgstr ""
 
-#: ../admin/create_coy.php:185
+#: ../admin/create_coy.php:198
 msgid "Cannot rename subdirectory to temporary name."
 msgstr ""
 
-#: ../admin/create_coy.php:191
+#: ../admin/create_coy.php:204
 msgid "Cannot rename company subdirectory"
 msgstr ""
 
-#: ../admin/create_coy.php:197
+#: ../admin/create_coy.php:210
 msgid "Error removing Database: "
 msgstr ""
 
-#: ../admin/create_coy.php:197
+#: ../admin/create_coy.php:210
 msgid ", please remove it manually"
 msgstr ""
 
-#: ../admin/create_coy.php:216
+#: ../admin/create_coy.php:229
 msgid "Cannot remove temporary renamed company data directory "
 msgstr ""
 
-#: ../admin/create_coy.php:219
+#: ../admin/create_coy.php:232
 msgid "Selected company has been deleted"
 msgstr ""
 
-#: ../admin/create_coy.php:233
+#: ../admin/create_coy.php:246
 msgid "Are you sure you want to delete company no. "
 msgstr ""
 
-#: ../admin/create_coy.php:240
+#: ../admin/create_coy.php:253
 msgid "Database Host"
 msgstr ""
 
-#: ../admin/create_coy.php:240
-#: ../admin/create_coy.php:326
+#: ../admin/create_coy.php:253
+#: ../admin/create_coy.php:341
+#: ../admin/create_coy.php:347
 msgid "Database User"
 msgstr ""
 
-#: ../admin/create_coy.php:241
-#: ../admin/create_coy.php:329
+#: ../admin/create_coy.php:254
+#: ../admin/create_coy.php:343
+#: ../admin/create_coy.php:348
 msgid "Database Name"
 msgstr ""
 
-#: ../admin/create_coy.php:241
-#: ../admin/create_coy.php:331
-#: ../admin/create_coy.php:333
+#: ../admin/create_coy.php:254
+#: ../admin/create_coy.php:344
+#: ../admin/create_coy.php:349
 msgid "Table Pref"
 msgstr ""
 
-#: ../admin/create_coy.php:241
-#: ../admin/create_coy.php:334
+#: ../admin/create_coy.php:254
+#: ../admin/create_coy.php:351
 #: ../admin/inst_lang.php:36
 #: ../admin/print_profiles.php:162
 msgid "Default"
 msgstr ""
 
-#: ../admin/create_coy.php:250
+#: ../admin/create_coy.php:263
 #: ../admin/fiscalyears.php:159
 #: ../admin/inst_lang.php:85
 #: ../admin/inst_lang.php:97
 #: ../dimensions/inquiry/search_dimensions.php:107
-#: ../gl/manage/bank_accounts.php:121
-#: ../gl/manage/currencies.php:164
+#: ../gl/manage/bank_accounts.php:128
+#: ../gl/manage/currencies.php:162
 #: ../gl/manage/gl_account_classes.php:127
 #: ../gl/manage/gl_quick_entries.php:230
 #: ../includes/system_tests.inc:38
 #: ../includes/system_tests.inc:113
 #: ../includes/system_tests.inc:126
-#: ../includes/ui/ui_lists.inc:1639
+#: ../includes/ui/ui_lists.inc:1682
 #: ../purchasing/manage/suppliers.php:123
-#: ../reporting/rep101.php:125
-#: ../reporting/rep102.php:105
-#: ../reporting/rep104.php:105
-#: ../reporting/rep106.php:75
-#: ../reporting/rep201.php:113
-#: ../reporting/rep202.php:107
-#: ../reporting/rep203.php:86
-#: ../reporting/rep303.php:96
-#: ../reporting/rep303.php:104
-#: ../reporting/rep501.php:107
+#: ../reporting/rep101.php:113
+#: ../reporting/rep102.php:113
+#: ../reporting/rep102.php:115
+#: ../reporting/rep104.php:107
+#: ../reporting/rep106.php:77
+#: ../reporting/rep114.php:76
+#: ../reporting/rep201.php:105
+#: ../reporting/rep202.php:117
+#: ../reporting/rep202.php:119
+#: ../reporting/rep203.php:88
+#: ../reporting/rep303.php:108
+#: ../reporting/rep303.php:116
+#: ../reporting/rep402.php:99
+#: ../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:128
-#: ../taxes/tax_groups.php:159
+#: ../taxes/item_tax_types.php:133
 msgid "Yes"
 msgstr ""
 
-#: ../admin/create_coy.php:278
+#: ../admin/create_coy.php:292
 msgid "The marked company is the current company which cannot be deleted."
 msgstr ""
 
-#: ../admin/create_coy.php:325
+#: ../admin/create_coy.php:293
+msgid ""
+"If no Admin Password is entered, the new Admin Password will be "
+"'<b>password</b>' by default "
+msgstr ""
+
+#: ../admin/create_coy.php:340
+#: ../admin/create_coy.php:346
 #: ../admin/printers.php:84
 msgid "Host"
 msgstr ""
 
-#: ../admin/create_coy.php:328
+#: ../admin/create_coy.php:342
 msgid "Database Password"
 msgstr ""
 
-#: ../admin/create_coy.php:331
+#: ../admin/create_coy.php:344
 #: ../admin/inst_chart.php:68
 #: ../admin/inst_chart.php:70
 #: ../admin/inst_lang.php:87
 #: ../admin/inst_lang.php:90
-#: ../admin/inst_module.php:127
+#: ../admin/inst_module.php:126
 #: ../admin/inst_theme.php:91
 #: ../admin/inst_theme.php:93
-#: ../admin/inst_upgrade.php:149
-#: ../gl/manage/gl_account_types.php:184
-#: ../includes/ui/allocation_cart.inc:286
-#: ../taxes/tax_groups.php:221
+#: ../admin/inst_upgrade.php:153
+#: ../gl/manage/gl_account_types.php:190
+#: ../includes/ui/allocation_cart.inc:316
+#: ../taxes/sav.tax_types.php:168
 msgid "None"
 msgstr ""
 
-#: ../admin/create_coy.php:336
+#: ../admin/create_coy.php:355
 msgid "Database Script"
 msgstr ""
 
-#: ../admin/create_coy.php:338
+#: ../admin/create_coy.php:356
 msgid "New script Admin Password"
 msgstr ""
 
-#: ../admin/create_coy.php:341
+#: ../admin/create_coy.php:360
 #: ../gl/gl_budget.php:136
 msgid "Save"
 msgstr ""
 
-#: ../admin/create_coy.php:365
+#: ../admin/create_coy.php:382
 msgid "Create a new company"
 msgstr ""
 
@@ -998,42 +1073,42 @@ msgstr ""
 msgid "New contact category has been added"
 msgstr ""
 
-#: ../admin/crm_categories.php:62
+#: ../admin/crm_categories.php:71
 msgid "Cannot delete this category because there are contacts related to it."
 msgstr ""
 
-#: ../admin/crm_categories.php:68
+#: ../admin/crm_categories.php:77
 msgid "Category has been deleted"
 msgstr ""
 
-#: ../admin/crm_categories.php:88
-msgid "Type id"
+#: ../admin/crm_categories.php:97
+msgid "Category Type"
 msgstr ""
 
-#: ../admin/crm_categories.php:88
-msgid "Action id"
+#: ../admin/crm_categories.php:97
+msgid "Category Subtype"
 msgstr ""
 
-#: ../admin/crm_categories.php:88
-#: ../sales/manage/customer_branches.php:293
+#: ../admin/crm_categories.php:97
+#: ../sales/manage/customer_branches.php:295
 msgid "Short Name"
 msgstr ""
 
-#: ../admin/crm_categories.php:135
-#: ../admin/crm_categories.php:139
+#: ../admin/crm_categories.php:144
+#: ../admin/crm_categories.php:148
 msgid "Contact Category Type:"
 msgstr ""
 
-#: ../admin/crm_categories.php:136
-#: ../admin/crm_categories.php:140
+#: ../admin/crm_categories.php:145
+#: ../admin/crm_categories.php:149
 msgid "Contact Category Subtype:"
 msgstr ""
 
-#: ../admin/crm_categories.php:143
+#: ../admin/crm_categories.php:152
 msgid "Category Short Name:"
 msgstr ""
 
-#: ../admin/crm_categories.php:144
+#: ../admin/crm_categories.php:153
 msgid "Category Description:"
 msgstr ""
 
@@ -1045,133 +1120,137 @@ msgstr ""
 msgid "Query size must be integer and greater than zero."
 msgstr ""
 
-#: ../admin/display_prefs.php:59
+#: ../admin/display_prefs.php:60
 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:61
+#: ../admin/display_prefs.php:62
 msgid "Display settings have been updated."
 msgstr ""
 
-#: ../admin/display_prefs.php:70
+#: ../admin/display_prefs.php:71
 msgid "Decimal Places"
 msgstr ""
 
-#: ../admin/display_prefs.php:72
+#: ../admin/display_prefs.php:73
 msgid "Prices/Amounts:"
 msgstr ""
 
-#: ../admin/display_prefs.php:73
+#: ../admin/display_prefs.php:74
 msgid "Quantities:"
 msgstr ""
 
-#: ../admin/display_prefs.php:74
+#: ../admin/display_prefs.php:75
 msgid "Exchange Rates:"
 msgstr ""
 
-#: ../admin/display_prefs.php:75
+#: ../admin/display_prefs.php:76
 msgid "Percentages:"
 msgstr ""
 
-#: ../admin/display_prefs.php:77
+#: ../admin/display_prefs.php:78
 msgid "Dateformat and Separators"
 msgstr ""
 
-#: ../admin/display_prefs.php:79
+#: ../admin/display_prefs.php:80
 msgid "Dateformat:"
 msgstr ""
 
-#: ../admin/display_prefs.php:81
+#: ../admin/display_prefs.php:82
 msgid "Date Separator:"
 msgstr ""
 
-#: ../admin/display_prefs.php:86
+#: ../admin/display_prefs.php:87
 msgid "Thousand Separator:"
 msgstr ""
 
-#: ../admin/display_prefs.php:91
+#: ../admin/display_prefs.php:92
 msgid "Decimal Separator:"
 msgstr ""
 
-#: ../admin/display_prefs.php:98
+#: ../admin/display_prefs.php:99
 #: ../admin/inst_lang.php:35
 msgid "Language"
 msgstr ""
 
-#: ../admin/display_prefs.php:100
-#: ../admin/users.php:206
+#: ../admin/display_prefs.php:101
+#: ../admin/users.php:215
 msgid "Language:"
 msgstr ""
 
-#: ../admin/display_prefs.php:103
+#: ../admin/display_prefs.php:104
 #: ../applications/setup.php:42
 #: ../includes/sysnames.inc:94
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../admin/display_prefs.php:105
+#: ../admin/display_prefs.php:106
 msgid "Show hints for new users:"
 msgstr ""
 
-#: ../admin/display_prefs.php:107
+#: ../admin/display_prefs.php:108
 msgid "Show GL Information:"
 msgstr ""
 
-#: ../admin/display_prefs.php:109
+#: ../admin/display_prefs.php:110
 msgid "Show Item Codes:"
 msgstr ""
 
-#: ../admin/display_prefs.php:116
+#: ../admin/display_prefs.php:117
 msgid "Page Size:"
 msgstr ""
 
-#: ../admin/display_prefs.php:118
+#: ../admin/display_prefs.php:119
 msgid "Start-up Tab"
 msgstr ""
 
-#: ../admin/display_prefs.php:126
-#: ../admin/users.php:210
+#: ../admin/display_prefs.php:127
+#: ../admin/users.php:219
 msgid "Printing profile"
 msgstr ""
 
-#: ../admin/display_prefs.php:127
-#: ../admin/users.php:211
+#: ../admin/display_prefs.php:128
+#: ../admin/users.php:220
 msgid "Browser printing support"
 msgstr ""
 
-#: ../admin/display_prefs.php:129
+#: ../admin/display_prefs.php:130
 msgid "Use popup window to display reports:"
 msgstr ""
 
-#: ../admin/display_prefs.php:130
-#: ../admin/users.php:214
+#: ../admin/display_prefs.php:131
+#: ../admin/users.php:223
 msgid "Set this option to on if your browser directly supports pdf files"
 msgstr ""
 
-#: ../admin/display_prefs.php:132
+#: ../admin/display_prefs.php:133
 msgid "Use icons instead of text links:"
 msgstr ""
 
-#: ../admin/display_prefs.php:133
+#: ../admin/display_prefs.php:134
 msgid "Set this option to on for using icons instead of text links"
 msgstr ""
 
-#: ../admin/display_prefs.php:135
+#: ../admin/display_prefs.php:136
 msgid "Query page size:"
 msgstr ""
 
-#: ../admin/display_prefs.php:137
+#: ../admin/display_prefs.php:138
 msgid "Remember last document date:"
 msgstr ""
 
-#: ../admin/display_prefs.php:138
+#: ../admin/display_prefs.php:139
 msgid ""
 "If set document date is remembered on subsequent documents, otherwise "
 "default is current date"
 msgstr ""
 
+#: ../admin/display_prefs.php:141
+msgid "Transaction days:"
+msgstr ""
+
 #: ../admin/fiscalyears.php:25
 msgid "Fiscal Years"
 msgstr ""
@@ -1205,7 +1284,7 @@ msgid "New fiscal year has been added"
 msgstr ""
 
 #: ../admin/fiscalyears.php:102
-msgid "Cannot delete this fiscal year because thera are fiscal years before."
+msgid "Cannot delete this fiscal year because there are fiscal years before."
 msgstr ""
 
 #: ../admin/fiscalyears.php:107
@@ -1234,10 +1313,12 @@ msgstr ""
 #: ../admin/fiscalyears.php:138
 #: ../dimensions/inquiry/search_dimensions.php:133
 #: ../dimensions/inquiry/search_dimensions.php:139
-#: ../includes/ui/ui_lists.inc:648
+#: ../includes/ui/ui_input.inc:959
+#: ../includes/ui/ui_lists.inc:677
 #: ../manufacturing/search_work_orders.php:108
-#: ../reporting/rep501.php:85
-#: ../reporting/rep710.php:109
+#: ../reporting/rep402.php:103
+#: ../reporting/rep501.php:87
+#: ../reporting/rep710.php:113
 #: ../reporting/includes/excel_report.inc:234
 #: ../reporting/includes/pdf_report.inc:266
 msgid "Closed"
@@ -1305,181 +1386,212 @@ msgstr ""
 msgid "Before GRN Clearing Account can be changed all GRNs have to be invoiced"
 msgstr ""
 
-#: ../admin/gl_setup.php:75
+#: ../admin/gl_setup.php:59
+#: ../admin/db/fiscalyears_db.inc:141
+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:80
 msgid "The general GL setup has been updated."
 msgstr ""
 
-#: ../admin/gl_setup.php:132
+#: ../admin/gl_setup.php:150
 msgid "General GL"
 msgstr ""
 
-#: ../admin/gl_setup.php:134
+#: ../admin/gl_setup.php:152
 msgid "Past Due Days Interval:"
 msgstr ""
 
-#: ../admin/gl_setup.php:134
-#: ../admin/gl_setup.php:169
-#: ../admin/gl_setup.php:177
-#: ../admin/gl_setup.php:214
+#: ../admin/gl_setup.php:152
+#: ../admin/gl_setup.php:192
+#: ../admin/gl_setup.php:194
+#: ../admin/gl_setup.php:202
+#: ../admin/gl_setup.php:220
+#: ../admin/gl_setup.php:242
 #: ../admin/payment_terms.php:140
 msgid "days"
 msgstr ""
 
-#: ../admin/gl_setup.php:136
+#: ../admin/gl_setup.php:154
 msgid "Retained Earnings:"
 msgstr ""
 
-#: ../admin/gl_setup.php:138
+#: ../admin/gl_setup.php:156
 msgid "Profit/Loss Year:"
 msgstr ""
 
-#: ../admin/gl_setup.php:140
+#: ../admin/gl_setup.php:158
 msgid "Exchange Variances Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:142
+#: ../admin/gl_setup.php:160
+#: ../gl/manage/bank_accounts.php:193
 msgid "Bank Charges Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:146
+#: ../admin/gl_setup.php:162
+msgid "Tax Algorithm:"
+msgstr ""
+
+#: ../admin/gl_setup.php:166
 msgid "Customers and Sales"
 msgstr ""
 
-#: ../admin/gl_setup.php:148
+#: ../admin/gl_setup.php:168
 msgid "Default Credit Limit:"
 msgstr ""
 
-#: ../admin/gl_setup.php:150
+#: ../admin/gl_setup.php:170
 msgid "Accumulate batch shipping:"
 msgstr ""
 
-#: ../admin/gl_setup.php:152
+#: ../admin/gl_setup.php:172
 msgid "Legal Text on Invoice:"
 msgstr ""
 
-#: ../admin/gl_setup.php:154
+#: ../admin/gl_setup.php:174
 msgid "Shipping Charged Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:158
+#: ../admin/gl_setup.php:176
+msgid "Deferred Income Account:"
+msgstr ""
+
+#: ../admin/gl_setup.php:177
+msgid "Not used"
+msgstr ""
+
+#: ../admin/gl_setup.php:181
 msgid "Customers and Sales Defaults"
 msgstr ""
 
-#: ../admin/gl_setup.php:160
+#: ../admin/gl_setup.php:183
 msgid "Receivable Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:162
-#: ../admin/gl_setup.php:200
-#: ../inventory/manage/item_categories.php:192
-#: ../inventory/manage/items.php:364
-#: ../sales/manage/customer_branches.php:250
+#: ../admin/gl_setup.php:185
+#: ../admin/gl_setup.php:228
+#: ../inventory/manage/item_categories.php:196
+#: ../inventory/manage/items.php:365
+#: ../sales/manage/customer_branches.php:251
 msgid "Sales Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:165
-#: ../sales/manage/customer_branches.php:251
+#: ../admin/gl_setup.php:188
+#: ../sales/manage/customer_branches.php:252
 msgid "Sales Discount Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:167
-#: ../sales/manage/customer_branches.php:253
+#: ../admin/gl_setup.php:190
+#: ../sales/manage/customer_branches.php:254
 msgid "Prompt Payment Discount Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:169
+#: ../admin/gl_setup.php:192
+msgid "Quote Valid Days:"
+msgstr ""
+
+#: ../admin/gl_setup.php:194
 msgid "Delivery Required By:"
 msgstr ""
 
-#: ../admin/gl_setup.php:175
+#: ../admin/gl_setup.php:200
 msgid "Dimension Defaults"
 msgstr ""
 
-#: ../admin/gl_setup.php:177
+#: ../admin/gl_setup.php:202
 msgid "Dimension Required By After:"
 msgstr ""
 
-#: ../admin/gl_setup.php:180
+#: ../admin/gl_setup.php:206
 msgid "Suppliers and Purchasing"
 msgstr ""
 
-#: ../admin/gl_setup.php:182
+#: ../admin/gl_setup.php:208
 msgid "Delivery Over-Receive Allowance:"
 msgstr ""
 
-#: ../admin/gl_setup.php:184
+#: ../admin/gl_setup.php:210
 msgid "Invoice Over-Charge Allowance:"
 msgstr ""
 
-#: ../admin/gl_setup.php:186
+#: ../admin/gl_setup.php:212
 msgid "Suppliers and Purchasing Defaults"
 msgstr ""
 
-#: ../admin/gl_setup.php:188
+#: ../admin/gl_setup.php:214
 msgid "Payable Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:190
-#: ../purchasing/manage/suppliers.php:129
+#: ../admin/gl_setup.php:216
+#: ../purchasing/manage/suppliers.php:133
 msgid "Purchase Discount Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:192
+#: ../admin/gl_setup.php:218
 msgid "GRN Clearing Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:192
+#: ../admin/gl_setup.php:218
 msgid "No postings on GRN"
 msgstr ""
 
-#: ../admin/gl_setup.php:194
-#: ../reporting/reports_main.php:166
+#: ../admin/gl_setup.php:220
+msgid "Receival Required By:"
+msgstr ""
+
+#: ../admin/gl_setup.php:222
+#: ../reporting/reports_main.php:206
 msgid "Inventory"
 msgstr ""
 
-#: ../admin/gl_setup.php:196
+#: ../admin/gl_setup.php:224
 msgid "Allow Negative Inventory:"
 msgstr ""
 
-#: ../admin/gl_setup.php:197
+#: ../admin/gl_setup.php:225
 msgid "Warning:  This may cause a delay in GL postings"
 msgstr ""
 
-#: ../admin/gl_setup.php:199
+#: ../admin/gl_setup.php:227
 msgid "Items Defaults"
 msgstr ""
 
-#: ../admin/gl_setup.php:202
-#: ../inventory/manage/item_categories.php:202
-#: ../inventory/manage/items.php:368
+#: ../admin/gl_setup.php:230
+#: ../inventory/manage/item_categories.php:206
+#: ../inventory/manage/items.php:369
 msgid "Inventory Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:204
-#: ../inventory/manage/item_categories.php:196
-#: ../inventory/manage/item_categories.php:204
-#: ../inventory/manage/items.php:369
-#: ../inventory/manage/items.php:374
+#: ../admin/gl_setup.php:232
+#: ../inventory/manage/item_categories.php:200
+#: ../inventory/manage/item_categories.php:208
+#: ../inventory/manage/items.php:370
+#: ../inventory/manage/items.php:375
 msgid "C.O.G.S. Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:206
-#: ../inventory/manage/item_categories.php:205
-#: ../inventory/manage/items.php:370
+#: ../admin/gl_setup.php:234
+#: ../inventory/manage/item_categories.php:209
+#: ../inventory/manage/items.php:371
 msgid "Inventory Adjustments Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:208
-#: ../inventory/manage/item_categories.php:209
-#: ../inventory/manage/items.php:381
+#: ../admin/gl_setup.php:236
+#: ../inventory/manage/item_categories.php:213
+#: ../inventory/manage/items.php:382
 msgid "Item Assembly Costs Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:212
+#: ../admin/gl_setup.php:240
 msgid "Manufacturing Defaults"
 msgstr ""
 
-#: ../admin/gl_setup.php:214
+#: ../admin/gl_setup.php:242
 msgid "Work Order Required By After:"
 msgstr ""
 
@@ -1499,7 +1611,7 @@ msgstr ""
 #: ../admin/inst_lang.php:36
 #: ../admin/inst_module.php:105
 #: ../admin/inst_theme.php:74
-#: ../admin/inst_upgrade.php:155
+#: ../admin/inst_upgrade.php:159
 msgid "Installed"
 msgstr ""
 
@@ -1507,43 +1619,44 @@ msgstr ""
 #: ../admin/inst_lang.php:36
 #: ../admin/inst_module.php:105
 #: ../admin/inst_theme.php:74
-#: ../inventory/inquiry/stock_status.php:70
-#: ../reporting/rep303.php:102
+#: ../inventory/inquiry/stock_status.php:71
+#: ../reporting/rep303.php:114
 msgid "Available"
 msgstr ""
 
 #: ../admin/inst_chart.php:50
 #: ../admin/inst_lang.php:35
-#: ../admin/inst_lang.php:218
+#: ../admin/inst_lang.php:220
 msgid "Encoding"
 msgstr ""
 
 #: ../admin/inst_chart.php:69
 #: ../admin/inst_chart.php:71
 #: ../admin/inst_lang.php:88
+#: ../admin/inst_module.php:127
 #: ../admin/inst_module.php:128
-#: ../admin/inst_module.php:129
 #: ../admin/inst_theme.php:92
+#: ../includes/sysnames.inc:193
 msgid "Unknown"
 msgstr ""
 
 #: ../admin/inst_chart.php:74
 #: ../admin/inst_lang.php:103
-#: ../admin/inst_module.php:133
-#: ../admin/inst_module.php:138
+#: ../admin/inst_module.php:132
+#: ../admin/inst_module.php:137
 #: ../admin/inst_theme.php:96
-#: ../admin/inst_upgrade.php:137
+#: ../admin/inst_upgrade.php:141
 msgid "Install"
 msgstr ""
 
 #: ../admin/inst_chart.php:75
-#: ../admin/inst_module.php:139
+#: ../admin/inst_module.php:138
 #: ../admin/inst_theme.php:97
 msgid "Upload and install latest extension package"
 msgstr ""
 
 #: ../admin/inst_chart.php:82
-#: ../admin/inst_module.php:146
+#: ../admin/inst_module.php:145
 #: ../admin/inst_theme.php:104
 #, php-format
 msgid ""
@@ -1560,22 +1673,23 @@ msgstr ""
 #: ../admin/shipping_companies.php:91
 #: ../dimensions/dimension_entry.php:271
 #: ../dimensions/inquiry/search_dimensions.php:129
-#: ../dimensions/view/view_dimension.php:54
+#: ../dimensions/view/view_dimension.php:55
 #: ../inventory/manage/item_categories.php:98
 #: ../manufacturing/manage/work_centres.php:101
-#: ../purchasing/includes/ui/invoice_ui.inc:245
-#: ../purchasing/includes/ui/invoice_ui.inc:247
-#: ../purchasing/includes/ui/invoice_ui.inc:249
-#: ../reporting/rep501.php:85
-#: ../reporting/rep709.php:107
-#: ../sales/manage/customer_branches.php:294
+#: ../purchasing/includes/ui/invoice_ui.inc:280
+#: ../purchasing/includes/ui/invoice_ui.inc:282
+#: ../purchasing/includes/ui/invoice_ui.inc:284
+#: ../reporting/rep501.php:87
+#: ../reporting/rep709.php:116
+#: ../reporting/rep709.php:117
+#: ../sales/manage/customer_branches.php:296
 #: ../sales/manage/sales_people.php:99
-#: ../taxes/item_tax_types.php:112
+#: ../taxes/item_tax_types.php:117
 msgid "Name"
 msgstr ""
 
 #: ../admin/inst_lang.php:35
-#: ../admin/inst_lang.php:220
+#: ../admin/inst_lang.php:222
 msgid "Right To Left"
 msgstr ""
 
@@ -1624,24 +1738,24 @@ msgid ""
 "install this language manually, uninstall standard language package first."
 msgstr ""
 
-#: ../admin/inst_lang.php:216
+#: ../admin/inst_lang.php:218
 msgid "Language Code"
 msgstr ""
 
-#: ../admin/inst_lang.php:217
+#: ../admin/inst_lang.php:219
 msgid "Language Name"
 msgstr ""
 
-#: ../admin/inst_lang.php:221
+#: ../admin/inst_lang.php:223
 msgid "Default Language"
 msgstr ""
 
-#: ../admin/inst_lang.php:223
-#: ../admin/inst_lang.php:224
+#: ../admin/inst_lang.php:225
+#: ../admin/inst_lang.php:226
 msgid "Language File"
 msgstr ""
 
-#: ../admin/inst_lang.php:227
+#: ../admin/inst_lang.php:229
 msgid "Select your language files from your local harddisk."
 msgstr ""
 
@@ -1654,41 +1768,41 @@ msgid "Selected extension has been successfully deleted"
 msgstr ""
 
 #: ../admin/inst_module.php:104
-#: ../admin/inst_module.php:169
+#: ../admin/inst_module.php:168
 msgid "Extension"
 msgstr ""
 
 #: ../admin/inst_module.php:104
-#: ../admin/inst_module.php:169
+#: ../admin/inst_module.php:168
 msgid "Modules provided"
 msgstr ""
 
 #: ../admin/inst_module.php:104
-#: ../admin/inst_module.php:169
+#: ../admin/inst_module.php:168
 msgid "Options provided"
 msgstr ""
 
-#: ../admin/inst_module.php:133
+#: ../admin/inst_module.php:132
 msgid "Install third-party extension."
 msgstr ""
 
-#: ../admin/inst_module.php:169
-#: ../includes/ui/ui_lists.inc:648
-#: ../includes/ui/ui_lists.inc:2120
+#: ../admin/inst_module.php:168
+#: ../includes/ui/ui_lists.inc:677
+#: ../includes/ui/ui_lists.inc:2162
 #: ../reporting/includes/excel_report.inc:232
 #: ../reporting/includes/pdf_report.inc:264
 msgid "Active"
 msgstr ""
 
-#: ../admin/inst_module.php:232
+#: ../admin/inst_module.php:231
 msgid "Status change for some extensions failed."
 msgstr ""
 
-#: ../admin/inst_module.php:235
+#: ../admin/inst_module.php:234
 msgid "Current active extensions set has been saved."
 msgstr ""
 
-#: ../admin/inst_module.php:257
+#: ../admin/inst_module.php:256
 msgid "Extensions:"
 msgstr ""
 
@@ -1713,47 +1827,47 @@ msgstr ""
 msgid "Database upgrade for company '%s' (%s:%s*) started..."
 msgstr ""
 
-#: ../admin/inst_upgrade.php:80
+#: ../admin/inst_upgrade.php:83
 msgid "Database upgrade finished."
 msgstr ""
 
-#: ../admin/inst_upgrade.php:84
+#: ../admin/inst_upgrade.php:86
 msgid ""
 "Upgrade cannot be done because database has been already partially upgraded. "
 "Please downgrade database to clean previous version or try forced upgrade."
 msgstr ""
 
-#: ../admin/inst_upgrade.php:102
+#: ../admin/inst_upgrade.php:104
 msgid "Cannot connect to database for company"
 msgstr ""
 
-#: ../admin/inst_upgrade.php:114
+#: ../admin/inst_upgrade.php:117
 #, php-format
 msgid "Database upgrade to version %s failed for company '%s'."
 msgstr ""
 
-#: ../admin/inst_upgrade.php:117
+#: ../admin/inst_upgrade.php:120
 msgid "You should restore company database from latest backup file"
 msgstr ""
 
-#: ../admin/inst_upgrade.php:129
+#: ../admin/inst_upgrade.php:133
 msgid "All companies data has been successfully updated"
 msgstr ""
 
-#: ../admin/inst_upgrade.php:137
+#: ../admin/inst_upgrade.php:141
 msgid "Sql file"
 msgstr ""
 
-#: ../admin/inst_upgrade.php:138
+#: ../admin/inst_upgrade.php:142
 msgid "Force upgrade"
 msgstr ""
 
-#: ../admin/inst_upgrade.php:161
+#: ../admin/inst_upgrade.php:165
 #, php-format
 msgid "Partially installed (%s)"
 msgstr ""
 
-#: ../admin/inst_upgrade.php:170
+#: ../admin/inst_upgrade.php:174
 msgid ""
 "Database upgrades marked as partially installed cannot be installed "
 "automatically.\n"
@@ -1761,18 +1875,19 @@ msgid ""
 "upgrade."
 msgstr ""
 
-#: ../admin/inst_upgrade.php:174
+#: ../admin/inst_upgrade.php:178
 msgid "Upgrade system"
 msgstr ""
 
-#: ../admin/inst_upgrade.php:174
+#: ../admin/inst_upgrade.php:178
 msgid "Save database and perform upgrade"
 msgstr ""
 
 #: ../admin/payment_terms.php:16
-#: ../reporting/includes/doctext.inc:56
-#: ../sales/view/view_invoice.php:74
-#: ../sales/view/view_sales_order.php:77
+#: ../reporting/includes/doctext.inc:41
+#: ../sales/view/view_invoice.php:76
+#: ../sales/view/view_sales_order.php:82
+#: ../sales/view/view_sales_order.php:90
 msgid "Payment Terms"
 msgstr ""
 
@@ -1812,43 +1927,47 @@ msgstr ""
 #: ../dimensions/dimension_entry.php:275
 #: ../dimensions/inquiry/search_dimensions.php:75
 #: ../dimensions/inquiry/search_dimensions.php:130
-#: ../dimensions/view/view_dimension.php:54
-#: ../gl/bank_account_reconcile.php:233
-#: ../gl/inquiry/bank_inquiry.php:67
-#: ../gl/inquiry/gl_account_inquiry.php:125
-#: ../gl/inquiry/journal_inquiry.php:122
+#: ../dimensions/view/view_dimension.php:55
+#: ../gl/bank_account_reconcile.php:231
+#: ../gl/inquiry/bank_inquiry.php:70
+#: ../gl/inquiry/gl_account_inquiry.php:126
+#: ../gl/inquiry/journal_inquiry.php:129
 #: ../gl/inquiry/tax_inquiry.php:82
-#: ../gl/manage/bank_accounts.php:102
+#: ../gl/manage/bank_accounts.php:109
 #: ../gl/manage/gl_quick_entries.php:186
 #: ../gl/view/accrual_trans.php:52
-#: ../gl/includes/ui/gl_bank_ui.inc:80
-#: ../includes/ui/ui_view.inc:480
-#: ../inventory/inquiry/stock_movements.php:76
+#: ../gl/includes/ui/gl_bank_ui.inc:93
+#: ../includes/ui/ui_view.inc:547
+#: ../inventory/inquiry/stock_movements.php:78
 #: ../inventory/manage/item_categories.php:98
 #: ../manufacturing/search_work_orders.php:161
+#: ../manufacturing/view/wo_costs_view.php:46
 #: ../manufacturing/includes/manufacturing_ui.inc:236
 #: ../manufacturing/includes/manufacturing_ui.inc:276
 #: ../manufacturing/includes/manufacturing_ui.inc:280
 #: ../manufacturing/includes/manufacturing_ui.inc:331
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:125
-#: ../purchasing/inquiry/supplier_inquiry.php:162
-#: ../reporting/rep102.php:124
-#: ../reporting/rep202.php:127
-#: ../reporting/rep501.php:85
-#: ../reporting/rep601.php:76
-#: ../reporting/rep702.php:58
-#: ../reporting/rep704.php:78
-#: ../reporting/rep704.php:81
-#: ../reporting/rep704.php:84
-#: ../reporting/rep709.php:103
-#: ../reporting/rep710.php:76
-#: ../reporting/rep710.php:84
-#: ../reporting/reports_main.php:242
-#: ../reporting/reports_main.php:389
-#: ../reporting/includes/doctext.inc:42
-#: ../reporting/includes/doctext.inc:52
-#: ../sales/inquiry/customer_allocation_inquiry.php:141
-#: ../sales/inquiry/customer_inquiry.php:212
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:126
+#: ../purchasing/inquiry/supplier_inquiry.php:173
+#: ../reporting/rep102.php:134
+#: ../reporting/rep202.php:139
+#: ../reporting/rep402.php:103
+#: ../reporting/rep501.php:87
+#: ../reporting/rep601.php:79
+#: ../reporting/rep602.php:80
+#: ../reporting/rep702.php:60
+#: ../reporting/rep704.php:83
+#: ../reporting/rep704.php:86
+#: ../reporting/rep704.php:89
+#: ../reporting/rep709.php:112
+#: ../reporting/rep710.php:78
+#: ../reporting/rep710.php:86
+#: ../reporting/reports_main.php:340
+#: ../reporting/reports_main.php:504
+#: ../reporting/includes/doctext.inc:162
+#: ../reporting/includes/doctext.inc:203
+#: ../reporting/includes/doctext.inc:222
+#: ../sales/inquiry/customer_allocation_inquiry.php:144
+#: ../sales/inquiry/customer_inquiry.php:200
 msgid "Type"
 msgstr ""
 
@@ -1857,6 +1976,7 @@ msgid "Due After/Days"
 msgstr ""
 
 #: ../admin/payment_terms.php:140
+#: ../admin/void_transaction.php:125
 msgid "N/A"
 msgstr ""
 
@@ -2043,10 +2163,10 @@ msgid "Role:"
 msgstr ""
 
 #: ../admin/security_roles.php:180
-#: ../gl/manage/gl_accounts.php:195
-#: ../inventory/manage/items.php:253
-#: ../purchasing/manage/suppliers.php:281
-#: ../sales/manage/customers.php:282
+#: ../gl/manage/gl_accounts.php:198
+#: ../inventory/manage/items.php:444
+#: ../purchasing/manage/suppliers.php:293
+#: ../sales/manage/customers.php:330
 msgid "Show inactive:"
 msgstr ""
 
@@ -2088,37 +2208,39 @@ msgid "Delete This Role"
 msgstr ""
 
 #: ../admin/security_roles.php:249
-#: ../admin/void_transaction.php:212
+#: ../admin/void_transaction.php:229
 #: ../gl/manage/gl_quick_entries.php:61
-#: ../gl/includes/ui/gl_bank_ui.inc:248
-#: ../gl/includes/ui/gl_journal_ui.inc:223
+#: ../gl/includes/ui/gl_bank_ui.inc:279
+#: ../gl/includes/ui/gl_journal_ui.inc:259
 #: ../includes/ui/simple_crud_class.inc:58
 #: ../includes/ui/simple_crud_class.inc:231
-#: ../includes/ui/ui_controls.inc:561
-#: ../includes/ui/ui_input.inc:206
-#: ../inventory/includes/item_adjustments_ui.inc:159
-#: ../inventory/includes/stock_transfers_ui.inc:139
-#: ../inventory/manage/items.php:426
-#: ../manufacturing/includes/work_order_issue_ui.inc:129
-#: ../purchasing/includes/ui/po_ui.inc:436
+#: ../includes/ui/ui_controls.inc:596
+#: ../includes/ui/ui_input.inc:211
+#: ../inventory/includes/item_adjustments_ui.inc:165
+#: ../inventory/includes/stock_transfers_ui.inc:145
+#: ../inventory/manage/items.php:427
+#: ../manufacturing/includes/work_order_issue_ui.inc:140
+#: ../purchasing/includes/ui/po_ui.inc:461
 #: ../sales/includes/ui/sales_credit_ui.inc:295
-#: ../sales/includes/ui/sales_order_ui.inc:557
+#: ../sales/includes/ui/sales_order_ui.inc:548
+#: ../taxes/sav.tax_types.php:173
+#: ../taxes/sav.tax_types.php:253
+#: ../taxes/sav.tax_types.php:256
 msgid "Cancel"
 msgstr ""
 
 #: ../admin/security_roles.php:249
-#: ../inventory/manage/items.php:426
+#: ../inventory/manage/items.php:427
 msgid "Cancel Edition"
 msgstr ""
 
 #: ../admin/shipping_companies.php:15
-#: ../reporting/includes/doctext.inc:32
 #: ../sales/customer_credit_invoice.php:254
-#: ../sales/customer_delivery.php:354
-#: ../sales/customer_invoice.php:407
+#: ../sales/customer_delivery.php:392
+#: ../sales/customer_invoice.php:497
 #: ../sales/view/view_credit.php:74
 #: ../sales/view/view_dispatch.php:92
-#: ../sales/view/view_invoice.php:91
+#: ../sales/view/view_invoice.php:92
 msgid "Shipping Company"
 msgstr ""
 
@@ -2165,29 +2287,29 @@ msgstr ""
 
 #: ../admin/shipping_companies.php:91
 #: ../inventory/manage/locations.php:146
-#: ../reporting/includes/doctext.inc:75
 msgid "Address"
 msgstr ""
 
 #: ../admin/shipping_companies.php:134
-#: ../gl/manage/gl_account_types.php:182
-#: ../gl/includes/ui/gl_bank_ui.inc:55
-#: ../inventory/manage/items.php:309
+#: ../gl/manage/gl_account_types.php:188
+#: ../gl/includes/ui/gl_bank_ui.inc:57
+#: ../inventory/manage/items.php:307
 #: ../manufacturing/manage/work_centres.php:137
 msgid "Name:"
 msgstr ""
 
 #: ../admin/shipping_companies.php:136
-#: ../purchasing/manage/suppliers.php:104
-#: ../sales/manage/customer_branches.php:259
+#: ../purchasing/manage/suppliers.php:136
+#: ../sales/manage/customer_branches.php:261
 msgid "Contact Person:"
 msgstr ""
 
 #: ../admin/shipping_companies.php:140
 #: ../includes/ui/contacts_view.inc:103
 #: ../inventory/manage/locations.php:205
-#: ../purchasing/manage/suppliers.php:106
-#: ../sales/manage/customer_branches.php:261
+#: ../purchasing/manage/suppliers.php:138
+#: ../sales/manage/customer_branches.php:263
+#: ../sales/manage/customers.php:257
 msgid "Secondary Phone Number:"
 msgstr ""
 
@@ -2200,15 +2322,15 @@ msgid "Unspecified tag type"
 msgstr ""
 
 #: ../admin/tags.php:40
-#: ../reporting/reports_main.php:263
-#: ../reporting/reports_main.php:271
-#: ../reporting/reports_main.php:282
-#: ../reporting/reports_main.php:310
-#: ../reporting/reports_main.php:317
-#: ../reporting/reports_main.php:327
-#: ../reporting/reports_main.php:352
-#: ../reporting/reports_main.php:358
-#: ../reporting/reports_main.php:367
+#: ../reporting/reports_main.php:363
+#: ../reporting/reports_main.php:372
+#: ../reporting/reports_main.php:384
+#: ../reporting/reports_main.php:415
+#: ../reporting/reports_main.php:423
+#: ../reporting/reports_main.php:434
+#: ../reporting/reports_main.php:462
+#: ../reporting/reports_main.php:469
+#: ../reporting/reports_main.php:479
 msgid "Account Tags"
 msgstr ""
 
@@ -2269,64 +2391,68 @@ msgstr ""
 msgid "A new user has been added."
 msgstr ""
 
-#: ../admin/users.php:97
+#: ../admin/users.php:100
+msgid "Cannot delete this user because entries are associated with this user."
+msgstr ""
+
+#: ../admin/users.php:105
 msgid "User has been deleted."
 msgstr ""
 
-#: ../admin/users.php:114
+#: ../admin/users.php:123
 msgid "User login"
 msgstr ""
 
-#: ../admin/users.php:114
-#: ../admin/users.php:198
+#: ../admin/users.php:123
+#: ../admin/users.php:207
 #: ../includes/ui/contacts_view.inc:41
 msgid "Full Name"
 msgstr ""
 
-#: ../admin/users.php:114
+#: ../admin/users.php:123
 #: ../includes/ui/contacts_view.inc:41
 #: ../inventory/manage/locations.php:146
-#: ../reporting/rep106.php:86
-#: ../reporting/includes/header2.inc:86
+#: ../reporting/rep106.php:88
+#: ../reporting/includes/header2.inc:101
 #: ../sales/manage/sales_people.php:99
 msgid "Phone"
 msgstr ""
 
-#: ../admin/users.php:115
-#: ../sales/manage/customer_branches.php:300
-#: ../sales/view/view_sales_order.php:82
+#: ../admin/users.php:124
+#: ../sales/manage/customer_branches.php:302
+#: ../sales/view/view_sales_order.php:96
 msgid "E-mail"
 msgstr ""
 
-#: ../admin/users.php:115
+#: ../admin/users.php:124
 msgid "Last Visit"
 msgstr ""
 
-#: ../admin/users.php:115
+#: ../admin/users.php:124
 msgid "Access Level"
 msgstr ""
 
-#: ../admin/users.php:184
+#: ../admin/users.php:193
 msgid "User Login:"
 msgstr ""
 
-#: ../admin/users.php:195
+#: ../admin/users.php:204
 msgid "Enter a new password to change, leave empty to keep current."
 msgstr ""
 
-#: ../admin/users.php:200
+#: ../admin/users.php:209
 msgid "Telephone No.:"
 msgstr ""
 
-#: ../admin/users.php:204
+#: ../admin/users.php:213
 msgid "Access Level:"
 msgstr ""
 
-#: ../admin/users.php:208
+#: ../admin/users.php:217
 msgid "User's POS"
 msgstr ""
 
-#: ../admin/users.php:213
+#: ../admin/users.php:222
 msgid "Use popup window for reports:"
 msgstr ""
 
@@ -2337,12 +2463,12 @@ msgstr ""
 #: ../admin/view_print_transaction.php:43
 #: ../admin/view_print_transaction.php:45
 #: ../admin/view_print_transaction.php:129
-#: ../includes/ui/ui_controls.inc:172
-#: ../purchasing/inquiry/po_search_completed.php:108
-#: ../purchasing/inquiry/po_search.php:93
-#: ../sales/inquiry/customer_inquiry.php:197
-#: ../sales/inquiry/sales_deliveries_view.php:160
-#: ../sales/inquiry/sales_orders_view.php:116
+#: ../includes/ui/ui_controls.inc:195
+#: ../purchasing/inquiry/po_search_completed.php:115
+#: ../purchasing/inquiry/po_search.php:95
+#: ../sales/inquiry/customer_inquiry.php:185
+#: ../sales/inquiry/sales_deliveries_view.php:162
+#: ../sales/inquiry/sales_orders_view.php:125
 msgid "Print"
 msgstr ""
 
@@ -2351,26 +2477,29 @@ msgid "Only documents can be printed."
 msgstr ""
 
 #: ../admin/view_print_transaction.php:79
+#: ../admin/void_transaction.php:166
 msgid "from #:"
 msgstr ""
 
 #: ../admin/view_print_transaction.php:81
+#: ../admin/void_transaction.php:168
 msgid "to #:"
 msgstr ""
 
 #: ../admin/view_print_transaction.php:83
+#: ../admin/void_transaction.php:170
 #: ../dimensions/inquiry/search_dimensions.php:88
 #: ../gl/inquiry/journal_inquiry.php:53
 #: ../manufacturing/search_work_orders.php:78
-#: ../purchasing/includes/ui/invoice_ui.inc:452
-#: ../purchasing/inquiry/po_search_completed.php:74
-#: ../purchasing/inquiry/po_search.php:76
+#: ../purchasing/includes/ui/invoice_ui.inc:489
+#: ../purchasing/inquiry/po_search_completed.php:77
+#: ../purchasing/inquiry/po_search.php:78
 #: ../purchasing/inquiry/supplier_allocation_inquiry.php:57
-#: ../purchasing/inquiry/supplier_inquiry.php:54
+#: ../purchasing/inquiry/supplier_inquiry.php:55
 #: ../sales/inquiry/customer_allocation_inquiry.php:51
 #: ../sales/inquiry/customer_inquiry.php:54
-#: ../sales/inquiry/sales_deliveries_view.php:116
-#: ../sales/inquiry/sales_orders_view.php:238
+#: ../sales/inquiry/sales_deliveries_view.php:118
+#: ../sales/inquiry/sales_orders_view.php:270
 msgid "Search"
 msgstr ""
 
@@ -2387,18 +2516,18 @@ msgid ""
 msgstr ""
 
 #: ../admin/view_print_transaction.php:127
-#: ../admin/void_transaction.php:165
+#: ../admin/void_transaction.php:182
 #: ../dimensions/inquiry/search_dimensions.php:128
-#: ../dimensions/view/view_dimension.php:54
-#: ../gl/bank_account_reconcile.php:235
-#: ../gl/inquiry/bank_inquiry.php:67
-#: ../gl/inquiry/journal_inquiry.php:124
+#: ../dimensions/view/view_dimension.php:55
+#: ../gl/bank_account_reconcile.php:233
+#: ../gl/inquiry/bank_inquiry.php:70
+#: ../gl/inquiry/journal_inquiry.php:131
 #: ../gl/view/bank_transfer_view.php:86
-#: ../gl/view/gl_deposit_view.php:75
-#: ../gl/view/gl_payment_view.php:73
+#: ../gl/view/gl_deposit_view.php:80
+#: ../gl/view/gl_payment_view.php:78
 #: ../gl/view/gl_trans_view.php:35
 #: ../includes/ui/contacts_view.inc:41
-#: ../inventory/inquiry/stock_movements.php:76
+#: ../inventory/inquiry/stock_movements.php:78
 #: ../inventory/view/view_adjustment.php:44
 #: ../inventory/view/view_transfer.php:44
 #: ../manufacturing/search_work_orders.php:160
@@ -2409,65 +2538,67 @@ msgstr ""
 #: ../manufacturing/includes/manufacturing_ui.inc:276
 #: ../manufacturing/includes/manufacturing_ui.inc:280
 #: ../manufacturing/includes/manufacturing_ui.inc:331
-#: ../purchasing/includes/ui/grn_ui.inc:36
-#: ../purchasing/includes/ui/grn_ui.inc:53
-#: ../purchasing/includes/ui/po_ui.inc:314
+#: ../purchasing/includes/ui/grn_ui.inc:32
+#: ../purchasing/includes/ui/grn_ui.inc:64
+#: ../purchasing/includes/ui/po_ui.inc:323
 #: ../purchasing/view/view_po.php:115
 #: ../purchasing/view/view_supp_credit.php:43
-#: ../purchasing/view/view_supp_invoice.php:46
-#: ../purchasing/view/view_supp_payment.php:70
-#: ../purchasing/inquiry/po_search_completed.php:117
-#: ../purchasing/inquiry/po_search.php:131
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:127
-#: ../purchasing/inquiry/supplier_inquiry.php:164
+#: ../purchasing/view/view_supp_invoice.php:47
+#: ../purchasing/view/view_supp_payment.php:73
+#: ../purchasing/inquiry/po_search_completed.php:124
+#: ../purchasing/inquiry/po_search.php:133
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:128
+#: ../purchasing/inquiry/supplier_inquiry.php:175
 #: ../purchasing/allocations/supplier_allocation_main.php:96
-#: ../reporting/rep501.php:85
-#: ../reporting/rep601.php:76
-#: ../reporting/rep702.php:51
-#: ../reporting/includes/doctext.inc:45
+#: ../reporting/rep501.php:87
+#: ../reporting/rep601.php:79
+#: ../reporting/rep602.php:80
+#: ../reporting/rep702.php:53
+#: ../reporting/includes/doctext.inc:221
 #: ../sales/customer_credit_invoice.php:245
 #: ../sales/customer_credit_invoice.php:247
-#: ../sales/customer_delivery.php:334
-#: ../sales/customer_delivery.php:336
-#: ../sales/customer_invoice.php:386
-#: ../sales/customer_invoice.php:388
+#: ../sales/customer_delivery.php:372
+#: ../sales/customer_delivery.php:374
+#: ../sales/customer_invoice.php:469
+#: ../sales/customer_invoice.php:471
 #: ../sales/allocations/customer_allocation_main.php:95
 #: ../sales/view/view_dispatch.php:85
-#: ../sales/view/view_invoice.php:84
-#: ../sales/view/view_receipt.php:50
-#: ../sales/view/view_sales_order.php:80
-#: ../sales/inquiry/customer_allocation_inquiry.php:143
-#: ../sales/inquiry/customer_inquiry.php:215
-#: ../sales/inquiry/sales_deliveries_view.php:184
+#: ../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:146
+#: ../sales/inquiry/customer_inquiry.php:203
+#: ../sales/inquiry/sales_deliveries_view.php:186
 #: ../sales/includes/ui/sales_credit_ui.inc:85
 #: ../sales/includes/ui/sales_credit_ui.inc:87
-#: ../sales/includes/ui/sales_order_ui.inc:373
+#: ../sales/includes/ui/sales_order_ui.inc:364
 msgid "Reference"
 msgstr ""
 
 #: ../admin/view_print_transaction.php:128
-#: ../admin/void_transaction.php:166
+#: ../admin/void_transaction.php:183
 #: ../dimensions/inquiry/search_dimensions.php:131
-#: ../dimensions/view/view_dimension.php:54
-#: ../gl/accruals.php:90
-#: ../gl/accruals.php:195
-#: ../gl/bank_account_reconcile.php:236
-#: ../gl/inquiry/bank_inquiry.php:67
-#: ../gl/inquiry/gl_account_inquiry.php:125
-#: ../gl/inquiry/journal_inquiry.php:121
+#: ../dimensions/view/view_dimension.php:55
+#: ../gl/accruals.php:94
+#: ../gl/accruals.php:199
+#: ../gl/bank_account_reconcile.php:234
+#: ../gl/inquiry/bank_inquiry.php:70
+#: ../gl/inquiry/gl_account_inquiry.php:126
+#: ../gl/inquiry/journal_inquiry.php:128
 #: ../gl/view/accrual_trans.php:52
 #: ../gl/view/bank_transfer_view.php:83
 #: ../gl/view/gl_deposit_view.php:68
 #: ../gl/view/gl_payment_view.php:66
 #: ../gl/view/gl_trans_view.php:36
-#: ../includes/ui/allocation_cart.inc:263
-#: ../includes/ui/ui_view.inc:480
-#: ../inventory/inquiry/stock_movements.php:76
+#: ../includes/ui/allocation_cart.inc:290
+#: ../includes/ui/ui_view.inc:547
+#: ../inventory/inquiry/stock_movements.php:80
 #: ../inventory/view/view_adjustment.php:45
 #: ../inventory/view/view_transfer.php:47
 #: ../manufacturing/search_work_orders.php:166
 #: ../manufacturing/work_order_entry.php:417
 #: ../manufacturing/work_order_entry.php:423
+#: ../manufacturing/view/wo_costs_view.php:46
 #: ../manufacturing/view/wo_production_view.php:45
 #: ../manufacturing/includes/manufacturing_ui.inc:157
 #: ../manufacturing/includes/manufacturing_ui.inc:200
@@ -2475,40 +2606,43 @@ msgstr ""
 #: ../manufacturing/includes/manufacturing_ui.inc:277
 #: ../manufacturing/includes/manufacturing_ui.inc:281
 #: ../manufacturing/includes/manufacturing_ui.inc:332
-#: ../purchasing/includes/ui/invoice_ui.inc:103
-#: ../purchasing/includes/ui/po_ui.inc:328
+#: ../purchasing/includes/ui/invoice_ui.inc:129
+#: ../purchasing/includes/ui/po_ui.inc:337
 #: ../purchasing/view/view_po.php:140
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:130
-#: ../purchasing/inquiry/supplier_inquiry.php:167
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:131
+#: ../purchasing/inquiry/supplier_inquiry.php:178
 #: ../purchasing/allocations/supplier_allocation_main.php:97
-#: ../reporting/rep101.php:130
-#: ../reporting/rep201.php:118
-#: ../reporting/rep501.php:85
-#: ../reporting/rep601.php:76
-#: ../reporting/rep704.php:78
-#: ../reporting/rep704.php:81
-#: ../reporting/rep704.php:84
-#: ../reporting/rep709.php:107
-#: ../reporting/rep710.php:75
-#: ../reporting/includes/doctext.inc:15
-#: ../reporting/includes/doctext.inc:108
-#: ../reporting/includes/doctext.inc:116
-#: ../sales/customer_delivery.php:364
-#: ../sales/customer_invoice.php:417
+#: ../reporting/rep101.php:118
+#: ../reporting/rep107.php:202
+#: ../reporting/rep201.php:110
+#: ../reporting/rep306.php:141
+#: ../reporting/rep402.php:103
+#: ../reporting/rep501.php:87
+#: ../reporting/rep601.php:79
+#: ../reporting/rep602.php:80
+#: ../reporting/rep704.php:83
+#: ../reporting/rep704.php:86
+#: ../reporting/rep704.php:89
+#: ../reporting/rep709.php:116
+#: ../reporting/rep710.php:77
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:208
+#: ../reporting/includes/doctext.inc:246
+#: ../reporting/includes/header2.inc:138
+#: ../sales/customer_delivery.php:402
+#: ../sales/customer_invoice.php:512
 #: ../sales/allocations/customer_allocation_main.php:96
 #: ../sales/view/view_credit.php:69
-#: ../sales/view/view_sales_order.php:95
-#: ../sales/view/view_sales_order.php:128
-#: ../sales/view/view_sales_order.php:160
-#: ../sales/inquiry/customer_allocation_inquiry.php:145
-#: ../sales/inquiry/customer_inquiry.php:216
-#: ../themes/exclusive/renderer.php:289
-#: ../themes/exclusive/renderer.php:383
+#: ../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:148
+#: ../sales/inquiry/customer_inquiry.php:204
 msgid "Date"
 msgstr ""
 
 #: ../admin/view_print_transaction.php:130
-#: ../admin/void_transaction.php:167
+#: ../admin/void_transaction.php:184
 #: ../includes/ui/ui_view.inc:51
 msgid "GL"
 msgstr ""
@@ -2517,187 +2651,179 @@ msgstr ""
 msgid "Void a Transaction"
 msgstr ""
 
-#: ../admin/void_transaction.php:119
-#: ../admin/void_transaction.php:168
-#: ../includes/ui/ui_input.inc:136
-#: ../includes/ui/ui_input.inc:277
+#: ../admin/void_transaction.php:126
+#: ../admin/void_transaction.php:185
+#: ../includes/ui/ui_input.inc:138
+#: ../includes/ui/ui_input.inc:282
 #: ../includes/ui/ui_lists.inc:20
 msgid "Select"
 msgstr ""
 
-#: ../admin/void_transaction.php:151
+#: ../admin/void_transaction.php:157
 msgid "Transaction Type:"
 msgstr ""
 
-#: ../admin/void_transaction.php:187
+#: ../admin/void_transaction.php:204
 msgid "Transaction #:"
 msgstr ""
 
-#: ../admin/void_transaction.php:189
+#: ../admin/void_transaction.php:206
 msgid "Voiding Date:"
 msgstr ""
 
-#: ../admin/void_transaction.php:191
+#: ../admin/void_transaction.php:208
 #: ../dimensions/dimension_entry.php:283
-#: ../gl/bank_transfer.php:91
+#: ../gl/bank_transfer.php:98
 #: ../gl/inquiry/journal_inquiry.php:56
-#: ../gl/manage/revaluate_currencies.php:103
-#: ../includes/ui/ui_view.inc:308
-#: ../manufacturing/work_order_add_finished.php:210
+#: ../gl/manage/revaluate_currencies.php:106
+#: ../includes/ui/ui_view.inc:344
+#: ../manufacturing/work_order_add_finished.php:207
+#: ../manufacturing/work_order_costs.php:146
 #: ../manufacturing/work_order_entry.php:449
-#: ../manufacturing/work_order_release.php:100
-#: ../purchasing/includes/ui/invoice_ui.inc:161
-#: ../purchasing/po_entry_items.php:504
-#: ../purchasing/supplier_payment.php:308
-#: ../sales/customer_payments.php:291
+#: ../manufacturing/work_order_release.php:103
+#: ../purchasing/includes/ui/invoice_ui.inc:195
+#: ../purchasing/includes/ui/po_ui.inc:494
+#: ../purchasing/po_entry_items.php:485
+#: ../purchasing/supplier_payment.php:325
+#: ../sales/customer_invoice.php:689
+#: ../sales/customer_payments.php:402
 msgid "Memo:"
 msgstr ""
 
-#: ../admin/void_transaction.php:196
-#: ../admin/void_transaction.php:205
+#: ../admin/void_transaction.php:213
+#: ../admin/void_transaction.php:222
 msgid "Void Transaction"
 msgstr ""
 
-#: ../admin/void_transaction.php:201
-#: ../admin/void_transaction.php:280
+#: ../admin/void_transaction.php:218
+#: ../admin/void_transaction.php:297
 msgid "The entered transaction does not exist or cannot be voided."
 msgstr ""
 
-#: ../admin/void_transaction.php:209
+#: ../admin/void_transaction.php:226
 msgid ""
 "Are you sure you want to void this transaction ? This action cannot be "
 "undone."
 msgstr ""
 
-#: ../admin/void_transaction.php:211
-#: ../includes/ui/ui_controls.inc:560
+#: ../admin/void_transaction.php:228
+#: ../includes/ui/ui_controls.inc:595
 msgid "Proceed"
 msgstr ""
 
-#: ../admin/void_transaction.php:225
+#: ../admin/void_transaction.php:242
 msgid "The selected transaction was closed for edition and cannot be voided."
 msgstr ""
 
-#: ../admin/void_transaction.php:231
+#: ../admin/void_transaction.php:248
 #: ../gl/accruals.php:32
-#: ../gl/bank_transfer.php:108
-#: ../gl/gl_journal.php:154
+#: ../gl/bank_transfer.php:115
+#: ../gl/gl_journal.php:162
+#: ../gl/manage/close_period.php:34
 #: ../gl/manage/exchange_rates.php:33
-#: ../gl/manage/revaluate_currencies.php:50
+#: ../gl/manage/revaluate_currencies.php:53
 #: ../manufacturing/work_order_add_finished.php:98
-#: ../manufacturing/work_order_costs.php:83
+#: ../manufacturing/work_order_costs.php:80
 #: ../purchasing/po_receive_items.php:174
-#: ../purchasing/supplier_payment.php:179
-#: ../sales/customer_credit_invoice.php:89
-#: ../sales/sales_order_entry.php:335
+#: ../purchasing/supplier_payment.php:185
+#: ../sales/customer_credit_invoice.php:91
+#: ../sales/sales_order_entry.php:366
+#: ../sales/manage/recurrent_invoices.php:41
+#: ../sales/manage/recurrent_invoices.php:46
+#: ../sales/manage/recurrent_invoices.php:51
 msgid "The entered date is invalid."
 msgstr ""
 
-#: ../admin/void_transaction.php:237
-#: ../gl/accruals.php:38
-#: ../gl/bank_transfer.php:114
-#: ../gl/gl_bank.php:256
-#: ../gl/gl_journal.php:160
-#: ../gl/manage/revaluate_currencies.php:56
-#: ../inventory/adjustments.php:114
-#: ../inventory/transfers.php:111
-#: ../manufacturing/work_order_add_finished.php:104
-#: ../manufacturing/work_order_costs.php:89
-#: ../manufacturing/work_order_entry.php:159
-#: ../manufacturing/work_order_issue.php:85
-#: ../purchasing/supplier_credit.php:176
-#: ../purchasing/supplier_invoice.php:174
-#: ../purchasing/supplier_payment.php:185
-#: ../sales/create_recurrent_invoices.php:92
-#: ../sales/credit_note_entry.php:159
-#: ../sales/customer_credit_invoice.php:93
-#: ../sales/customer_payments.php:100
+#: ../admin/void_transaction.php:254
 msgid "The entered date is not in fiscal year."
 msgstr ""
 
-#: ../admin/void_transaction.php:244
+#: ../admin/void_transaction.php:261
 msgid "The transaction number is expected to be numeric and greater than zero."
 msgstr ""
 
-#: ../admin/void_transaction.php:261
+#: ../admin/void_transaction.php:278
 msgid "The selected transaction has already been voided."
 msgstr ""
 
-#: ../admin/void_transaction.php:274
+#: ../admin/void_transaction.php:291
 msgid "Selected transaction has been voided."
 msgstr ""
 
-#: ../admin/db/fiscalyears_db.inc:124
-msgid ""
-"The Retained Earnings Account or the Profit and Loss Year Account has not "
-"been set in System and General GL Setup"
+#: ../admin/db/attachments_db.inc:67
+msgid "Attached File:"
 msgstr ""
 
-#: ../admin/db/fiscalyears_db.inc:129
+#: ../admin/db/fiscalyears_db.inc:136
 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)"
+"The Retained Earnings Account or the Profit and Loss Year Account has not "
+"been set in System and General GL Setup"
 msgstr ""
 
-#: ../admin/db/fiscalyears_db.inc:154
-#: ../admin/db/fiscalyears_db.inc:156
+#: ../admin/db/fiscalyears_db.inc:166
+#: ../admin/db/fiscalyears_db.inc:168
 msgid "Closing Year"
 msgstr ""
 
-#: ../admin/db/fiscalyears_db.inc:202
-#: ../reporting/rep101.php:175
-#: ../reporting/rep201.php:167
-#: ../reporting/rep706.php:181
+#: ../admin/db/fiscalyears_db.inc:219
+#: ../reporting/rep101.php:173
+#: ../reporting/rep201.php:165
+#: ../reporting/rep706.php:185
 msgid "Open Balance"
 msgstr ""
 
-#: ../admin/db/maintenance_db.inc:150
+#: ../admin/db/maintenance_db.inc:152
 #, php-format
 msgid "Cannot open the extension setup file '%s' for writing."
 msgstr ""
 
-#: ../admin/db/maintenance_db.inc:158
+#: ../admin/db/maintenance_db.inc:160
 #, php-format
 msgid "Cannot write to the extensions setup file '%s'."
 msgstr ""
 
-#: ../admin/db/maintenance_db.inc:176
+#: ../admin/db/maintenance_db.inc:178
 msgid "Cannot update system extensions list."
 msgstr ""
 
-#: ../admin/db/maintenance_db.inc:194
+#: ../admin/db/maintenance_db.inc:196
 #, php-format
 msgid "Cannot update extensions list for company '%s'."
 msgstr ""
 
-#: ../admin/db/maintenance_db.inc:231
+#: ../admin/db/maintenance_db.inc:233
 msgid "Cannot open the languages file - "
 msgstr ""
 
-#: ../admin/db/maintenance_db.inc:238
+#: ../admin/db/maintenance_db.inc:240
 msgid "Cannot write to the language file - "
 msgstr ""
 
-#: ../admin/db/maintenance_db.inc:248
+#: ../admin/db/maintenance_db.inc:250
 msgid "The language files folder "
 msgstr ""
 
-#: ../admin/db/maintenance_db.inc:374
+#: ../admin/db/maintenance_db.inc:391
+msgid ""
+"This is new format backup file which cannot be restored on database not "
+"migrated to utf8."
+msgstr ""
+
+#: ../admin/db/maintenance_db.inc:473
 #, php-format
 msgid "SQL script execution failed in line %d: %s"
 msgstr ""
 
-#: ../admin/db/users_db.inc:196
+#: ../admin/db/users_db.inc:221
 msgid "user online"
 msgstr ""
 
-#: ../admin/db/users_db.inc:196
+#: ../admin/db/users_db.inc:221
 msgid "users online"
 msgstr ""
 
-#: ../admin/db/voiding_db.inc:107
-#: ../sales/includes/db/sales_invoice_db.inc:205
+#: ../admin/db/voiding_db.inc:114
+#: ../sales/includes/db/sales_invoice_db.inc:251
 msgid "Voided."
 msgstr ""
 
@@ -2756,14 +2882,18 @@ msgid "Customer &Payments"
 msgstr ""
 
 #: ../applications/customers.php:42
-msgid "Customer &Credit Notes"
+msgid "Invoice &Prepaid Orders"
 msgstr ""
 
 #: ../applications/customers.php:44
+msgid "Customer &Credit Notes"
+msgstr ""
+
+#: ../applications/customers.php:46
 msgid "&Allocate Customer Payments or Credit Notes"
 msgstr ""
 
-#: ../applications/customers.php:47
+#: ../applications/customers.php:49
 #: ../applications/dimensions.php:27
 #: ../applications/generalledger.php:34
 #: ../applications/inventory.php:24
@@ -2772,65 +2902,65 @@ msgstr ""
 msgid "Inquiries and Reports"
 msgstr ""
 
-#: ../applications/customers.php:48
+#: ../applications/customers.php:50
 msgid "Sales Quotation I&nquiry"
 msgstr ""
 
-#: ../applications/customers.php:50
+#: ../applications/customers.php:52
 msgid "Sales Order &Inquiry"
 msgstr ""
 
-#: ../applications/customers.php:52
+#: ../applications/customers.php:54
 msgid "Customer Transaction &Inquiry"
 msgstr ""
 
-#: ../applications/customers.php:55
+#: ../applications/customers.php:56
 msgid "Customer Allocation &Inquiry"
 msgstr ""
 
-#: ../applications/customers.php:58
+#: ../applications/customers.php:59
 msgid "Customer and Sales &Reports"
 msgstr ""
 
-#: ../applications/customers.php:61
+#: ../applications/customers.php:62
 #: ../applications/dimensions.php:34
 #: ../applications/generalledger.php:55
 #: ../applications/inventory.php:32
 #: ../applications/manufacturing.php:34
 #: ../applications/setup.php:54
-#: ../applications/suppliers.php:50
+#: ../applications/suppliers.php:49
 msgid "Maintenance"
 msgstr ""
 
-#: ../applications/customers.php:62
+#: ../applications/customers.php:63
 msgid "Add and Manage &Customers"
 msgstr ""
 
-#: ../applications/customers.php:64
+#: ../applications/customers.php:65
 msgid "Customer &Branches"
 msgstr ""
 
-#: ../applications/customers.php:66
+#: ../applications/customers.php:67
 msgid "Sales &Groups"
 msgstr ""
 
-#: ../applications/customers.php:68
+#: ../applications/customers.php:69
 msgid "Recurrent &Invoices"
 msgstr ""
 
-#: ../applications/customers.php:70
+#: ../applications/customers.php:71
 msgid "Sales T&ypes"
 msgstr ""
 
-#: ../applications/customers.php:72
+#: ../applications/customers.php:73
 msgid "Sales &Persons"
 msgstr ""
 
-#: ../applications/customers.php:74
+#: ../applications/customers.php:75
 msgid "Sales &Areas"
 msgstr ""
 
-#: ../applications/customers.php:76
+#: ../applications/customers.php:77
 msgid "Credit &Status Setup"
 msgstr ""
 
@@ -2907,9 +3037,9 @@ msgid "Ta&x Inquiry"
 msgstr ""
 
 #: ../applications/generalledger.php:44
-#: ../reporting/reports_main.php:287
-#: ../reporting/reports_main.php:332
-#: ../reporting/reports_main.php:372
+#: ../reporting/reports_main.php:390
+#: ../reporting/reports_main.php:440
+#: ../reporting/reports_main.php:485
 msgid "Trial &Balance"
 msgstr ""
 
@@ -2961,7 +3091,11 @@ msgstr ""
 msgid "GL Account &Classes"
 msgstr ""
 
-#: ../applications/generalledger.php:75
+#: ../applications/generalledger.php:74
+msgid "&Closing GL Transactions"
+msgstr ""
+
+#: ../applications/generalledger.php:76
 msgid "&Revaluation of Currency Accounts"
 msgstr ""
 
@@ -3018,6 +3152,7 @@ msgid "&Units of Measure"
 msgstr ""
 
 #: ../applications/inventory.php:47
+#: ../inventory/manage/items.php:469
 msgid "&Reorder Levels"
 msgstr ""
 
@@ -3034,6 +3169,7 @@ msgid "Purchasing &Pricing"
 msgstr ""
 
 #: ../applications/inventory.php:55
+#: ../inventory/manage/items.php:468
 msgid "Standard &Costs"
 msgstr ""
 
@@ -3042,7 +3178,7 @@ msgid "&Manufacturing"
 msgstr ""
 
 #: ../applications/manufacturing.php:19
-#: ../sales/sales_order_entry.php:112
+#: ../sales/sales_order_entry.php:126
 msgid "Work &Order Entry"
 msgstr ""
 
@@ -3227,15 +3363,15 @@ msgstr ""
 msgid "Supplier Transaction &Inquiry"
 msgstr ""
 
-#: ../applications/suppliers.php:44
+#: ../applications/suppliers.php:43
 msgid "Supplier Allocation &Inquiry"
 msgstr ""
 
-#: ../applications/suppliers.php:47
+#: ../applications/suppliers.php:46
 msgid "Supplier and Purchasing &Reports"
 msgstr ""
 
-#: ../applications/suppliers.php:51
+#: ../applications/suppliers.php:50
 msgid "&Suppliers"
 msgstr ""
 
@@ -3276,26 +3412,29 @@ msgid "The dimension reference must be entered."
 msgstr ""
 
 #: ../dimensions/dimension_entry.php:123
-#: ../gl/bank_transfer.php:155
-#: ../gl/gl_bank.php:244
-#: ../gl/gl_journal.php:174
-#: ../gl/manage/revaluate_currencies.php:69
+#: ../gl/bank_transfer.php:176
+#: ../gl/gl_bank.php:257
+#: ../gl/gl_journal.php:182
+#: ../gl/manage/revaluate_currencies.php:72
 #: ../inventory/adjustments.php:101
-#: ../inventory/transfers.php:99
+#: ../inventory/transfers.php:96
 #: ../manufacturing/work_order_add_finished.php:84
-#: ../manufacturing/work_order_entry.php:138
-#: ../manufacturing/work_order_issue.php:98
-#: ../purchasing/po_entry_items.php:356
-#: ../purchasing/po_receive_items.php:188
-#: ../purchasing/supplier_credit.php:156
-#: ../purchasing/supplier_invoice.php:154
-#: ../purchasing/supplier_payment.php:208
-#: ../sales/credit_note_entry.php:149
-#: ../sales/customer_credit_invoice.php:106
-#: ../sales/customer_delivery.php:169
-#: ../sales/customer_invoice.php:280
-#: ../sales/customer_payments.php:112
-#: ../sales/sales_order_entry.php:404
+#: ../manufacturing/work_order_entry.php:139
+#: ../manufacturing/work_order_issue.php:97
+#: ../manufacturing/work_order_issue.php.orig:97
+#: ../purchasing/po_entry_items.php:365
+#: ../purchasing/po_receive_items.php:193
+#: ../purchasing/supplier_credit.php:182
+#: ../purchasing/supplier_invoice.php:190
+#: ../purchasing/supplier_payment.php:214
+#: ../sales/create_recurrent_invoices.php:57
+#: ../sales/credit_note_entry.php:181
+#: ../sales/customer_credit_invoice.php:205
+#: ../sales/customer_delivery.php:334
+#: ../sales/customer_invoice.php:388
+#: ../sales/customer_payments.php:169
+#: ../sales/customer_payments.php:176
+#: ../sales/sales_order_entry.php:475
 msgid "The entered reference is already in use."
 msgstr ""
 
@@ -3304,9 +3443,9 @@ msgid "The dimension name must be entered."
 msgstr ""
 
 #: ../dimensions/dimension_entry.php:138
-#: ../manufacturing/work_order_entry.php:153
-#: ../manufacturing/work_order_entry.php:233
-#: ../purchasing/po_entry_items.php:235
+#: ../manufacturing/work_order_entry.php:154
+#: ../manufacturing/work_order_entry.php:232
+#: ../purchasing/po_entry_items.php:238
 msgid "The date entered is in an invalid format."
 msgstr ""
 
@@ -3329,27 +3468,33 @@ msgstr ""
 
 #: ../dimensions/dimension_entry.php:277
 #: ../reporting/reports_main.php:34
-#: ../reporting/reports_main.php:67
-#: ../reporting/reports_main.php:75
-#: ../reporting/reports_main.php:126
-#: ../reporting/reports_main.php:189
-#: ../reporting/reports_main.php:197
-#: ../reporting/reports_main.php:229
-#: ../reporting/reports_main.php:240
-#: ../reporting/reports_main.php:251
-#: ../reporting/reports_main.php:267
-#: ../reporting/reports_main.php:277
-#: ../reporting/reports_main.php:288
-#: ../reporting/reports_main.php:300
-#: ../reporting/reports_main.php:314
-#: ../reporting/reports_main.php:323
-#: ../reporting/reports_main.php:333
-#: ../reporting/reports_main.php:344
-#: ../reporting/reports_main.php:356
-#: ../reporting/reports_main.php:364
-#: ../reporting/reports_main.php:373
-#: ../reporting/reports_main.php:381
-#: ../reporting/reports_main.php:387
+#: ../reporting/reports_main.php:64
+#: ../reporting/reports_main.php:80
+#: ../reporting/reports_main.php:89
+#: ../reporting/reports_main.php:151
+#: ../reporting/reports_main.php:233
+#: ../reporting/reports_main.php: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:318
+#: ../reporting/reports_main.php:326
+#: ../reporting/reports_main.php:338
+#: ../reporting/reports_main.php:350
+#: ../reporting/reports_main.php:368
+#: ../reporting/reports_main.php:379
+#: ../reporting/reports_main.php:391
+#: ../reporting/reports_main.php:404
+#: ../reporting/reports_main.php:420
+#: ../reporting/reports_main.php:430
+#: ../reporting/reports_main.php:441
+#: ../reporting/reports_main.php:453
+#: ../reporting/reports_main.php:467
+#: ../reporting/reports_main.php:476
+#: ../reporting/reports_main.php:486
+#: ../reporting/reports_main.php:495
+#: ../reporting/reports_main.php:502
 msgid "Start Date"
 msgstr ""
 
@@ -3396,9 +3541,10 @@ msgstr ""
 
 #: ../dimensions/dimension_entry.php:302
 #: ../includes/ui/simple_crud_class.inc:225
-#: ../purchasing/includes/ui/invoice_ui.inc:186
-#: ../purchasing/includes/ui/invoice_ui.inc:391
-#: ../purchasing/includes/ui/invoice_ui.inc:393
+#: ../purchasing/includes/ui/invoice_ui.inc:221
+#: ../purchasing/includes/ui/invoice_ui.inc:427
+#: ../purchasing/includes/ui/invoice_ui.inc:429
+#: ../taxes/sav.tax_types.php:172
 msgid "Add"
 msgstr ""
 
@@ -3411,99 +3557,105 @@ msgid "Balance for this Dimension"
 msgstr ""
 
 #: ../dimensions/includes/dimensions_ui.inc:31
-#: ../gl/accruals.php:90
-#: ../gl/inquiry/gl_account_inquiry.php:128
-#: ../gl/inquiry/gl_trial_balance.php:83
+#: ../gl/accruals.php:94
+#: ../gl/inquiry/gl_account_inquiry.php:129
+#: ../gl/inquiry/gl_trial_balance.php:184
 #: ../gl/manage/gl_quick_entries.php:241
 #: ../gl/manage/gl_quick_entries.php:333
-#: ../includes/sysnames.inc:164
-#: ../purchasing/includes/ui/invoice_ui.inc:245
-#: ../purchasing/includes/ui/invoice_ui.inc:247
-#: ../purchasing/includes/ui/invoice_ui.inc:249
-#: ../reporting/rep701.php:106
-#: ../reporting/rep705.php:234
-#: ../reporting/rep706.php:181
-#: ../reporting/rep707.php:206
-#: ../reporting/rep708.php:80
+#: ../includes/sysnames.inc:165
+#: ../purchasing/includes/ui/invoice_ui.inc:280
+#: ../purchasing/includes/ui/invoice_ui.inc:282
+#: ../purchasing/includes/ui/invoice_ui.inc:284
+#: ../reporting/rep701.php:111
+#: ../reporting/rep705.php:238
+#: ../reporting/rep706.php:185
+#: ../reporting/rep707.php:210
+#: ../reporting/rep708.php:192
 msgid "Account"
 msgstr ""
 
 #: ../dimensions/includes/dimensions_ui.inc:31
-#: ../gl/accruals.php:98
-#: ../gl/bank_account_reconcile.php:237
-#: ../gl/inquiry/bank_inquiry.php:68
-#: ../gl/inquiry/gl_account_inquiry.php:140
-#: ../gl/inquiry/gl_account_inquiry.php:142
-#: ../gl/inquiry/gl_trial_balance.php:89
-#: ../gl/inquiry/gl_trial_balance.php:91
-#: ../gl/inquiry/gl_trial_balance.php:93
+#: ../gl/accruals.php:102
+#: ../gl/bank_account_reconcile.php:235
+#: ../gl/inquiry/bank_inquiry.php:71
+#: ../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/view/gl_trans_view.php:64
-#: ../gl/view/gl_trans_view.php:67
-#: ../gl/view/gl_trans_view.php:70
-#: ../gl/includes/ui/gl_journal_ui.inc:84
+#: ../gl/view/gl_trans_view.php:69
+#: ../gl/view/gl_trans_view.php:72
+#: ../gl/view/gl_trans_view.php:75
 #: ../gl/includes/ui/gl_journal_ui.inc:87
 #: ../gl/includes/ui/gl_journal_ui.inc:90
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:133
-#: ../purchasing/inquiry/supplier_inquiry.php:170
-#: ../reporting/rep601.php:77
-#: ../reporting/rep702.php:52
-#: ../reporting/rep704.php:79
-#: ../reporting/rep704.php:82
-#: ../reporting/rep704.php:85
-#: ../reporting/rep708.php:80
-#: ../reporting/rep708.php:81
-#: ../sales/inquiry/customer_allocation_inquiry.php:149
-#: ../sales/inquiry/customer_inquiry.php:221
+#: ../gl/includes/ui/gl_journal_ui.inc:93
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:134
+#: ../purchasing/inquiry/supplier_inquiry.php:181
+#: ../reporting/rep601.php:80
+#: ../reporting/rep602.php:81
+#: ../reporting/rep702.php:54
+#: ../reporting/rep704.php:84
+#: ../reporting/rep704.php:87
+#: ../reporting/rep704.php:90
+#: ../reporting/rep708.php:192
+#: ../reporting/rep708.php:193
+#: ../sales/inquiry/customer_allocation_inquiry.php:152
+#: ../sales/inquiry/customer_inquiry.php:209
 msgid "Debit"
 msgstr ""
 
 #: ../dimensions/includes/dimensions_ui.inc:31
-#: ../gl/accruals.php:98
-#: ../gl/bank_account_reconcile.php:238
-#: ../gl/inquiry/bank_inquiry.php:68
-#: ../gl/inquiry/gl_account_inquiry.php:140
-#: ../gl/inquiry/gl_account_inquiry.php:142
-#: ../gl/inquiry/gl_trial_balance.php:90
-#: ../gl/inquiry/gl_trial_balance.php:92
-#: ../gl/inquiry/gl_trial_balance.php:94
+#: ../gl/accruals.php:102
+#: ../gl/bank_account_reconcile.php:236
+#: ../gl/inquiry/bank_inquiry.php:71
+#: ../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/view/gl_trans_view.php:64
-#: ../gl/view/gl_trans_view.php:67
-#: ../gl/view/gl_trans_view.php:70
-#: ../gl/includes/ui/gl_journal_ui.inc:84
+#: ../gl/view/gl_trans_view.php:69
+#: ../gl/view/gl_trans_view.php:72
+#: ../gl/view/gl_trans_view.php:75
 #: ../gl/includes/ui/gl_journal_ui.inc:87
 #: ../gl/includes/ui/gl_journal_ui.inc:90
+#: ../gl/includes/ui/gl_journal_ui.inc:93
 #: ../includes/sysnames.inc:85
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:134
-#: ../purchasing/inquiry/supplier_inquiry.php:171
-#: ../reporting/rep601.php:77
-#: ../reporting/rep702.php:52
-#: ../reporting/rep704.php:79
-#: ../reporting/rep704.php:82
-#: ../reporting/rep704.php:85
-#: ../reporting/rep708.php:80
-#: ../reporting/rep708.php:81
-#: ../sales/inquiry/customer_allocation_inquiry.php:150
-#: ../sales/inquiry/customer_inquiry.php:222
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:135
+#: ../purchasing/inquiry/supplier_inquiry.php:182
+#: ../reporting/rep601.php:80
+#: ../reporting/rep602.php:81
+#: ../reporting/rep702.php:54
+#: ../reporting/rep704.php:84
+#: ../reporting/rep704.php:87
+#: ../reporting/rep704.php:90
+#: ../reporting/rep708.php:192
+#: ../reporting/rep708.php:193
+#: ../sales/inquiry/customer_allocation_inquiry.php:153
+#: ../sales/inquiry/customer_inquiry.php:210
 msgid "Credit"
 msgstr ""
 
 #: ../dimensions/includes/dimensions_ui.inc:45
 #: ../dimensions/inquiry/search_dimensions.php:134
-#: ../gl/inquiry/bank_inquiry.php:68
-#: ../gl/inquiry/gl_account_inquiry.php:140
-#: ../gl/inquiry/gl_trial_balance.php:87
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:136
-#: ../reporting/rep203.php:92
-#: ../reporting/rep204.php:82
-#: ../reporting/rep601.php:77
-#: ../reporting/rep701.php:106
-#: ../reporting/rep704.php:79
-#: ../reporting/rep704.php:82
-#: ../reporting/rep704.php:85
-#: ../reporting/rep708.php:72
-#: ../sales/inquiry/customer_allocation_inquiry.php:152
+#: ../gl/inquiry/bank_inquiry.php:71
+#: ../gl/inquiry/gl_account_inquiry.php:141
+#: ../gl/inquiry/gl_trial_balance.php:188
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:137
+#: ../reporting/rep101.php:122
+#: ../reporting/rep201.php:114
+#: ../reporting/rep203.php:94
+#: ../reporting/rep204.php:84
+#: ../reporting/rep307.php:117
+#: ../reporting/rep601.php:80
+#: ../reporting/rep602.php:81
+#: ../reporting/rep701.php:111
+#: ../reporting/rep704.php:84
+#: ../reporting/rep704.php:87
+#: ../reporting/rep704.php:90
+#: ../reporting/rep708.php:185
+#: ../sales/inquiry/customer_allocation_inquiry.php:155
 msgid "Balance"
 msgstr ""
 
@@ -3516,78 +3668,89 @@ msgid "Search Dimensions"
 msgstr ""
 
 #: ../dimensions/inquiry/search_dimensions.php:73
-#: ../gl/bank_transfer.php:89
+#: ../gl/bank_transfer.php:79
 #: ../gl/inquiry/journal_inquiry.php:45
-#: ../gl/manage/revaluate_currencies.php:102
-#: ../gl/includes/ui/gl_bank_ui.inc:101
+#: ../gl/manage/revaluate_currencies.php:105
+#: ../gl/includes/ui/gl_bank_ui.inc:26
 #: ../gl/includes/ui/gl_journal_ui.inc:30
 #: ../includes/ui/contacts_view.inc:94
 #: ../inventory/includes/item_adjustments_ui.inc:35
 #: ../inventory/includes/stock_transfers_ui.inc:40
 #: ../manufacturing/search_work_orders.php:67
-#: ../manufacturing/work_order_add_finished.php:198
+#: ../manufacturing/work_order_add_finished.php:195
+#: ../manufacturing/work_order_costs.php:134
 #: ../manufacturing/work_order_entry.php:376
 #: ../manufacturing/work_order_entry.php:383
-#: ../manufacturing/includes/work_order_issue_ui.inc:152
-#: ../purchasing/includes/ui/invoice_ui.inc:92
-#: ../purchasing/includes/ui/po_ui.inc:159
-#: ../purchasing/includes/ui/po_ui.inc:164
-#: ../purchasing/supplier_payment.php:281
-#: ../sales/customer_payments.php:258
+#: ../manufacturing/includes/work_order_issue_ui.inc:163
+#: ../purchasing/includes/ui/invoice_ui.inc:119
+#: ../purchasing/includes/ui/po_ui.inc:188
+#: ../purchasing/includes/ui/po_ui.inc:193
+#: ../purchasing/supplier_payment.php:298
+#: ../sales/customer_payments.php:371
 msgid "Reference:"
 msgstr ""
 
 #: ../dimensions/inquiry/search_dimensions.php:75
-#: ../includes/ui/allocation_cart.inc:284
-#: ../includes/ui/ui_lists.inc:1887
-#: ../reporting/rep101.php:112
-#: ../reporting/rep102.php:88
-#: ../reporting/rep104.php:95
-#: ../reporting/rep104.php:99
-#: ../reporting/rep105.php:93
-#: ../reporting/rep105.php:97
-#: ../reporting/rep201.php:100
-#: ../reporting/rep202.php:90
-#: ../reporting/rep203.php:72
-#: ../reporting/rep204.php:75
-#: ../reporting/rep301.php:86
-#: ../reporting/rep301.php:93
-#: ../reporting/rep302.php:103
-#: ../reporting/rep302.php:110
-#: ../reporting/rep303.php:84
-#: ../reporting/rep303.php:91
-#: ../reporting/rep304.php:96
+#: ../includes/ui/allocation_cart.inc:314
+#: ../includes/ui/ui_lists.inc:1929
+#: ../reporting/rep101.php:100
+#: ../reporting/rep102.php:96
+#: ../reporting/rep104.php:97
+#: ../reporting/rep104.php:101
+#: ../reporting/rep105.php:95
+#: ../reporting/rep105.php:99
+#: ../reporting/rep201.php:92
+#: ../reporting/rep202.php:100
+#: ../reporting/rep203.php:74
+#: ../reporting/rep204.php:77
+#: ../reporting/rep301.php:156
+#: ../reporting/rep301.php:163
+#: ../reporting/rep302.php:105
+#: ../reporting/rep302.php:112
+#: ../reporting/rep303.php:96
+#: ../reporting/rep303.php:103
+#: ../reporting/rep304.php:98
 #: ../reporting/rep304.php:103
 #: ../reporting/rep304.php:108
-#: ../reporting/rep702.php:59
-#: ../reporting/rep710.php:84
-#: ../reporting/rep710.php:85
+#: ../reporting/rep306.php:120
+#: ../reporting/rep306.php:125
+#: ../reporting/rep306.php:130
+#: ../reporting/rep306.php:135
+#: ../reporting/rep307.php:103
+#: ../reporting/rep307.php:110
+#: ../reporting/rep308.php:219
+#: ../reporting/rep308.php:224
+#: ../reporting/rep309.php:92
+#: ../reporting/rep402.php:87
+#: ../reporting/rep402.php:95
+#: ../reporting/rep702.php:61
+#: ../reporting/rep710.php:86
+#: ../reporting/rep710.php:87
 msgid "All"
 msgstr ""
 
 #: ../dimensions/inquiry/search_dimensions.php:76
-#: ../gl/inquiry/bank_inquiry.php:46
-#: ../gl/inquiry/gl_trial_balance.php:46
+#: ../gl/inquiry/bank_inquiry.php:49
+#: ../gl/inquiry/gl_trial_balance.php:54
 #: ../gl/inquiry/journal_inquiry.php:48
-#: ../gl/inquiry/profit_loss.php:163
-#: ../gl/includes/ui/gl_bank_ui.inc:23
-#: ../gl/includes/ui/gl_bank_ui.inc:50
+#: ../gl/inquiry/profit_loss.php:168
+#: ../gl/includes/ui/gl_bank_ui.inc:52
+#: ../gl/includes/ui/gl_bank_ui.inc:120
 #: ../inventory/inquiry/stock_movements.php:58
 #: ../purchasing/inquiry/supplier_allocation_inquiry.php:50
-#: ../purchasing/inquiry/supplier_inquiry.php:49
+#: ../purchasing/inquiry/supplier_inquiry.php:50
 #: ../sales/inquiry/customer_inquiry.php:46
 msgid "From:"
 msgstr ""
 
 #: ../dimensions/inquiry/search_dimensions.php:77
-#: ../gl/inquiry/bank_inquiry.php:47
-#: ../gl/inquiry/gl_trial_balance.php:47
+#: ../gl/inquiry/bank_inquiry.php:50
+#: ../gl/inquiry/gl_trial_balance.php:55
 #: ../gl/inquiry/journal_inquiry.php:49
-#: ../gl/inquiry/profit_loss.php:164
-#: ../gl/includes/ui/gl_bank_ui.inc:23
+#: ../gl/inquiry/profit_loss.php:169
 #: ../inventory/inquiry/stock_movements.php:59
 #: ../purchasing/inquiry/supplier_allocation_inquiry.php:51
-#: ../purchasing/inquiry/supplier_inquiry.php:50
+#: ../purchasing/inquiry/supplier_inquiry.php:51
 #: ../sales/inquiry/customer_inquiry.php:47
 msgid "To:"
 msgstr ""
@@ -3603,27 +3766,29 @@ msgid "Only Open:"
 msgstr ""
 
 #: ../dimensions/inquiry/search_dimensions.php:132
-#: ../dimensions/view/view_dimension.php:54
-#: ../includes/ui/allocation_cart.inc:263
-#: ../purchasing/includes/ui/invoice_ui.inc:112
+#: ../dimensions/view/view_dimension.php:55
+#: ../includes/ui/allocation_cart.inc:290
+#: ../purchasing/includes/ui/invoice_ui.inc:138
 #: ../purchasing/view/view_supp_credit.php:48
-#: ../purchasing/view/view_supp_invoice.php:51
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:131
-#: ../purchasing/inquiry/supplier_inquiry.php:168
-#: ../reporting/rep101.php:130
-#: ../reporting/rep201.php:118
-#: ../reporting/rep203.php:91
-#: ../reporting/rep501.php:85
-#: ../reporting/includes/doctext.inc:38
-#: ../reporting/includes/doctext.inc:108
-#: ../sales/customer_invoice.php:424
+#: ../purchasing/view/view_supp_invoice.php:52
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:132
+#: ../purchasing/inquiry/supplier_inquiry.php:179
+#: ../reporting/rep101.php:118
+#: ../reporting/rep201.php:110
+#: ../reporting/rep203.php:93
+#: ../reporting/rep501.php:87
+#: ../reporting/includes/doctext.inc:112
+#: ../reporting/includes/doctext.inc:144
+#: ../reporting/includes/doctext.inc:165
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:206
+#: ../reporting/includes/doctext.inc:208
+#: ../sales/customer_invoice.php:519
 #: ../sales/view/view_dispatch.php:97
 #: ../sales/view/view_invoice.php:96
-#: ../sales/inquiry/customer_allocation_inquiry.php:146
-#: ../sales/inquiry/customer_inquiry.php:217
-#: ../sales/includes/ui/sales_order_ui.inc:593
-#: ../themes/exclusive/renderer.php:289
-#: ../themes/exclusive/renderer.php:383
+#: ../sales/inquiry/customer_allocation_inquiry.php:149
+#: ../sales/inquiry/customer_inquiry.php:205
+#: ../sales/includes/ui/sales_order_ui.inc:587
 msgid "Due Date"
 msgstr ""
 
@@ -3635,51 +3800,79 @@ msgstr ""
 msgid "View Dimension"
 msgstr ""
 
-#: ../dimensions/view/view_dimension.php:48
+#: ../dimensions/view/view_dimension.php:49
 msgid "The dimension number sent is not valid."
 msgstr ""
 
-#: ../dimensions/view/view_dimension.php:72
+#: ../dimensions/view/view_dimension.php:73
 msgid "This dimension is closed."
 msgstr ""
 
-#: ../dimensions/view/view_dimension.php:84
-#: ../gl/inquiry/gl_account_inquiry.php:70
+#: ../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:62
 #: ../purchasing/inquiry/po_search.php:64
 #: ../sales/inquiry/customer_allocation_inquiry.php:44
 #: ../sales/inquiry/sales_deliveries_view.php:104
-#: ../sales/inquiry/sales_orders_view.php:221
+#: ../sales/inquiry/sales_orders_view.php:251
 msgid "from:"
 msgstr ""
 
-#: ../dimensions/view/view_dimension.php:85
-#: ../gl/inquiry/gl_account_inquiry.php:71
+#: ../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:63
 #: ../purchasing/inquiry/po_search.php:65
 #: ../sales/inquiry/customer_allocation_inquiry.php:45
 #: ../sales/inquiry/sales_deliveries_view.php:105
-#: ../sales/inquiry/sales_orders_view.php:222
+#: ../sales/inquiry/sales_orders_view.php:252
 msgid "to:"
 msgstr ""
 
-#: ../dimensions/view/view_dimension.php:86
-#: ../gl/inquiry/balance_sheet.php:132
-#: ../gl/inquiry/bank_inquiry.php:49
-#: ../gl/inquiry/gl_account_inquiry.php:84
-#: ../gl/inquiry/gl_trial_balance.php:55
-#: ../gl/inquiry/profit_loss.php:178
+#: ../dimensions/view/view_dimension.php:87
+#: ../gl/inquiry/balance_sheet.php:131
+#: ../gl/inquiry/bank_inquiry.php:52
+#: ../gl/inquiry/gl_account_inquiry.php:85
+#: ../gl/inquiry/gl_trial_balance.php:63
+#: ../gl/inquiry/profit_loss.php:183
 #: ../gl/inquiry/tax_inquiry.php:63
 msgid "Show"
 msgstr ""
 
 #: ../gl/accruals.php:20
-#: ../includes/access_levels.inc:243
+#: ../includes/access_levels.inc:245
 msgid "Revenue / Cost Accruals"
 msgstr ""
 
+#: ../gl/accruals.php:38
+#: ../gl/bank_transfer.php:121
+#: ../gl/gl_bank.php:269
+#: ../gl/gl_journal.php:168
+#: ../gl/manage/revaluate_currencies.php:59
+#: ../inventory/adjustments.php:114
+#: ../inventory/transfers.php:108
+#: ../manufacturing/work_order_add_finished.php:104
+#: ../manufacturing/work_order_costs.php:86
+#: ../manufacturing/work_order_entry.php:160
+#: ../manufacturing/work_order_issue.php:84
+#: ../manufacturing/work_order_issue.php.orig:84
+#: ../purchasing/po_entry_items.php:342
+#: ../purchasing/po_receive_items.php:179
+#: ../purchasing/supplier_credit.php:202
+#: ../purchasing/supplier_invoice.php:210
+#: ../purchasing/supplier_payment.php:191
+#: ../sales/create_recurrent_invoices.php:121
+#: ../sales/credit_note_entry.php:157
+#: ../sales/customer_credit_invoice.php:95
+#: ../sales/customer_delivery.php:165
+#: ../sales/customer_invoice.php:327
+#: ../sales/customer_payments.php:156
+#: ../sales/sales_order_entry.php:371
+msgid ""
+"The entered date is out of fiscal year or is closed for further data entry."
+msgstr ""
+
 #: ../gl/accruals.php:44
 msgid "The amount can not be 0."
 msgstr ""
@@ -3688,191 +3881,194 @@ msgstr ""
 msgid "The periods must be greater than 0."
 msgstr ""
 
-#: ../gl/accruals.php:67
+#: ../gl/accruals.php:71
 msgid ""
-"Some of the period dates are outside the fiscal year. Create a new fiscal "
-"year first!"
+"Some of the period dates are outside the fiscal year or are closed for "
+"further data entry. Create a new fiscal year first!"
 msgstr ""
 
-#: ../gl/accruals.php:82
+#: ../gl/accruals.php:86
 #, php-format
 msgid "Accruals for %s"
 msgstr ""
 
-#: ../gl/accruals.php:92
-#: ../gl/accruals.php:94
-#: ../gl/accruals.php:203
-#: ../gl/accruals.php:205
+#: ../gl/accruals.php:96
+#: ../gl/accruals.php:98
+#: ../gl/accruals.php:207
+#: ../gl/accruals.php:209
 #: ../gl/gl_budget.php:71
 #: ../gl/gl_budget.php:72
 #: ../gl/gl_budget.php:76
-#: ../gl/inquiry/balance_sheet.php:129
-#: ../gl/inquiry/balance_sheet.php:131
-#: ../gl/inquiry/gl_account_inquiry.php:78
-#: ../gl/inquiry/gl_account_inquiry.php:80
-#: ../gl/inquiry/gl_account_inquiry.php:133
-#: ../gl/inquiry/gl_account_inquiry.php:135
-#: ../gl/inquiry/gl_trial_balance.php:49
-#: ../gl/inquiry/gl_trial_balance.php:51
-#: ../gl/inquiry/profit_loss.php:174
-#: ../gl/inquiry/profit_loss.php:176
+#: ../gl/inquiry/balance_sheet.php:128
+#: ../gl/inquiry/balance_sheet.php:130
+#: ../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:179
+#: ../gl/inquiry/profit_loss.php:181
 #: ../gl/manage/gl_quick_entries.php:261
 #: ../gl/manage/gl_quick_entries.php:263
 #: ../gl/manage/gl_quick_entries.php:343
 #: ../gl/manage/gl_quick_entries.php:345
 #: ../gl/view/accrual_trans.php:54
 #: ../gl/view/accrual_trans.php:56
-#: ../gl/view/gl_deposit_view.php:99
-#: ../gl/view/gl_deposit_view.php:102
-#: ../gl/view/gl_payment_view.php:98
-#: ../gl/view/gl_payment_view.php:101
-#: ../gl/view/gl_trans_view.php:63
-#: ../gl/view/gl_trans_view.php:66
-#: ../gl/includes/ui/gl_bank_ui.inc:121
-#: ../gl/includes/ui/gl_bank_ui.inc:122
-#: ../gl/includes/ui/gl_bank_ui.inc:124
-#: ../gl/includes/ui/gl_journal_ui.inc:83
-#: ../gl/includes/ui/gl_journal_ui.inc:84
+#: ../gl/view/gl_deposit_view.php:104
+#: ../gl/view/gl_deposit_view.php:107
+#: ../gl/view/gl_payment_view.php:103
+#: ../gl/view/gl_payment_view.php:106
+#: ../gl/view/gl_trans_view.php:68
+#: ../gl/view/gl_trans_view.php:71
+#: ../gl/includes/ui/gl_bank_ui.inc:152
+#: ../gl/includes/ui/gl_bank_ui.inc:153
+#: ../gl/includes/ui/gl_bank_ui.inc:155
 #: ../gl/includes/ui/gl_journal_ui.inc:86
+#: ../gl/includes/ui/gl_journal_ui.inc:87
+#: ../gl/includes/ui/gl_journal_ui.inc:89
 #: ../includes/sysnames.inc:43
-#: ../includes/sysnames.inc:165
-#: ../inventory/manage/item_categories.php:216
-#: ../inventory/manage/item_categories.php:218
-#: ../inventory/manage/items.php:353
-#: ../inventory/manage/items.php:355
-#: ../purchasing/includes/ui/invoice_ui.inc:245
-#: ../purchasing/includes/ui/invoice_ui.inc:247
-#: ../purchasing/manage/suppliers.php:135
-#: ../purchasing/manage/suppliers.php:136
-#: ../purchasing/manage/suppliers.php:138
-#: ../reporting/rep501.php:90
-#: ../reporting/rep704.php:78
-#: ../reporting/rep704.php:81
-#: ../reporting/rep704.php:92
-#: ../reporting/rep704.php:94
-#: ../reporting/rep704.php:102
-#: ../reporting/rep705.php:245
-#: ../reporting/rep705.php:247
-#: ../reporting/rep705.php:258
-#: ../reporting/rep706.php:190
-#: ../reporting/rep706.php:192
-#: ../reporting/rep706.php:200
-#: ../reporting/rep707.php:214
-#: ../reporting/rep707.php:216
-#: ../reporting/rep707.php:224
-#: ../reporting/rep708.php:89
-#: ../reporting/rep708.php:91
-#: ../reporting/rep708.php:98
-#: ../reporting/reports_main.php:255
-#: ../reporting/reports_main.php:256
-#: ../reporting/reports_main.php:261
-#: ../reporting/reports_main.php:262
-#: ../reporting/reports_main.php:269
-#: ../reporting/reports_main.php:270
-#: ../reporting/reports_main.php:280
-#: ../reporting/reports_main.php:281
-#: ../reporting/reports_main.php:292
-#: ../reporting/reports_main.php:293
-#: ../reporting/reports_main.php:304
-#: ../reporting/reports_main.php:309
-#: ../reporting/reports_main.php:316
-#: ../reporting/reports_main.php:326
-#: ../reporting/reports_main.php:337
-#: ../sales/customer_delivery.php:381
-#: ../sales/customer_delivery.php:389
-#: ../sales/customer_invoice.php:399
-#: ../sales/customer_invoice.php:426
-#: ../sales/manage/customers.php:234
-#: ../sales/manage/customers.php:236
+#: ../includes/sysnames.inc:166
+#: ../inventory/manage/item_categories.php:220
+#: ../inventory/manage/item_categories.php:222
+#: ../inventory/manage/items.php:354
+#: ../inventory/manage/items.php:356
+#: ../purchasing/includes/ui/invoice_ui.inc:280
+#: ../purchasing/includes/ui/invoice_ui.inc:282
+#: ../purchasing/manage/suppliers.php:147
+#: ../purchasing/manage/suppliers.php:148
+#: ../purchasing/manage/suppliers.php:150
+#: ../reporting/rep103.php:243
+#: ../reporting/rep103.php:255
+#: ../reporting/rep205.php:161
+#: ../reporting/rep205.php:173
+#: ../reporting/rep501.php:92
+#: ../reporting/rep704.php:83
+#: ../reporting/rep704.php:86
+#: ../reporting/rep704.php:97
+#: ../reporting/rep704.php:99
+#: ../reporting/rep704.php:107
+#: ../reporting/rep705.php:249
+#: ../reporting/rep705.php:251
+#: ../reporting/rep705.php:262
+#: ../reporting/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:354
+#: ../reporting/reports_main.php:355
+#: ../reporting/reports_main.php:361
+#: ../reporting/reports_main.php:362
+#: ../reporting/reports_main.php:370
+#: ../reporting/reports_main.php:371
+#: ../reporting/reports_main.php:382
+#: ../reporting/reports_main.php:383
+#: ../reporting/reports_main.php:395
+#: ../reporting/reports_main.php:396
+#: ../reporting/reports_main.php:408
+#: ../reporting/reports_main.php:414
+#: ../reporting/reports_main.php:422
+#: ../reporting/reports_main.php:433
+#: ../reporting/reports_main.php:445
+#: ../sales/customer_delivery.php:419
+#: ../sales/customer_delivery.php:427
+#: ../sales/customer_invoice.php:484
+#: ../sales/customer_invoice.php:527
+#: ../sales/manage/customers.php:274
+#: ../sales/manage/customers.php:276
 #: ../sales/includes/ui/sales_credit_ui.inc:132
 #: ../sales/includes/ui/sales_credit_ui.inc:137
-#: ../sales/includes/ui/sales_order_ui.inc:451
-#: ../sales/includes/ui/sales_order_ui.inc:456
-#: ../themes/exclusive/renderer.php:488
-#: ../themes/exclusive/renderer.php:506
+#: ../sales/includes/ui/sales_order_ui.inc:442
+#: ../sales/includes/ui/sales_order_ui.inc:447
 msgid "Dimension"
 msgstr ""
 
-#: ../gl/accruals.php:98
-#: ../gl/accruals.php:213
-#: ../gl/inquiry/gl_account_inquiry.php:140
-#: ../gl/inquiry/gl_account_inquiry.php:142
-#: ../gl/inquiry/journal_inquiry.php:126
+#: ../gl/accruals.php:102
+#: ../gl/accruals.php:217
+#: ../gl/inquiry/bank_inquiry.php:71
+#: ../gl/inquiry/gl_account_inquiry.php:141
+#: ../gl/inquiry/gl_account_inquiry.php:143
+#: ../gl/inquiry/journal_inquiry.php:133
 #: ../gl/view/accrual_trans.php:60
-#: ../gl/view/gl_deposit_view.php:100
-#: ../gl/view/gl_deposit_view.php:103
-#: ../gl/view/gl_deposit_view.php:106
-#: ../gl/view/gl_payment_view.php:99
-#: ../gl/view/gl_payment_view.php:102
-#: ../gl/view/gl_payment_view.php:105
-#: ../gl/view/gl_trans_view.php:64
-#: ../gl/view/gl_trans_view.php:67
-#: ../gl/view/gl_trans_view.php:70
-#: ../gl/includes/ui/gl_bank_ui.inc:122
-#: ../gl/includes/ui/gl_bank_ui.inc:125
-#: ../gl/includes/ui/gl_bank_ui.inc:128
-#: ../gl/includes/ui/gl_bank_ui.inc:268
-#: ../gl/includes/ui/gl_journal_ui.inc:84
+#: ../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:69
+#: ../gl/view/gl_trans_view.php:72
+#: ../gl/view/gl_trans_view.php:75
+#: ../gl/includes/ui/gl_bank_ui.inc:153
+#: ../gl/includes/ui/gl_bank_ui.inc:156
+#: ../gl/includes/ui/gl_bank_ui.inc:159
+#: ../gl/includes/ui/gl_bank_ui.inc:312
 #: ../gl/includes/ui/gl_journal_ui.inc:87
 #: ../gl/includes/ui/gl_journal_ui.inc:90
-#: ../gl/includes/ui/gl_journal_ui.inc:240
-#: ../inventory/includes/item_adjustments_ui.inc:181
-#: ../inventory/includes/stock_transfers_ui.inc:161
-#: ../manufacturing/includes/work_order_issue_ui.inc:165
-#: ../purchasing/includes/ui/invoice_ui.inc:245
-#: ../purchasing/includes/ui/invoice_ui.inc:247
-#: ../purchasing/includes/ui/invoice_ui.inc:249
+#: ../gl/includes/ui/gl_journal_ui.inc:93
+#: ../gl/includes/ui/gl_journal_ui.inc:276
+#: ../inventory/includes/item_adjustments_ui.inc:187
+#: ../inventory/includes/stock_transfers_ui.inc:167
+#: ../manufacturing/view/wo_costs_view.php:46
+#: ../manufacturing/includes/work_order_issue_ui.inc:176
+#: ../purchasing/includes/ui/invoice_ui.inc:280
+#: ../purchasing/includes/ui/invoice_ui.inc:282
+#: ../purchasing/includes/ui/invoice_ui.inc:284
 #: ../sales/customer_credit_invoice.php:364
-#: ../sales/customer_delivery.php:505
-#: ../sales/customer_invoice.php:555
+#: ../sales/customer_delivery.php:559
 #: ../sales/includes/ui/sales_credit_ui.inc:339
 msgid "Memo"
 msgstr ""
 
-#: ../gl/accruals.php:162
+#: ../gl/accruals.php:166
 msgid "Revenue / Cost Accruals have been processed."
 msgstr ""
 
-#: ../gl/accruals.php:168
+#: ../gl/accruals.php:172
 msgid "Showing GL Transactions."
 msgstr ""
 
-#: ../gl/accruals.php:180
+#: ../gl/accruals.php:184
 msgid "Weekly"
 msgstr ""
 
-#: ../gl/accruals.php:181
+#: ../gl/accruals.php:185
 msgid "Bi-weekly"
 msgstr ""
 
-#: ../gl/accruals.php:182
+#: ../gl/accruals.php:186
 #: ../gl/manage/gl_quick_entries.php:240
 #: ../gl/includes/ui/gl_journal_ui.inc:57
-#: ../sales/create_recurrent_invoices.php:98
-#: ../sales/manage/recurrent_invoices.php:85
+#: ../sales/create_recurrent_invoices.php:134
+#: ../sales/manage/recurrent_invoices.php:102
 msgid "Monthly"
 msgstr ""
 
-#: ../gl/accruals.php:183
+#: ../gl/accruals.php:187
 msgid "Quarterly"
 msgstr ""
 
-#: ../gl/accruals.php:195
+#: ../gl/accruals.php:199
 msgid "First date of Accruals"
 msgstr ""
 
-#: ../gl/accruals.php:197
+#: ../gl/accruals.php:201
 msgid "Accrued Balance Account"
 msgstr ""
 
-#: ../gl/accruals.php:200
+#: ../gl/accruals.php:204
 msgid "Revenue / Cost Account"
 msgstr ""
 
-#: ../gl/accruals.php:208
+#: ../gl/accruals.php:212
 #: ../gl/gl_budget.php:91
 #: ../gl/gl_budget.php:93
-#: ../gl/inquiry/journal_inquiry.php:125
+#: ../gl/inquiry/journal_inquiry.php:132
 #: ../gl/inquiry/tax_inquiry.php:82
 #: ../gl/manage/gl_quick_entries.php:261
 #: ../gl/manage/gl_quick_entries.php:263
@@ -3881,65 +4077,63 @@ msgstr ""
 #: ../gl/view/bank_transfer_view.php:70
 #: ../gl/view/bank_transfer_view.php:80
 #: ../gl/view/gl_deposit_view.php:67
-#: ../gl/view/gl_deposit_view.php:100
-#: ../gl/view/gl_deposit_view.php:103
-#: ../gl/view/gl_deposit_view.php:106
+#: ../gl/view/gl_deposit_view.php:105
+#: ../gl/view/gl_deposit_view.php:108
+#: ../gl/view/gl_deposit_view.php:111
 #: ../gl/view/gl_payment_view.php:65
-#: ../gl/view/gl_payment_view.php:99
-#: ../gl/view/gl_payment_view.php:102
-#: ../gl/view/gl_payment_view.php:105
-#: ../gl/includes/ui/gl_bank_ui.inc:122
-#: ../gl/includes/ui/gl_bank_ui.inc:125
-#: ../gl/includes/ui/gl_bank_ui.inc:128
-#: ../includes/sysnames.inc:132
-#: ../includes/ui/allocation_cart.inc:263
-#: ../includes/ui/ui_lists.inc:1152
+#: ../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:153
+#: ../gl/includes/ui/gl_bank_ui.inc:156
+#: ../gl/includes/ui/gl_bank_ui.inc:159
+#: ../includes/sysnames.inc:133
+#: ../includes/ui/allocation_cart.inc:290
+#: ../includes/ui/ui_lists.inc:1187
+#: ../manufacturing/view/wo_costs_view.php:46
 #: ../manufacturing/includes/manufacturing_ui.inc:236
-#: ../purchasing/includes/ui/invoice_ui.inc:245
-#: ../purchasing/includes/ui/invoice_ui.inc:247
-#: ../purchasing/includes/ui/invoice_ui.inc:249
+#: ../purchasing/includes/ui/invoice_ui.inc:280
+#: ../purchasing/includes/ui/invoice_ui.inc:282
+#: ../purchasing/includes/ui/invoice_ui.inc:284
 #: ../purchasing/view/view_supp_payment.php:60
-#: ../purchasing/view/view_supp_payment.php:69
-#: ../reporting/rep102.php:228
-#: ../reporting/rep202.php:234
-#: ../reporting/rep706.php:303
-#: ../reporting/rep707.php:321
-#: ../reporting/rep710.php:76
-#: ../reporting/includes/doctext.inc:150
+#: ../purchasing/view/view_supp_payment.php:72
+#: ../reporting/rep102.php:245
+#: ../reporting/rep107.php:204
+#: ../reporting/rep107.php:265
+#: ../reporting/rep109.php:195
+#: ../reporting/rep110.php:193
+#: ../reporting/rep111.php:192
+#: ../reporting/rep113.php:178
+#: ../reporting/rep202.php:253
+#: ../reporting/rep209.php:195
+#: ../reporting/rep706.php:309
+#: ../reporting/rep707.php:327
+#: ../reporting/rep710.php:78
 #: ../sales/view/view_receipt.php:44
-#: ../themes/exclusive/renderer.php:236
-#: ../themes/exclusive/renderer.php:255
-#: ../themes/exclusive/renderer.php:333
-#: ../themes/exclusive/renderer.php:352
-#: ../themes/exclusive/renderer.php:433
-#: ../themes/exclusive/renderer.php:453
-#: ../themes/exclusive/renderer.php:488
-#: ../themes/exclusive/renderer.php:507
-#: ../themes/exclusive/renderer.php:570
 msgid "Amount"
 msgstr ""
 
-#: ../gl/accruals.php:208
+#: ../gl/accruals.php:212
 msgid "Search Amount"
 msgstr ""
 
-#: ../gl/accruals.php:210
+#: ../gl/accruals.php:214
 msgid "Frequency"
 msgstr ""
 
-#: ../gl/accruals.php:212
+#: ../gl/accruals.php:216
 msgid "Periods"
 msgstr ""
 
-#: ../gl/accruals.php:216
+#: ../gl/accruals.php:220
 msgid "Show GL Rows"
 msgstr ""
 
-#: ../gl/accruals.php:217
+#: ../gl/accruals.php:221
 msgid "Process Accruals"
 msgstr ""
 
-#: ../gl/accruals.php:218
+#: ../gl/accruals.php:222
 msgid "Are you sure you want to post accruals?"
 msgstr ""
 
@@ -3949,10 +4143,10 @@ msgstr ""
 
 #: ../gl/bank_account_reconcile.php:35
 #: ../gl/bank_transfer.php:30
-#: ../gl/gl_bank.php:48
+#: ../gl/gl_bank.php:49
 #: ../gl/inquiry/bank_inquiry.php:30
 #: ../purchasing/supplier_payment.php:42
-#: ../sales/customer_payments.php:39
+#: ../sales/customer_payments.php:38
 msgid "There are no bank accounts defined in the system."
 msgstr ""
 
@@ -3964,62 +4158,64 @@ msgstr ""
 msgid "Reconcile this transaction"
 msgstr ""
 
-#: ../gl/bank_account_reconcile.php:166
-#: ../gl/inquiry/bank_inquiry.php:44
-#: ../gl/inquiry/gl_account_inquiry.php:69
+#: ../gl/bank_account_reconcile.php:164
+#: ../gl/inquiry/bank_inquiry.php:47
+#: ../gl/inquiry/gl_account_inquiry.php:70
 msgid "Account:"
 msgstr ""
 
-#: ../gl/bank_account_reconcile.php:168
+#: ../gl/bank_account_reconcile.php:166
 msgid "Bank Statement:"
 msgstr ""
 
-#: ../gl/bank_account_reconcile.php:169
+#: ../gl/bank_account_reconcile.php:167
+#: ../taxes/sav.tax_types.php:183
 msgid "New"
 msgstr ""
 
-#: ../gl/bank_account_reconcile.php:198
+#: ../gl/bank_account_reconcile.php:196
 msgid "Reconcile Date"
 msgstr ""
 
-#: ../gl/bank_account_reconcile.php:198
+#: ../gl/bank_account_reconcile.php:196
 msgid "Beginning<br>Balance"
 msgstr ""
 
-#: ../gl/bank_account_reconcile.php:199
+#: ../gl/bank_account_reconcile.php:197
 msgid "Ending<br>Balance"
 msgstr ""
 
-#: ../gl/bank_account_reconcile.php:199
+#: ../gl/bank_account_reconcile.php:197
 msgid "Account<br>Total"
 msgstr ""
 
-#: ../gl/bank_account_reconcile.php:199
+#: ../gl/bank_account_reconcile.php:197
 msgid "Reconciled<br>Amount"
 msgstr ""
 
-#: ../gl/bank_account_reconcile.php:199
+#: ../gl/bank_account_reconcile.php:197
+#: ../reporting/rep602.php:205
 msgid "Difference"
 msgstr ""
 
-#: ../gl/bank_account_reconcile.php:203
+#: ../gl/bank_account_reconcile.php:201
 msgid "Date of bank statement to reconcile"
 msgstr ""
 
-#: ../gl/bank_account_reconcile.php:239
-#: ../gl/inquiry/bank_inquiry.php:68
-#: ../gl/inquiry/gl_account_inquiry.php:140
-#: ../gl/inquiry/gl_account_inquiry.php:142
+#: ../gl/bank_account_reconcile.php:237
+#: ../gl/inquiry/bank_inquiry.php:71
+#: ../gl/inquiry/gl_account_inquiry.php:141
+#: ../gl/inquiry/gl_account_inquiry.php:143
 #: ../gl/view/accrual_trans.php:60
-#: ../gl/view/gl_trans_view.php:36
-#: ../reporting/rep601.php:76
-#: ../reporting/rep704.php:79
-#: ../reporting/rep704.php:81
+#: ../reporting/rep601.php:79
+#: ../reporting/rep602.php:80
 #: ../reporting/rep704.php:84
+#: ../reporting/rep704.php:86
+#: ../reporting/rep704.php:89
 msgid "Person/Item"
 msgstr ""
 
-#: ../gl/bank_account_reconcile.php:249
+#: ../gl/bank_account_reconcile.php:247
 msgid "Reconcile"
 msgstr ""
 
@@ -4028,12 +4224,12 @@ msgid "Transfer between Bank Accounts"
 msgstr ""
 
 #: ../gl/bank_transfer.php:39
-#: ../gl/manage/revaluate_currencies.php:34
+#: ../gl/manage/revaluate_currencies.php:35
 msgid "Transfer has been entered"
 msgstr ""
 
 #: ../gl/bank_transfer.php:41
-#: ../gl/manage/revaluate_currencies.php:36
+#: ../gl/manage/revaluate_currencies.php:37
 msgid "&View the GL Journal Entries for this Transfer"
 msgstr ""
 
@@ -4045,182 +4241,235 @@ msgstr ""
 msgid "From Account:"
 msgstr ""
 
-#: ../gl/bank_transfer.php:68
+#: ../gl/bank_transfer.php:70
 msgid "To Account:"
 msgstr ""
 
-#: ../gl/bank_transfer.php:70
+#: ../gl/bank_transfer.php:77
 msgid "Transfer Date:"
 msgstr ""
 
-#: ../gl/bank_transfer.php:76
-#: ../gl/bank_transfer.php:83
-#: ../sales/customer_payments.php:289
+#: ../gl/bank_transfer.php:87
+#: ../gl/bank_transfer.php:94
+#: ../sales/customer_payments.php:400
 msgid "Amount:"
 msgstr ""
 
-#: ../gl/bank_transfer.php:77
-#: ../gl/bank_transfer.php:84
-#: ../purchasing/supplier_payment.php:294
-#: ../sales/customer_payments.php:274
+#: ../gl/bank_transfer.php:88
+#: ../gl/bank_transfer.php:95
+#: ../purchasing/supplier_payment.php:313
+#: ../sales/customer_payments.php:386
 msgid "Bank Charge:"
 msgstr ""
 
-#: ../gl/bank_transfer.php:95
+#: ../gl/bank_transfer.php:90
+msgid "Incoming Amount:"
+msgstr ""
+
+#: ../gl/bank_transfer.php:102
 msgid "Enter Transfer"
 msgstr ""
 
-#: ../gl/bank_transfer.php:121
-#: ../gl/bank_transfer.php:137
-#: ../purchasing/supplier_payment.php:130
-#: ../purchasing/supplier_payment.php:136
+#: ../gl/bank_transfer.php:128
+#: ../gl/bank_transfer.php:158
+#: ../gl/bank_transfer.php:190
+#: ../purchasing/supplier_payment.php:135
+#: ../purchasing/supplier_payment.php:141
 msgid "The entered amount is invalid or less than zero."
 msgstr ""
 
-#: ../gl/bank_transfer.php:130
+#: ../gl/bank_transfer.php:133
+#: ../gl/gl_bank.php:227
+msgid "The total bank amount cannot be 0."
+msgstr ""
+
+#: ../gl/bank_transfer.php:144
 #, php-format
 msgid "The total bank amount exceeds allowed limit (%s) for source account."
 msgstr ""
 
-#: ../gl/bank_transfer.php:142
-#: ../purchasing/supplier_payment.php:144
-#: ../sales/customer_payments.php:131
+#: ../gl/bank_transfer.php:150
+#: ../gl/gl_bank.php:244
+#, php-format
+msgid ""
+"The bank transaction would result in exceed of authorized overdraft limit "
+"for transaction: %s #%s on %s."
+msgstr ""
+
+#: ../gl/bank_transfer.php:163
+#: ../purchasing/supplier_payment.php:149
+#: ../sales/customer_payments.php:195
 msgid ""
 "The Bank Charge Account has not been set in System and General GL Setup."
 msgstr ""
 
-#: ../gl/bank_transfer.php:148
-#: ../gl/gl_bank.php:238
-#: ../gl/gl_journal.php:166
-#: ../gl/manage/revaluate_currencies.php:62
+#: ../gl/bank_transfer.php:169
+#: ../gl/gl_bank.php:251
+#: ../gl/gl_journal.php:174
+#: ../gl/manage/revaluate_currencies.php:65
 #: ../inventory/adjustments.php:94
-#: ../inventory/transfers.php:93
+#: ../inventory/transfers.php:90
 #: ../manufacturing/work_order_add_finished.php:77
-#: ../manufacturing/work_order_entry.php:131
-#: ../manufacturing/work_order_issue.php:91
-#: ../purchasing/po_receive_items.php:181
-#: ../purchasing/supplier_payment.php:201
-#: ../sales/credit_note_entry.php:145
-#: ../sales/customer_credit_invoice.php:100
-#: ../sales/customer_delivery.php:163
-#: ../sales/customer_invoice.php:274
-#: ../sales/customer_payments.php:106
-#: ../sales/sales_order_entry.php:398
+#: ../manufacturing/work_order_entry.php:132
+#: ../manufacturing/work_order_issue.php:90
+#: ../manufacturing/work_order_issue.php.orig:90
+#: ../purchasing/po_receive_items.php:186
+#: ../purchasing/supplier_payment.php:207
+#: ../sales/credit_note_entry.php:147
+#: ../sales/customer_credit_invoice.php:102
+#: ../sales/customer_delivery.php:178
+#: ../sales/customer_invoice.php:341
+#: ../sales/customer_payments.php:162
+#: ../sales/sales_order_entry.php:446
 msgid "You must enter a reference."
 msgstr ""
 
-#: ../gl/bank_transfer.php:162
+#: ../gl/bank_transfer.php:183
 msgid "The source and destination bank accouts cannot be the same."
 msgstr ""
 
-#: ../gl/gl_bank.php:33
+#: ../gl/bank_transfer.php:195
+msgid "The incomming bank amount cannot be 0."
+msgstr ""
+
+#: ../gl/gl_bank.php:34
 msgid "Bank Account Payment Entry"
 msgstr ""
 
-#: ../gl/gl_bank.php:36
+#: ../gl/gl_bank.php:37
 msgid "Bank Account Deposit Entry"
 msgstr ""
 
-#: ../gl/gl_bank.php:39
+#: ../gl/gl_bank.php:40
 msgid "Modify Bank Account Entry"
 msgstr ""
 
-#: ../gl/gl_bank.php:42
+#: ../gl/gl_bank.php:43
 msgid "Modify Bank Deposit Entry"
 msgstr ""
 
-#: ../gl/gl_bank.php:72
+#: ../gl/gl_bank.php:77
 #, php-format
 msgid "Payment %d has been entered"
 msgstr ""
 
-#: ../gl/gl_bank.php:74
-#: ../gl/gl_bank.php:90
+#: ../gl/gl_bank.php:79
+#: ../gl/gl_bank.php:97
 msgid "&View the GL Postings for this Payment"
 msgstr ""
 
-#: ../gl/gl_bank.php:76
-#: ../gl/gl_bank.php:92
+#: ../gl/gl_bank.php:81
+#: ../gl/gl_bank.php:99
 msgid "Enter Another &Payment"
 msgstr ""
 
-#: ../gl/gl_bank.php:78
-#: ../gl/gl_bank.php:94
+#: ../gl/gl_bank.php:83
+#: ../gl/gl_bank.php:101
 msgid "Enter A &Deposit"
 msgstr ""
 
-#: ../gl/gl_bank.php:104
+#: ../gl/gl_bank.php:85
+#: ../gl/gl_journal.php:64
+#: ../inventory/adjustments.php:50
+#: ../manufacturing/work_order_entry.php:68
+#: ../purchasing/po_entry_items.php:115
+#: ../purchasing/po_entry_items.php:136
+#: ../purchasing/supplier_credit.php:83
+#: ../purchasing/supplier_invoice.php:76
+#: ../sales/credit_note_entry.php:77
+#: ../sales/customer_credit_invoice.php:62
+#: ../sales/customer_invoice.php:78
+#: ../sales/sales_order_entry.php:243
+msgid "Add an Attachment"
+msgstr ""
+
+#: ../gl/gl_bank.php:95
+#, php-format
+msgid "Payment %d has been modified"
+msgstr ""
+
+#: ../gl/gl_bank.php:111
 #, php-format
 msgid "Deposit %d has been entered"
 msgstr ""
 
-#: ../gl/gl_bank.php:106
+#: ../gl/gl_bank.php:113
 msgid "View the GL Postings for this Deposit"
 msgstr ""
 
-#: ../gl/gl_bank.php:108
+#: ../gl/gl_bank.php:115
 msgid "Enter Another Deposit"
 msgstr ""
 
-#: ../gl/gl_bank.php:110
+#: ../gl/gl_bank.php:117
 msgid "Enter A Payment"
 msgstr ""
 
-#: ../gl/gl_bank.php:121
+#: ../gl/gl_bank.php:126
+#, php-format
+msgid "Deposit %d has been modified"
+msgstr ""
+
+#: ../gl/gl_bank.php:128
 msgid "&View the GL Postings for this Deposit"
 msgstr ""
 
-#: ../gl/gl_bank.php:123
+#: ../gl/gl_bank.php:130
 msgid "Enter Another &Deposit"
 msgstr ""
 
-#: ../gl/gl_bank.php:125
+#: ../gl/gl_bank.php:132
 msgid "Enter A &Payment"
 msgstr ""
 
-#: ../gl/gl_bank.php:216
+#: ../gl/gl_bank.php:221
 msgid "You must enter at least one payment line."
 msgstr ""
 
-#: ../gl/gl_bank.php:222
-msgid "The total bank amount cannot be 0."
-msgstr ""
-
-#: ../gl/gl_bank.php:231
-#: ../purchasing/supplier_payment.php:194
+#: ../gl/gl_bank.php:238
+#: ../purchasing/supplier_payment.php:200
 #, php-format
 msgid "The total bank amount exceeds allowed limit (%s)."
 msgstr ""
 
-#: ../gl/gl_bank.php:250
+#: ../gl/gl_bank.php:263
 msgid "The entered date for the payment is invalid."
 msgstr ""
 
-#: ../gl/gl_bank.php:262
+#: ../gl/gl_bank.php:275
 msgid "You have to select customer and customer branch."
 msgstr ""
 
-#: ../gl/gl_bank.php:266
+#: ../gl/gl_bank.php:279
 msgid "You have to select supplier."
 msgstr ""
 
-#: ../gl/gl_bank.php:312
+#: ../gl/gl_bank.php:287
+msgid "Settled amount have to be positive number."
+msgstr ""
+
+#: ../gl/gl_bank.php:333
 msgid "The amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: ../gl/gl_bank.php:384
+#: ../gl/gl_bank.php:339
+#: ../gl/manage/exchange_rates.php:39
+msgid "The exchange rate cannot be zero or a negative number."
+msgstr ""
+
+#: ../gl/gl_bank.php:411
 msgid "Payment Items"
 msgstr ""
 
-#: ../gl/gl_bank.php:384
+#: ../gl/gl_bank.php:411
 msgid "Deposit Items"
 msgstr ""
 
-#: ../gl/gl_bank.php:392
+#: ../gl/gl_bank.php:419
 msgid "Process Payment"
 msgstr ""
 
-#: ../gl/gl_bank.php:392
+#: ../gl/gl_bank.php:419
 msgid "Process Deposit"
 msgstr ""
 
@@ -4244,8 +4493,8 @@ msgid "The Budget has been deleted."
 msgstr ""
 
 #: ../gl/gl_budget.php:64
-#: ../gl/manage/gl_accounts.php:227
-#: ../gl/manage/gl_accounts.php:237
+#: ../gl/manage/gl_accounts.php:230
+#: ../gl/manage/gl_accounts.php:240
 msgid "Account Code:"
 msgstr ""
 
@@ -4256,32 +4505,38 @@ msgstr ""
 
 #: ../gl/gl_budget.php:91
 #: ../gl/gl_budget.php:93
-#: ../gl/inquiry/profit_loss.php:231
+#: ../gl/inquiry/profit_loss.php:236
 #: ../gl/manage/gl_quick_entries.php:240
-#: ../reporting/rep101.php:136
-#: ../reporting/rep105.php:116
-#: ../reporting/rep106.php:90
-#: ../reporting/rep201.php:124
+#: ../reporting/rep101.php:126
+#: ../reporting/rep105.php:118
+#: ../reporting/rep106.php:92
+#: ../reporting/rep114.php:90
+#: ../reporting/rep201.php:118
 #: ../reporting/rep304.php:121
-#: ../reporting/rep305.php:77
-#: ../reporting/rep601.php:82
-#: ../reporting/rep702.php:57
-#: ../reporting/rep704.php:90
-#: ../reporting/rep704.php:100
-#: ../reporting/rep704.php:108
-#: ../reporting/rep706.php:181
-#: ../reporting/rep706.php:189
-#: ../reporting/rep706.php:199
-#: ../reporting/rep706.php:207
-#: ../reporting/rep707.php:206
-#: ../reporting/rep707.php:213
-#: ../reporting/rep707.php:223
-#: ../reporting/rep707.php:231
-#: ../reporting/rep708.php:88
-#: ../reporting/rep708.php:97
-#: ../reporting/rep708.php:104
-#: ../reporting/rep709.php:102
-#: ../reporting/rep710.php:83
+#: ../reporting/rep305.php:106
+#: ../reporting/rep306.php:148
+#: ../reporting/rep307.php:122
+#: ../reporting/rep308.php:236
+#: ../reporting/rep309.php:103
+#: ../reporting/rep601.php:85
+#: ../reporting/rep602.php:86
+#: ../reporting/rep702.php:59
+#: ../reporting/rep704.php:95
+#: ../reporting/rep704.php:105
+#: ../reporting/rep704.php:113
+#: ../reporting/rep706.php:185
+#: ../reporting/rep706.php:193
+#: ../reporting/rep706.php:203
+#: ../reporting/rep706.php:211
+#: ../reporting/rep707.php:210
+#: ../reporting/rep707.php:217
+#: ../reporting/rep707.php:227
+#: ../reporting/rep707.php:235
+#: ../reporting/rep708.php:200
+#: ../reporting/rep708.php:209
+#: ../reporting/rep708.php:216
+#: ../reporting/rep709.php:111
+#: ../reporting/rep710.php:85
 msgid "Period"
 msgstr ""
 
@@ -4295,161 +4550,172 @@ msgid "Last Year"
 msgstr ""
 
 #: ../gl/gl_budget.php:127
-#: ../gl/inquiry/balance_sheet.php:99
-#: ../gl/inquiry/balance_sheet.php:206
-#: ../gl/inquiry/balance_sheet.php:237
-#: ../gl/inquiry/gl_trial_balance.php:155
+#: ../gl/inquiry/balance_sheet.php:98
+#: ../gl/inquiry/balance_sheet.php:205
+#: ../gl/inquiry/balance_sheet.php:236
+#: ../gl/inquiry/gl_trial_balance.php:223
 #: ../gl/inquiry/profit_loss.php:115
-#: ../gl/inquiry/profit_loss.php:283
-#: ../gl/view/gl_deposit_view.php:132
-#: ../gl/view/gl_payment_view.php:131
-#: ../gl/view/gl_trans_view.php:104
-#: ../gl/includes/ui/gl_bank_ui.inc:171
-#: ../gl/includes/ui/gl_journal_ui.inc:141
+#: ../gl/inquiry/profit_loss.php:288
+#: ../gl/view/gl_deposit_view.php:137
+#: ../gl/view/gl_payment_view.php:136
+#: ../gl/view/gl_trans_view.php:115
+#: ../gl/includes/ui/gl_bank_ui.inc:202
+#: ../gl/includes/ui/gl_journal_ui.inc:153
 #: ../inventory/includes/item_adjustments_ui.inc:63
-#: ../inventory/includes/item_adjustments_ui.inc:102
+#: ../inventory/includes/item_adjustments_ui.inc:106
 #: ../manufacturing/includes/manufacturing_ui.inc:178
-#: ../purchasing/includes/ui/invoice_ui.inc:309
-#: ../purchasing/includes/ui/invoice_ui.inc:473
-#: ../purchasing/includes/ui/invoice_ui.inc:543
+#: ../purchasing/includes/ui/invoice_ui.inc:344
+#: ../purchasing/includes/ui/invoice_ui.inc:510
+#: ../purchasing/includes/ui/invoice_ui.inc:581
 #: ../purchasing/po_receive_items.php:63
 #: ../purchasing/view/view_po.php:140
 #: ../purchasing/allocations/supplier_allocation_main.php:100
-#: ../reporting/rep101.php:237
-#: ../reporting/rep106.php:82
-#: ../reporting/rep106.php:120
-#: ../reporting/rep106.php:168
-#: ../reporting/rep201.php:221
-#: ../reporting/rep203.php:92
-#: ../reporting/rep203.php:167
-#: ../reporting/rep204.php:109
-#: ../reporting/rep204.php:137
-#: ../reporting/rep301.php:125
-#: ../reporting/rep301.php:162
-#: ../reporting/rep304.php:144
-#: ../reporting/rep304.php:186
-#: ../reporting/rep305.php:72
-#: ../reporting/rep305.php:96
+#: ../reporting/rep101.php:234
+#: ../reporting/rep106.php:84
+#: ../reporting/rep106.php:119
+#: ../reporting/rep106.php:162
+#: ../reporting/rep114.php:161
+#: ../reporting/rep201.php:224
+#: ../reporting/rep203.php:94
+#: ../reporting/rep203.php:171
+#: ../reporting/rep204.php:113
+#: ../reporting/rep204.php:141
+#: ../reporting/rep301.php:197
+#: ../reporting/rep301.php:245
+#: ../reporting/rep304.php:146
+#: ../reporting/rep304.php:188
+#: ../reporting/rep305.php:101
 #: ../reporting/rep305.php:127
-#: ../reporting/rep702.php:138
+#: ../reporting/rep305.php:183
+#: ../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:311
+#: ../reporting/rep309.php:126
+#: ../reporting/rep309.php:153
+#: ../reporting/rep702.php:142
 #: ../reporting/rep705.php:152
-#: ../reporting/rep705.php:309
+#: ../reporting/rep705.php:315
 #: ../reporting/rep706.php:106
-#: ../reporting/rep706.php:249
-#: ../reporting/rep706.php:284
+#: ../reporting/rep706.php:255
+#: ../reporting/rep706.php:290
 #: ../reporting/rep707.php:115
-#: ../reporting/rep707.php:291
-#: ../reporting/rep708.php:182
-#: ../reporting/includes/doctext.inc:103
-#: ../reporting/includes/doctext.inc:111
+#: ../reporting/rep707.php:297
+#: ../reporting/rep708.php:253
+#: ../reporting/includes/doctext.inc:30
+#: ../reporting/includes/doctext.inc:192
 #: ../sales/customer_credit_invoice.php:281
-#: ../sales/customer_delivery.php:419
-#: ../sales/customer_invoice.php:447
+#: ../sales/customer_delivery.php:457
+#: ../sales/customer_invoice.php:551
+#: ../sales/customer_invoice.php:554
 #: ../sales/allocations/customer_allocation_main.php:99
 #: ../sales/view/view_credit.php:91
 #: ../sales/view/view_dispatch.php:113
-#: ../sales/view/view_invoice.php:114
-#: ../sales/view/view_sales_order.php:95
-#: ../sales/view/view_sales_order.php:128
-#: ../sales/view/view_sales_order.php:160
-#: ../sales/view/view_sales_order.php:201
+#: ../sales/view/view_invoice.php:116
+#: ../sales/view/view_sales_order.php:109
+#: ../sales/view/view_sales_order.php:142
+#: ../sales/view/view_sales_order.php:179
+#: ../sales/view/view_sales_order.php:220
 #: ../sales/includes/ui/sales_credit_ui.inc:168
-#: ../sales/includes/ui/sales_order_ui.inc:142
-#: ../themes/exclusive/renderer.php:290
-#: ../themes/exclusive/renderer.php:383
+#: ../sales/includes/ui/sales_order_ui.inc:148
 msgid "Total"
 msgstr ""
 
-#: ../gl/gl_journal.php:32
+#: ../gl/gl_journal.php:33
 #, php-format
 msgid "Modifying Journal Transaction # %d."
 msgstr ""
 
-#: ../gl/gl_journal.php:36
+#: ../gl/gl_journal.php:37
 #: ../includes/sysnames.inc:22
-#: ../includes/sysnames.inc:149
+#: ../includes/sysnames.inc:150
 msgid "Journal Entry"
 msgstr ""
 
-#: ../gl/gl_journal.php:54
+#: ../gl/gl_journal.php:57
 msgid "Journal entry has been entered"
 msgstr ""
 
-#: ../gl/gl_journal.php:56
-#: ../gl/gl_journal.php:69
+#: ../gl/gl_journal.php:59
+#: ../gl/gl_journal.php:74
 msgid "&View this Journal Entry"
 msgstr ""
 
-#: ../gl/gl_journal.php:59
+#: ../gl/gl_journal.php:62
 msgid "Enter &New Journal Entry"
 msgstr ""
 
-#: ../gl/gl_journal.php:67
+#: ../gl/gl_journal.php:72
 msgid "Journal entry has been updated"
 msgstr ""
 
-#: ../gl/gl_journal.php:71
+#: ../gl/gl_journal.php:76
 msgid "Return to Journal &Inquiry"
 msgstr ""
 
-#: ../gl/gl_journal.php:84
+#: ../gl/gl_journal.php:91
 msgid ""
 "You can edit directly only journal entries created via Journal Entry page."
 msgstr ""
 
-#: ../gl/gl_journal.php:85
+#: ../gl/gl_journal.php:92
 msgid "Entry &New Journal Entry"
 msgstr ""
 
-#: ../gl/gl_journal.php:141
+#: ../gl/gl_journal.php:149
 msgid "You must enter at least one journal line."
 msgstr ""
 
-#: ../gl/gl_journal.php:147
+#: ../gl/gl_journal.php:155
+#: ../includes/ui/gl_cart.inc:128
 msgid ""
 "The journal must balance (debits equal to credits) before it can be "
 "processed."
 msgstr ""
 
-#: ../gl/gl_journal.php:209
-#: ../gl/gl_journal.php:216
+#: ../gl/gl_journal.php:217
+#: ../gl/gl_journal.php:224
 msgid "Dimension is closed."
 msgstr ""
 
-#: ../gl/gl_journal.php:223
+#: ../gl/gl_journal.php:231
 msgid "You must enter either a debit amount or a credit amount."
 msgstr ""
 
-#: ../gl/gl_journal.php:230
+#: ../gl/gl_journal.php:238
 msgid "The debit amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: ../gl/gl_journal.php:235
+#: ../gl/gl_journal.php:243
 msgid "The credit amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: ../gl/gl_journal.php:241
-#: ../includes/ui/ui_view.inc:647
-#: ../purchasing/supplier_credit.php:119
-#: ../purchasing/supplier_invoice.php:119
+#: ../gl/gl_journal.php:249
+#: ../includes/ui/ui_view.inc:733
+#: ../purchasing/supplier_credit.php:144
+#: ../purchasing/supplier_invoice.php:154
 msgid "Cannot post to GL account used by more than one tax type."
 msgstr ""
 
-#: ../gl/gl_journal.php:248
+#: ../gl/gl_journal.php:256
 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:327
+#: ../gl/gl_journal.php:335
 msgid "Rows"
 msgstr ""
 
-#: ../gl/gl_journal.php:333
+#: ../gl/gl_journal.php:341
 msgid "Process Journal Entry"
 msgstr ""
 
-#: ../gl/gl_journal.php:334
+#: ../gl/gl_journal.php:342
 msgid "Process journal entry only if debits equal to credits"
 msgstr ""
 
@@ -4457,125 +4723,142 @@ msgstr ""
 msgid "Balance Sheet Drilldown"
 msgstr ""
 
-#: ../gl/inquiry/balance_sheet.php:127
+#: ../gl/inquiry/balance_sheet.php:126
 msgid "As at:"
 msgstr ""
 
-#: ../gl/inquiry/balance_sheet.php:229
-#: ../gl/inquiry/profit_loss.php:294
-#: ../reporting/rep705.php:319
-#: ../reporting/rep706.php:272
-#: ../reporting/rep706.php:297
-#: ../reporting/rep707.php:303
+#: ../gl/inquiry/balance_sheet.php:228
+#: ../gl/inquiry/profit_loss.php:299
+#: ../reporting/rep705.php:325
+#: ../reporting/rep706.php:278
+#: ../reporting/rep706.php:303
 #: ../reporting/rep707.php:309
-#: ../themes/exclusive/renderer.php:560
+#: ../reporting/rep707.php:315
 msgid "Calculated Return"
 msgstr ""
 
-#: ../gl/inquiry/balance_sheet.php:237
-#: ../includes/sysnames.inc:120
-#: ../reporting/rep706.php:284
+#: ../gl/inquiry/balance_sheet.php:236
+#: ../includes/sysnames.inc:121
+#: ../reporting/rep706.php:290
 msgid "Liabilities"
 msgstr ""
 
-#: ../gl/inquiry/balance_sheet.php:237
-#: ../reporting/rep706.php:284
+#: ../gl/inquiry/balance_sheet.php:236
+#: ../reporting/rep706.php:290
 msgid " and "
 msgstr ""
 
-#: ../gl/inquiry/balance_sheet.php:237
-#: ../reporting/rep706.php:284
+#: ../gl/inquiry/balance_sheet.php:236
+#: ../reporting/rep706.php:290
 msgid "Equities"
 msgstr ""
 
 #: ../gl/inquiry/bank_inquiry.php:28
-#: ../reporting/rep601.php:69
+#: ../reporting/rep601.php:72
 msgid "Bank Statement"
 msgstr ""
 
-#: ../gl/inquiry/bank_inquiry.php:75
-#: ../gl/inquiry/gl_account_inquiry.php:161
-#: ../reporting/rep601.php:99
-#: ../reporting/rep704.php:137
+#: ../gl/inquiry/bank_inquiry.php:78
+#: ../gl/inquiry/gl_account_inquiry.php:162
+#: ../reporting/rep601.php:104
+#: ../reporting/rep602.php:103
+#: ../reporting/rep704.php:144
 msgid "Opening Balance"
 msgstr ""
 
-#: ../gl/inquiry/bank_inquiry.php:120
-#: ../gl/inquiry/gl_account_inquiry.php:210
-#: ../gl/inquiry/gl_trial_balance.php:165
-#: ../reporting/rep601.php:150
-#: ../reporting/rep704.php:185
-#: ../reporting/rep708.php:191
+#: ../gl/inquiry/bank_inquiry.php:124
+#: ../gl/inquiry/gl_account_inquiry.php:213
+#: ../gl/inquiry/gl_trial_balance.php:233
+#: ../reporting/rep601.php:157
+#: ../reporting/rep602.php:157
+#: ../reporting/rep704.php:192
+#: ../reporting/rep708.php:262
 msgid "Ending Balance"
 msgstr ""
 
-#: ../gl/inquiry/gl_account_inquiry.php:30
+#: ../gl/inquiry/gl_account_inquiry.php:31
 msgid "General Ledger Inquiry"
 msgstr ""
 
-#: ../gl/inquiry/gl_account_inquiry.php:69
+#: ../gl/inquiry/gl_account_inquiry.php:70
 msgid "All Accounts"
 msgstr ""
 
-#: ../gl/inquiry/gl_account_inquiry.php:82
+#: ../gl/inquiry/gl_account_inquiry.php:83
 msgid "Amount min:"
 msgstr ""
 
-#: ../gl/inquiry/gl_account_inquiry.php:83
+#: ../gl/inquiry/gl_account_inquiry.php:84
 msgid "Amount max:"
 msgstr ""
 
-#: ../gl/inquiry/gl_account_inquiry.php:219
+#: ../gl/inquiry/gl_account_inquiry.php:222
 msgid ""
 "No general ledger transactions have been created for the specified criteria."
 msgstr ""
 
 #: ../gl/inquiry/gl_trial_balance.php:28
-#: ../reporting/rep708.php:107
+#: ../reporting/rep708.php:219
 msgid "Trial Balance"
 msgstr ""
 
-#: ../gl/inquiry/gl_trial_balance.php:52
+#: ../gl/inquiry/gl_trial_balance.php:60
 msgid "No zero values"
 msgstr ""
 
-#: ../gl/inquiry/gl_trial_balance.php:53
-#: ../reporting/reports_main.php:291
-#: ../reporting/reports_main.php:336
-#: ../reporting/reports_main.php:376
+#: ../gl/inquiry/gl_trial_balance.php:61
+#: ../reporting/reports_main.php:394
+#: ../reporting/reports_main.php:444
+#: ../reporting/reports_main.php:489
 msgid "Only balances"
 msgstr ""
 
-#: ../gl/inquiry/gl_trial_balance.php:71
+#: ../gl/inquiry/gl_trial_balance.php:93
+#: ../gl/inquiry/gl_trial_balance.php:154
+#: ../reporting/rep706.php:308
+#: ../reporting/rep707.php:326
+#: ../reporting/rep708.php:51
+#: ../reporting/rep708.php:126
+#: ../sales/create_recurrent_invoices.php:134
+#: ../sales/manage/recurrent_invoices.php:102
+msgid "Group"
+msgstr ""
+
+#: ../gl/inquiry/gl_trial_balance.php:172
 msgid "The from date cannot be bigger than the fiscal year end."
 msgstr ""
 
-#: ../gl/inquiry/gl_trial_balance.php:84
-#: ../gl/manage/bank_accounts.php:102
-#: ../gl/view/gl_trans_view.php:63
-#: ../gl/view/gl_trans_view.php:66
-#: ../gl/view/gl_trans_view.php:69
-#: ../reporting/rep701.php:106
-#: ../reporting/rep702.php:51
-#: ../reporting/rep705.php:234
-#: ../reporting/rep706.php:181
-#: ../reporting/rep707.php:206
-#: ../reporting/rep708.php:80
+#: ../gl/inquiry/gl_trial_balance.php:185
+#: ../gl/manage/bank_accounts.php:109
+#: ../gl/view/gl_trans_view.php:68
+#: ../gl/view/gl_trans_view.php:71
+#: ../gl/view/gl_trans_view.php:74
+#: ../reporting/rep701.php:111
+#: ../reporting/rep702.php:53
+#: ../reporting/rep705.php:238
+#: ../reporting/rep706.php:185
+#: ../reporting/rep707.php:210
+#: ../reporting/rep708.php:192
 msgid "Account Name"
 msgstr ""
 
-#: ../gl/inquiry/gl_trial_balance.php:85
-#: ../reporting/rep708.php:72
+#: ../gl/inquiry/gl_trial_balance.php:186
+#: ../reporting/rep708.php:185
 msgid "Brought Forward"
 msgstr ""
 
-#: ../gl/inquiry/gl_trial_balance.php:86
-#: ../reporting/rep708.php:72
+#: ../gl/inquiry/gl_trial_balance.php:187
+#: ../reporting/rep708.php:185
 msgid "This Period"
 msgstr ""
 
-#: ../gl/inquiry/gl_trial_balance.php:173
-#: ../reporting/rep708.php:212
+#: ../gl/inquiry/gl_trial_balance.php:206
+#: ../gl/manage/gl_account_types.php:128
+msgid "Class"
+msgstr ""
+
+#: ../gl/inquiry/gl_trial_balance.php:241
+#: ../reporting/rep708.php:283
 msgid ""
 "The Opening Balance is not in balance, probably due to a non closed Previous "
 "Fiscalyear."
@@ -4597,14 +4880,14 @@ msgstr ""
 msgid "Enter memo fragment or leave empty"
 msgstr ""
 
-#: ../gl/inquiry/journal_inquiry.php:123
+#: ../gl/inquiry/journal_inquiry.php:130
 msgid "Trans #"
 msgstr ""
 
-#: ../gl/inquiry/journal_inquiry.php:127
-#: ../reporting/rep710.php:75
-#: ../reporting/rep710.php:85
-#: ../reporting/reports_main.php:390
+#: ../gl/inquiry/journal_inquiry.php:134
+#: ../reporting/rep710.php:77
+#: ../reporting/rep710.php:87
+#: ../reporting/reports_main.php:505
 msgid "User"
 msgstr ""
 
@@ -4612,37 +4895,37 @@ msgstr ""
 msgid "Profit & Loss Drilldown"
 msgstr ""
 
-#: ../gl/inquiry/profit_loss.php:168
-#: ../reporting/rep707.php:206
-#: ../reporting/includes/reports_classes.inc:229
+#: ../gl/inquiry/profit_loss.php:173
+#: ../reporting/rep707.php:210
+#: ../reporting/includes/reports_classes.inc:248
 msgid "Accumulated"
 msgstr ""
 
-#: ../gl/inquiry/profit_loss.php:168
-#: ../reporting/rep707.php:251
-#: ../reporting/includes/reports_classes.inc:229
+#: ../gl/inquiry/profit_loss.php:173
+#: ../reporting/rep707.php:255
+#: ../reporting/includes/reports_classes.inc:248
 msgid "Period Y-1"
 msgstr ""
 
-#: ../gl/inquiry/profit_loss.php:168
-#: ../reporting/rep707.php:242
-#: ../reporting/includes/reports_classes.inc:229
+#: ../gl/inquiry/profit_loss.php:173
+#: ../reporting/rep707.php:246
+#: ../reporting/includes/reports_classes.inc:248
 msgid "Budget"
 msgstr ""
 
-#: ../gl/inquiry/profit_loss.php:169
-#: ../reporting/reports_main.php:279
-#: ../reporting/reports_main.php:325
-#: ../reporting/reports_main.php:366
+#: ../gl/inquiry/profit_loss.php:174
+#: ../reporting/reports_main.php:381
+#: ../reporting/reports_main.php:432
+#: ../reporting/reports_main.php:478
 msgid "Compare to"
 msgstr ""
 
-#: ../gl/inquiry/profit_loss.php:230
+#: ../gl/inquiry/profit_loss.php:235
 msgid "Group/Account Name"
 msgstr ""
 
-#: ../gl/inquiry/profit_loss.php:233
-#: ../reporting/rep707.php:206
+#: ../gl/inquiry/profit_loss.php:238
+#: ../reporting/rep707.php:210
 msgid "Achieved %"
 msgstr ""
 
@@ -4651,12 +4934,12 @@ msgid "Tax Inquiry"
 msgstr ""
 
 #: ../gl/inquiry/tax_inquiry.php:82
-#: ../reporting/rep709.php:168
+#: ../reporting/rep709.php:188
 msgid "Outputs"
 msgstr ""
 
 #: ../gl/inquiry/tax_inquiry.php:82
-#: ../reporting/rep709.php:168
+#: ../reporting/rep709.php:188
 msgid "Inputs"
 msgstr ""
 
@@ -4665,7 +4948,7 @@ msgid "Charged on sales"
 msgstr ""
 
 #: ../gl/inquiry/tax_inquiry.php:100
-#: ../reporting/rep709.php:168
+#: ../reporting/rep709.php:188
 msgid "Output Tax"
 msgstr ""
 
@@ -4674,7 +4957,7 @@ msgid "Paid on purchases"
 msgstr ""
 
 #: ../gl/inquiry/tax_inquiry.php:106
-#: ../reporting/rep709.php:168
+#: ../reporting/rep709.php:188
 msgid "Input Tax"
 msgstr ""
 
@@ -4683,12 +4966,13 @@ msgid "Net payable or collectible"
 msgstr ""
 
 #: ../gl/inquiry/tax_inquiry.php:119
-#: ../reporting/rep709.php:199
+#: ../reporting/rep709.php:219
 msgid "Total payable or refund"
 msgstr ""
 
 #: ../gl/manage/bank_accounts.php:16
-#: ../reporting/reports_main.php:228
+#: ../reporting/reports_main.php:317
+#: ../reporting/reports_main.php:325
 msgid "Bank Accounts"
 msgstr ""
 
@@ -4696,133 +4980,178 @@ msgstr ""
 msgid "The bank account name cannot be empty."
 msgstr ""
 
-#: ../gl/manage/bank_accounts.php:47
+#: ../gl/manage/bank_accounts.php:39
+msgid "The GL account selected is already in use. Select another GL account."
+msgstr ""
+
+#: ../gl/manage/bank_accounts.php:52
 msgid "Bank account has been updated"
 msgstr ""
 
-#: ../gl/manage/bank_accounts.php:56
+#: ../gl/manage/bank_accounts.php:61
 msgid "New bank account has been added"
 msgstr ""
 
-#: ../gl/manage/bank_accounts.php:72
+#: ../gl/manage/bank_accounts.php:76
 msgid ""
 "Cannot delete this bank account because transactions have been created using "
 "this account."
 msgstr ""
 
-#: ../gl/manage/bank_accounts.php:78
+#: ../gl/manage/bank_accounts.php:82
 msgid ""
 "Cannot delete this bank account because POS definitions have been created "
 "using this account."
 msgstr ""
 
-#: ../gl/manage/bank_accounts.php:83
+#: ../gl/manage/bank_accounts.php:87
 msgid "Selected bank account has been deleted"
 msgstr ""
 
-#: ../gl/manage/bank_accounts.php:102
+#: ../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
-#: ../inventory/prices.php:133
-#: ../inventory/purchasing_data.php:127
+#: ../inventory/prices.php:147
+#: ../inventory/purchasing_data.php:148
 #: ../purchasing/view/view_supp_credit.php:49
-#: ../purchasing/view/view_supp_invoice.php:53
-#: ../purchasing/inquiry/po_search_completed.php:122
-#: ../purchasing/inquiry/po_search.php:136
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:132
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:142
-#: ../purchasing/inquiry/supplier_inquiry.php:72
-#: ../purchasing/inquiry/supplier_inquiry.php:169
+#: ../purchasing/view/view_supp_invoice.php:54
+#: ../purchasing/inquiry/po_search_completed.php:129
+#: ../purchasing/inquiry/po_search.php:138
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:133
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:143
+#: ../purchasing/inquiry/supplier_inquiry.php:73
 #: ../purchasing/inquiry/supplier_inquiry.php:180
+#: ../purchasing/inquiry/supplier_inquiry.php:192
 #: ../purchasing/allocations/supplier_allocation_main.php:99
 #: ../purchasing/allocations/supplier_allocation_main.php:107
-#: ../reporting/rep101.php:138
-#: ../reporting/rep102.php:123
-#: ../reporting/rep102.php:128
-#: ../reporting/rep104.php:114
-#: ../reporting/rep201.php:126
-#: ../reporting/rep202.php:126
-#: ../reporting/rep203.php:99
+#: ../reporting/rep101.php:128
+#: ../reporting/rep102.php:133
+#: ../reporting/rep102.php:139
+#: ../reporting/rep103.php:232
+#: ../reporting/rep104.php:116
+#: ../reporting/rep201.php:120
+#: ../reporting/rep202.php:138
+#: ../reporting/rep203.php:101
+#: ../reporting/rep205.php:150
 #: ../sales/customer_credit_invoice.php:237
-#: ../sales/customer_delivery.php:326
-#: ../sales/customer_invoice.php:396
+#: ../sales/customer_delivery.php:364
+#: ../sales/customer_invoice.php:479
 #: ../sales/allocations/customer_allocation_main.php:98
 #: ../sales/allocations/customer_allocation_main.php:106
 #: ../sales/view/view_credit.php:70
 #: ../sales/view/view_dispatch.php:86
-#: ../sales/view/view_invoice.php:85
-#: ../sales/inquiry/customer_allocation_inquiry.php:148
-#: ../sales/inquiry/customer_allocation_inquiry.php:158
+#: ../sales/view/view_invoice.php:86
+#: ../sales/inquiry/customer_allocation_inquiry.php:151
+#: ../sales/inquiry/customer_allocation_inquiry.php:161
 #: ../sales/inquiry/customer_inquiry.php:76
-#: ../sales/inquiry/customer_inquiry.php:220
-#: ../sales/inquiry/customer_inquiry.php:233
-#: ../sales/inquiry/sales_deliveries_view.php:189
-#: ../sales/inquiry/sales_orders_view.php:263
-#: ../sales/inquiry/sales_orders_view.php:277
-#: ../themes/exclusive/renderer.php:289
-#: ../themes/exclusive/renderer.php:383
+#: ../sales/inquiry/customer_inquiry.php:208
+#: ../sales/inquiry/customer_inquiry.php:221
+#: ../sales/inquiry/sales_deliveries_view.php:191
+#: ../sales/inquiry/sales_orders_view.php:295
+#: ../sales/inquiry/sales_orders_view.php:309
 msgid "Currency"
 msgstr ""
 
-#: ../gl/manage/bank_accounts.php:102
+#: ../gl/manage/bank_accounts.php:109
 msgid "GL Account"
 msgstr ""
 
-#: ../gl/manage/bank_accounts.php:103
-#: ../reporting/includes/doctext.inc:77
+#: ../gl/manage/bank_accounts.php:110
+#: ../reporting/includes/doctext.inc:260
 msgid "Bank"
 msgstr ""
 
-#: ../gl/manage/bank_accounts.php:103
-#: ../includes/ui/ui_view.inc:480
+#: ../gl/manage/bank_accounts.php:110
+#: ../includes/ui/ui_view.inc:547
 msgid "Number"
 msgstr ""
 
-#: ../gl/manage/bank_accounts.php:103
+#: ../gl/manage/bank_accounts.php:110
 msgid "Bank Address"
 msgstr ""
 
-#: ../gl/manage/bank_accounts.php:103
+#: ../gl/manage/bank_accounts.php:110
 msgid "Dflt"
 msgstr ""
 
-#: ../gl/manage/bank_accounts.php:159
+#: ../gl/manage/bank_accounts.php:167
 msgid "Bank Account Name:"
 msgstr ""
 
-#: ../gl/manage/bank_accounts.php:163
-#: ../gl/manage/bank_accounts.php:167
+#: ../gl/manage/bank_accounts.php:171
+#: ../gl/manage/bank_accounts.php:175
 msgid "Account Type:"
 msgstr ""
 
-#: ../gl/manage/bank_accounts.php:171
-#: ../gl/manage/bank_accounts.php:175
+#: ../gl/manage/bank_accounts.php:179
+#: ../gl/manage/bank_accounts.php:183
 msgid "Bank Account Currency:"
 msgstr ""
 
-#: ../gl/manage/bank_accounts.php:178
+#: ../gl/manage/bank_accounts.php:186
 msgid "Default currency account:"
 msgstr ""
 
-#: ../gl/manage/bank_accounts.php:181
-#: ../gl/manage/bank_accounts.php:183
+#: ../gl/manage/bank_accounts.php:189
+#: ../gl/manage/bank_accounts.php:191
 msgid "Bank Account GL Code:"
 msgstr ""
 
-#: ../gl/manage/bank_accounts.php:185
+#: ../gl/manage/bank_accounts.php:194
 msgid "Bank Name:"
 msgstr ""
 
-#: ../gl/manage/bank_accounts.php:186
+#: ../gl/manage/bank_accounts.php:195
+#: ../sales/manage/customer_branches.php:255
 msgid "Bank Account Number:"
 msgstr ""
 
-#: ../gl/manage/bank_accounts.php:187
+#: ../gl/manage/bank_accounts.php:196
 msgid "Bank Address:"
 msgstr ""
 
+#: ../gl/manage/close_period.php:25
+msgid "Closing GL Transactions"
+msgstr ""
+
+#: ../gl/manage/close_period.php:40
+msgid "Selected date is not in fiscal year or the year is closed."
+msgstr ""
+
+#: ../gl/manage/close_period.php:47
+msgid "The entered date is earlier than date already selected as closing date."
+msgstr ""
+
+#: ../gl/manage/close_period.php:51
+msgid "You are not allowed to reopen already closed transactions."
+msgstr ""
+
+#: ../gl/manage/close_period.php:69
+#, php-format
+msgid ""
+"All transactions resulting in GL accounts changes up to %s has been closed "
+"for further edition."
+msgstr ""
+
+#: ../gl/manage/close_period.php:88
+msgid ""
+"Using this feature you can prevent entering new transactions <br>\n"
+"\tand disable edition of already entered transactions up to specified date."
+"<br>\n"
+"\tOnly transactions which can generate GL postings are subject to the "
+"constraint."
+msgstr ""
+
+#: ../gl/manage/close_period.php:101
+msgid "End date of closing period:"
+msgstr ""
+
+#: ../gl/manage/close_period.php:104
+msgid "Close Transactions"
+msgstr ""
+
 #: ../gl/manage/currencies.php:16
 #: ../includes/access_levels.inc:223
 msgid "Currencies"
@@ -4852,84 +5181,84 @@ msgstr ""
 msgid "New currency has been added"
 msgstr ""
 
-#: ../gl/manage/currencies.php:94
+#: ../gl/manage/currencies.php:92
 msgid ""
 "Cannot delete this currency, because customer accounts have been created "
 "referring to this currency."
 msgstr ""
 
-#: ../gl/manage/currencies.php:100
+#: ../gl/manage/currencies.php:98
 msgid ""
 "Cannot delete this currency, because supplier accounts have been created "
 "referring to this currency."
 msgstr ""
 
-#: ../gl/manage/currencies.php:106
+#: ../gl/manage/currencies.php:104
 msgid ""
 "Cannot delete this currency, because the company preferences uses this "
 "currency."
 msgstr ""
 
-#: ../gl/manage/currencies.php:113
+#: ../gl/manage/currencies.php:111
 msgid ""
 "Cannot delete this currency, because thre are bank accounts that use this "
 "currency."
 msgstr ""
 
-#: ../gl/manage/currencies.php:128
+#: ../gl/manage/currencies.php:126
 msgid "Selected currency has been deleted"
 msgstr ""
 
-#: ../gl/manage/currencies.php:141
+#: ../gl/manage/currencies.php:139
 msgid "Abbreviation"
 msgstr ""
 
-#: ../gl/manage/currencies.php:141
+#: ../gl/manage/currencies.php:139
 msgid "Symbol"
 msgstr ""
 
-#: ../gl/manage/currencies.php:141
+#: ../gl/manage/currencies.php:139
 msgid "Currency Name"
 msgstr ""
 
-#: ../gl/manage/currencies.php:142
+#: ../gl/manage/currencies.php:140
 msgid "Hundredths name"
 msgstr ""
 
-#: ../gl/manage/currencies.php:142
+#: ../gl/manage/currencies.php:140
 msgid "Country"
 msgstr ""
 
-#: ../gl/manage/currencies.php:142
+#: ../gl/manage/currencies.php:140
 msgid "Auto update"
 msgstr ""
 
-#: ../gl/manage/currencies.php:177
+#: ../gl/manage/currencies.php:175
 msgid "The marked currency is the home currency which cannot be deleted."
 msgstr ""
 
-#: ../gl/manage/currencies.php:203
-#: ../gl/manage/currencies.php:208
+#: ../gl/manage/currencies.php:201
+#: ../gl/manage/currencies.php:206
 msgid "Currency Abbreviation:"
 msgstr ""
 
-#: ../gl/manage/currencies.php:211
+#: ../gl/manage/currencies.php:209
 msgid "Currency Symbol:"
 msgstr ""
 
-#: ../gl/manage/currencies.php:212
+#: ../gl/manage/currencies.php:210
 msgid "Currency Name:"
 msgstr ""
 
-#: ../gl/manage/currencies.php:213
+#: ../gl/manage/currencies.php:211
 msgid "Hundredths Name:"
 msgstr ""
 
-#: ../gl/manage/currencies.php:214
+#: ../gl/manage/currencies.php:212
 msgid "Country:"
 msgstr ""
 
-#: ../gl/manage/currencies.php:215
+#: ../gl/manage/currencies.php:213
 msgid "Automatic exchange rate update:"
 msgstr ""
 
@@ -4937,10 +5266,6 @@ msgstr ""
 msgid "Exchange Rates"
 msgstr ""
 
-#: ../gl/manage/exchange_rates.php:39
-msgid "The exchange rate cannot be zero or a negative number."
-msgstr ""
-
 #: ../gl/manage/exchange_rates.php:45
 msgid "The exchange rate for the date is already there."
 msgstr ""
@@ -4951,13 +5276,12 @@ msgid "Date to Use From:"
 msgstr ""
 
 #: ../gl/manage/exchange_rates.php:141
-#: ../includes/ui/ui_view.inc:288
-#: ../includes/ui/ui_view.inc:290
+#: ../includes/ui/ui_view.inc:325
 msgid "Exchange Rate:"
 msgstr ""
 
 #: ../gl/manage/exchange_rates.php:142
-msgid "Get current ECB rate"
+msgid "Get current rate from"
 msgstr ""
 
 #: ../gl/manage/exchange_rates.php:148
@@ -5025,13 +5349,12 @@ msgid "Class Name"
 msgstr ""
 
 #: ../gl/manage/gl_account_classes.php:110
-#: ../gl/manage/gl_account_types.php:122
 msgid "Class Type"
 msgstr ""
 
 #: ../gl/manage/gl_account_classes.php:112
 #: ../gl/manage/gl_account_classes.php:169
-#: ../reporting/rep706.php:211
+#: ../reporting/rep706.php:215
 msgid "Balance Sheet"
 msgstr ""
 
@@ -5045,12 +5368,11 @@ msgid "Class Name:"
 msgstr ""
 
 #: ../gl/manage/gl_account_classes.php:171
-#: ../gl/manage/gl_account_types.php:186
 msgid "Class Type:"
 msgstr ""
 
 #: ../gl/manage/gl_accounts.php:16
-#: ../reporting/rep701.php:112
+#: ../reporting/rep701.php:117
 msgid "Chart of Accounts"
 msgstr ""
 
@@ -5066,96 +5388,104 @@ msgstr ""
 msgid "The account code must be numeric."
 msgstr ""
 
-#: ../gl/manage/gl_accounts.php:86
+#: ../gl/manage/gl_accounts.php:80
+msgid "The account belongs to a bank account and cannot be inactivated."
+msgstr ""
+
+#: ../gl/manage/gl_accounts.php:89
 msgid "Account data has been updated."
 msgstr ""
 
-#: ../gl/manage/gl_accounts.php:95
+#: ../gl/manage/gl_accounts.php:98
 msgid "New account has been added."
 msgstr ""
 
-#: ../gl/manage/gl_accounts.php:113
+#: ../gl/manage/gl_accounts.php:102
+msgid "Account not added, possible duplicate Account Code."
+msgstr ""
+
+#: ../gl/manage/gl_accounts.php:117
 msgid ""
 "Cannot delete this account because transactions have been created using this "
 "account."
 msgstr ""
 
-#: ../gl/manage/gl_accounts.php:119
+#: ../gl/manage/gl_accounts.php:123
 msgid ""
 "Cannot delete this account because it is used as one of the company default "
 "GL accounts."
 msgstr ""
 
-#: ../gl/manage/gl_accounts.php:125
+#: ../gl/manage/gl_accounts.php:129
 msgid "Cannot delete this account because it is used by a bank account."
 msgstr ""
 
-#: ../gl/manage/gl_accounts.php:131
+#: ../gl/manage/gl_accounts.php:135
 msgid ""
 "Cannot delete this account because it is used by one or more Item Categories."
 msgstr ""
 
-#: ../gl/manage/gl_accounts.php:137
+#: ../gl/manage/gl_accounts.php:141
 msgid "Cannot delete this account because it is used by one or more Items."
 msgstr ""
 
-#: ../gl/manage/gl_accounts.php:143
+#: ../gl/manage/gl_accounts.php:147
 msgid "Cannot delete this account because it is used by one or more Taxes."
 msgstr ""
 
-#: ../gl/manage/gl_accounts.php:149
+#: ../gl/manage/gl_accounts.php:153
 msgid ""
 "Cannot delete this account because it is used by one or more Customer "
 "Branches."
 msgstr ""
 
-#: ../gl/manage/gl_accounts.php:155
+#: ../gl/manage/gl_accounts.php:158
 msgid "Cannot delete this account because it is used by one or more suppliers."
 msgstr ""
 
-#: ../gl/manage/gl_accounts.php:161
+#: ../gl/manage/gl_accounts.php:164
 msgid ""
 "Cannot delete this account because it is used by one or more Quick Entry "
 "Lines."
 msgstr ""
 
-#: ../gl/manage/gl_accounts.php:179
+#: ../gl/manage/gl_accounts.php:182
 msgid "Selected account has been deleted"
 msgstr ""
 
-#: ../gl/manage/gl_accounts.php:194
+#: ../gl/manage/gl_accounts.php:197
 msgid "New account"
 msgstr ""
 
-#: ../gl/manage/gl_accounts.php:240
+#: ../gl/manage/gl_accounts.php:243
 msgid "Account Code 2:"
 msgstr ""
 
-#: ../gl/manage/gl_accounts.php:242
+#: ../gl/manage/gl_accounts.php:245
 msgid "Account Name:"
 msgstr ""
 
-#: ../gl/manage/gl_accounts.php:244
+#: ../gl/manage/gl_accounts.php:247
 msgid "Account Group:"
 msgstr ""
 
-#: ../gl/manage/gl_accounts.php:246
+#: ../gl/manage/gl_accounts.php:249
 msgid "Account Tags:"
 msgstr ""
 
-#: ../gl/manage/gl_accounts.php:248
+#: ../gl/manage/gl_accounts.php:251
 msgid "Account status:"
 msgstr ""
 
-#: ../gl/manage/gl_accounts.php:253
+#: ../gl/manage/gl_accounts.php:256
 msgid "Add Account"
 msgstr ""
 
-#: ../gl/manage/gl_accounts.php:257
+#: ../gl/manage/gl_accounts.php:260
 msgid "Update Account"
 msgstr ""
 
-#: ../gl/manage/gl_accounts.php:258
+#: ../gl/manage/gl_accounts.php:261
 msgid "Delete account"
 msgstr ""
 
@@ -5171,62 +5501,71 @@ msgstr ""
 msgid "The account group name cannot be empty."
 msgstr ""
 
-#: ../gl/manage/gl_account_types.php:43
+#: ../gl/manage/gl_account_types.php:42
+msgid "This account group id is already in use."
+msgstr ""
+
+#: ../gl/manage/gl_account_types.php:50
 msgid "You cannot set an account group to be a subgroup of itself."
 msgstr ""
 
-#: ../gl/manage/gl_account_types.php:61
+#: ../gl/manage/gl_account_types.php:68
 msgid "Selected account type has been updated"
 msgstr ""
 
-#: ../gl/manage/gl_account_types.php:66
+#: ../gl/manage/gl_account_types.php:73
 msgid "New account type has been added"
 msgstr ""
 
-#: ../gl/manage/gl_account_types.php:83
+#: ../gl/manage/gl_account_types.php:89
 msgid ""
 "Cannot delete this account group because GL accounts have been created "
 "referring to it."
 msgstr ""
 
-#: ../gl/manage/gl_account_types.php:89
+#: ../gl/manage/gl_account_types.php:95
 msgid ""
 "Cannot delete this account group because GL account groups have been created "
 "referring to it."
 msgstr ""
 
-#: ../gl/manage/gl_account_types.php:105
+#: ../gl/manage/gl_account_types.php:111
 msgid "Selected account group has been deleted"
 msgstr ""
 
-#: ../gl/manage/gl_account_types.php:122
+#: ../gl/manage/gl_account_types.php:128
 msgid "Group ID"
 msgstr ""
 
-#: ../gl/manage/gl_account_types.php:122
+#: ../gl/manage/gl_account_types.php:128
 #: ../sales/manage/sales_groups.php:85
 msgid "Group Name"
 msgstr ""
 
-#: ../gl/manage/gl_account_types.php:122
+#: ../gl/manage/gl_account_types.php:128
 msgid "Subgroup Of"
 msgstr ""
 
-#: ../gl/manage/gl_account_types.php:181
+#: ../gl/manage/gl_account_types.php:187
 msgid "ID:"
 msgstr ""
 
-#: ../gl/manage/gl_account_types.php:184
+#: ../gl/manage/gl_account_types.php:190
 msgid "Subgroup Of:"
 msgstr ""
 
+#: ../gl/manage/gl_account_types.php:192
+msgid "Class:"
+msgstr ""
+
 #: ../gl/manage/gl_quick_entries.php:16
 msgid "Quick Entries"
 msgstr ""
 
 #: ../gl/manage/gl_quick_entries.php:58
 #: ../includes/ui/simple_crud_class.inc:221
-#: ../includes/ui/ui_input.inc:201
+#: ../includes/ui/ui_input.inc:206
+#: ../taxes/sav.tax_types.php:252
 msgid "Add new"
 msgstr ""
 
@@ -5316,8 +5655,9 @@ msgid "Posted"
 msgstr ""
 
 #: ../gl/manage/gl_quick_entries.php:329
-#: ../sales/customer_delivery.php:419
-#: ../sales/customer_invoice.php:447
+#: ../sales/customer_delivery.php:457
+#: ../sales/customer_invoice.php:551
+#: ../sales/customer_invoice.php:554
 msgid "Tax Type"
 msgstr ""
 
@@ -5329,15 +5669,20 @@ msgstr ""
 msgid "Revaluation of Currency Accounts"
 msgstr ""
 
-#: ../gl/manage/revaluate_currencies.php:31
+#: ../gl/manage/revaluate_currencies.php:32
 msgid "No Revaluation was needed"
 msgstr ""
 
-#: ../gl/manage/revaluate_currencies.php:101
+#: ../gl/manage/revaluate_currencies.php:40
+#, php-format
+msgid "%d Journal Entries for AR/AP accounts have been added"
+msgstr ""
+
+#: ../gl/manage/revaluate_currencies.php:104
 msgid "Date for Revaluation:"
 msgstr ""
 
-#: ../gl/manage/revaluate_currencies.php:106
+#: ../gl/manage/revaluate_currencies.php:109
 msgid "Revaluate Currencies"
 msgstr ""
 
@@ -5385,71 +5730,81 @@ msgid "GL Deposit"
 msgstr ""
 
 #: ../gl/view/gl_deposit_view.php:71
-#: ../gl/includes/db/gl_db_banking.inc:104
-#: ../reporting/reports_main.php:81
-#: ../reporting/reports_main.php:88
-#: ../reporting/reports_main.php:100
-#: ../reporting/reports_main.php:107
-#: ../reporting/reports_main.php:113
-#: ../reporting/reports_main.php:119
-#: ../reporting/reports_main.php:154
-#: ../reporting/reports_main.php:160
-#: ../reporting/reports_main.php:209
+#: ../gl/includes/db/gl_db_banking.inc:212
+#: ../reporting/reports_main.php:96
+#: ../reporting/reports_main.php:106
+#: ../reporting/reports_main.php:114
+#: ../reporting/reports_main.php:128
+#: ../reporting/reports_main.php:136
+#: ../reporting/reports_main.php:143
+#: ../reporting/reports_main.php:192
+#: ../reporting/reports_main.php:199
+#: ../reporting/reports_main.php:296
 msgid "From"
 msgstr ""
 
-#: ../gl/view/gl_deposit_view.php:72
+#: ../gl/view/gl_deposit_view.php:74
+#: ../gl/view/gl_payment_view.php:72
+msgid "Settle currency"
+msgstr ""
+
+#: ../gl/view/gl_deposit_view.php:75
+#: ../gl/view/gl_payment_view.php:73
+msgid "Settled amount"
+msgstr ""
+
+#: ../gl/view/gl_deposit_view.php:77
 msgid "Deposit Type"
 msgstr ""
 
-#: ../gl/view/gl_deposit_view.php:81
+#: ../gl/view/gl_deposit_view.php:86
 msgid "This deposit has been voided."
 msgstr ""
 
-#: ../gl/view/gl_deposit_view.php:87
+#: ../gl/view/gl_deposit_view.php:92
 msgid "There are no items for this deposit."
 msgstr ""
 
-#: ../gl/view/gl_deposit_view.php:92
+#: ../gl/view/gl_deposit_view.php:97
 msgid "Items for this Deposit"
 msgstr ""
 
-#: ../gl/view/gl_deposit_view.php:94
-#: ../gl/view/gl_payment_view.php:92
-msgid "Item Amounts are Shown in :"
-msgstr ""
-
 #: ../gl/view/gl_deposit_view.php:99
-#: ../gl/view/gl_deposit_view.php:102
-#: ../gl/view/gl_deposit_view.php:105
-#: ../gl/view/gl_payment_view.php:98
-#: ../gl/view/gl_payment_view.php:101
-#: ../gl/view/gl_payment_view.php:104
-#: ../gl/view/gl_trans_view.php:63
-#: ../gl/view/gl_trans_view.php:66
-#: ../gl/view/gl_trans_view.php:69
-#: ../gl/includes/ui/gl_bank_ui.inc:121
-#: ../gl/includes/ui/gl_bank_ui.inc:124
-#: ../gl/includes/ui/gl_bank_ui.inc:127
-#: ../gl/includes/ui/gl_journal_ui.inc:83
+#: ../gl/view/gl_payment_view.php:97
+msgid "Item Amounts are Shown in:"
+msgstr ""
+
+#: ../gl/view/gl_deposit_view.php:104
+#: ../gl/view/gl_deposit_view.php:107
+#: ../gl/view/gl_deposit_view.php:110
+#: ../gl/view/gl_payment_view.php:103
+#: ../gl/view/gl_payment_view.php:106
+#: ../gl/view/gl_payment_view.php:109
+#: ../gl/view/gl_trans_view.php:68
+#: ../gl/view/gl_trans_view.php:71
+#: ../gl/view/gl_trans_view.php:74
+#: ../gl/includes/ui/gl_bank_ui.inc:152
+#: ../gl/includes/ui/gl_bank_ui.inc:155
+#: ../gl/includes/ui/gl_bank_ui.inc:158
 #: ../gl/includes/ui/gl_journal_ui.inc:86
 #: ../gl/includes/ui/gl_journal_ui.inc:89
-#: ../reporting/rep701.php:106
+#: ../gl/includes/ui/gl_journal_ui.inc:92
+#: ../reporting/rep701.php:111
 msgid "Account Code"
 msgstr ""
 
-#: ../gl/view/gl_deposit_view.php:99
-#: ../gl/view/gl_deposit_view.php:102
-#: ../gl/view/gl_deposit_view.php:105
-#: ../gl/view/gl_payment_view.php:98
-#: ../gl/view/gl_payment_view.php:101
-#: ../gl/view/gl_payment_view.php:104
-#: ../gl/includes/ui/gl_bank_ui.inc:121
-#: ../gl/includes/ui/gl_bank_ui.inc:124
-#: ../gl/includes/ui/gl_bank_ui.inc:127
-#: ../gl/includes/ui/gl_journal_ui.inc:83
+#: ../gl/view/gl_deposit_view.php:104
+#: ../gl/view/gl_deposit_view.php:107
+#: ../gl/view/gl_deposit_view.php:110
+#: ../gl/view/gl_payment_view.php:103
+#: ../gl/view/gl_payment_view.php:106
+#: ../gl/view/gl_payment_view.php:109
+#: ../gl/includes/ui/gl_bank_ui.inc:152
+#: ../gl/includes/ui/gl_bank_ui.inc:155
+#: ../gl/includes/ui/gl_bank_ui.inc:158
 #: ../gl/includes/ui/gl_journal_ui.inc:86
 #: ../gl/includes/ui/gl_journal_ui.inc:89
+#: ../gl/includes/ui/gl_journal_ui.inc:92
 msgid "Account Description"
 msgstr ""
 
@@ -5465,22 +5820,23 @@ msgstr ""
 msgid "Pay To"
 msgstr ""
 
-#: ../gl/view/gl_payment_view.php:70
-#: ../purchasing/view/view_supp_payment.php:61
-#: ../sales/view/view_receipt.php:48
+#: ../gl/view/gl_payment_view.php:75
+#: ../purchasing/view/view_supp_payment.php:64
+#: ../purchasing/view/view_supp_payment.php:78
+#: ../sales/view/view_receipt.php:50
 msgid "Payment Type"
 msgstr ""
 
-#: ../gl/view/gl_payment_view.php:79
-#: ../purchasing/view/view_supp_payment.php:76
+#: ../gl/view/gl_payment_view.php:84
+#: ../purchasing/view/view_supp_payment.php:85
 msgid "This payment has been voided."
 msgstr ""
 
-#: ../gl/view/gl_payment_view.php:85
+#: ../gl/view/gl_payment_view.php:90
 msgid "There are no items for this payment."
 msgstr ""
 
-#: ../gl/view/gl_payment_view.php:90
+#: ../gl/view/gl_payment_view.php:95
 msgid "Items for this Payment"
 msgstr ""
 
@@ -5489,163 +5845,194 @@ msgstr ""
 msgid "General Ledger Transaction Details"
 msgstr ""
 
-#: ../gl/view/gl_trans_view.php:54
+#: ../gl/view/gl_trans_view.php:39
+#: ../gl/includes/ui/gl_journal_ui.inc:97
+msgid "Counterparty"
+msgstr ""
+
+#: ../gl/view/gl_trans_view.php:59
 msgid "No general ledger transactions have been created for"
 msgstr ""
 
-#: ../gl/view/gl_trans_view.php:54
+#: ../gl/view/gl_trans_view.php:59
 msgid "number"
 msgstr ""
 
-#: ../gl/view/gl_trans_view.php:118
+#: ../gl/view/gl_trans_view.php:129
 msgid "This transaction has been voided."
 msgstr ""
 
 #: ../gl/includes/db/gl_db_banking.inc:44
 #: ../gl/includes/db/gl_db_banking.inc:47
+#: ../gl/includes/db/gl_db_banking.inc:60
+#: ../gl/includes/db/gl_db_banking.inc:63
+#: ../gl/includes/db/gl_db_banking.inc:255
 msgid "Exchange Variance"
 msgstr ""
 
-#: ../gl/includes/db/gl_db_banking.inc:104
-#: ../reporting/reports_main.php:82
-#: ../reporting/reports_main.php:89
-#: ../reporting/reports_main.php:101
-#: ../reporting/reports_main.php:108
-#: ../reporting/reports_main.php:114
-#: ../reporting/reports_main.php:120
-#: ../reporting/reports_main.php:155
-#: ../reporting/reports_main.php:161
-#: ../reporting/reports_main.php:210
+#: ../gl/includes/db/gl_db_banking.inc:212
+#: ../reporting/reports_main.php:97
+#: ../reporting/reports_main.php:107
+#: ../reporting/reports_main.php:115
+#: ../reporting/reports_main.php:129
+#: ../reporting/reports_main.php:137
+#: ../reporting/reports_main.php:144
+#: ../reporting/reports_main.php:193
+#: ../reporting/reports_main.php:200
+#: ../reporting/reports_main.php:297
 msgid "To"
 msgstr ""
 
-#: ../gl/includes/db/gl_db_rates.inc:128
+#: ../gl/includes/db/gl_db_banking.inc:444
+#: ../purchasing/includes/db/invoice_db.inc:136
+msgid "Document reentered."
+msgstr ""
+
+#: ../gl/includes/db/gl_db_trans.inc:96
 #, php-format
-msgid ""
-"Cannot retrieve currency rate from %s page. Please set the rate manually."
+msgid "Rounding error %s encountered for trans_type:%s,trans_no:%s"
 msgstr ""
 
-#: ../gl/includes/ui/gl_bank_ui.inc:25
+#: ../gl/includes/ui/gl_bank_ui.inc:24
 #: ../gl/includes/ui/gl_journal_ui.inc:27
 #: ../inventory/includes/item_adjustments_ui.inc:39
 #: ../inventory/includes/stock_transfers_ui.inc:42
-#: ../manufacturing/work_order_add_finished.php:208
-#: ../manufacturing/work_order_costs.php:144
-#: ../purchasing/allocations/supplier_allocate.php:54
-#: ../sales/allocations/customer_allocate.php:53
+#: ../manufacturing/work_order_add_finished.php:205
+#: ../manufacturing/work_order_costs.php:133
+#: ../purchasing/allocations/supplier_allocate.php:56
+#: ../sales/allocations/customer_allocate.php:54
 #: ../sales/includes/ui/sales_credit_ui.inc:121
 msgid "Date:"
 msgstr ""
 
-#: ../gl/includes/ui/gl_bank_ui.inc:50
+#: ../gl/includes/ui/gl_bank_ui.inc:52
 msgid "Pay To:"
 msgstr ""
 
-#: ../gl/includes/ui/gl_bank_ui.inc:55
+#: ../gl/includes/ui/gl_bank_ui.inc:57
 msgid "To the Order of:"
 msgstr ""
 
-#: ../gl/includes/ui/gl_bank_ui.inc:62
-#: ../inventory/purchasing_data.php:182
-#: ../inventory/purchasing_data.php:186
-#: ../purchasing/includes/ui/invoice_ui.inc:73
-#: ../purchasing/includes/ui/invoice_ui.inc:80
-#: ../purchasing/includes/ui/po_ui.inc:120
-#: ../purchasing/includes/ui/po_ui.inc:125
+#: ../gl/includes/ui/gl_bank_ui.inc:64
+#: ../inventory/purchasing_data.php:208
+#: ../inventory/purchasing_data.php:212
+#: ../purchasing/includes/ui/invoice_ui.inc:95
+#: ../purchasing/includes/ui/invoice_ui.inc:103
+#: ../purchasing/includes/ui/invoice_ui.inc:105
+#: ../purchasing/includes/ui/po_ui.inc:137
+#: ../purchasing/includes/ui/po_ui.inc:142
 msgid "Supplier:"
 msgstr ""
 
-#: ../gl/includes/ui/gl_bank_ui.inc:65
-#: ../sales/manage/recurrent_invoices.php:151
+#: ../gl/includes/ui/gl_bank_ui.inc:67
+#: ../sales/manage/recurrent_invoices.php:169
 #: ../sales/includes/ui/sales_credit_ui.inc:29
-#: ../sales/includes/ui/sales_order_ui.inc:278
+#: ../sales/includes/ui/sales_order_ui.inc:270
 msgid "Customer:"
 msgstr ""
 
-#: ../gl/includes/ui/gl_bank_ui.inc:69
-#: ../sales/customer_payments.php:239
-#: ../sales/manage/recurrent_invoices.php:154
+#: ../gl/includes/ui/gl_bank_ui.inc:71
+#: ../sales/customer_payments.php:348
+#: ../sales/manage/recurrent_invoices.php:172
 #: ../sales/includes/ui/sales_credit_ui.inc:37
-#: ../sales/includes/ui/sales_order_ui.inc:285
+#: ../sales/includes/ui/sales_order_ui.inc:277
 msgid "Branch:"
 msgstr ""
 
-#: ../gl/includes/ui/gl_bank_ui.inc:87
+#: ../gl/includes/ui/gl_bank_ui.inc:85
+#: ../gl/includes/ui/gl_bank_ui.inc:88
+#: ../sales/customer_payments.php:364
+msgid "This customer account is on hold."
+msgstr ""
+
+#: ../gl/includes/ui/gl_bank_ui.inc:101
 #: ../gl/includes/ui/gl_journal_ui.inc:58
 #: ../gl/includes/ui/gl_journal_ui.inc:62
-#: ../purchasing/includes/ui/invoice_ui.inc:231
+#: ../purchasing/includes/ui/invoice_ui.inc:266
 msgid "Go"
 msgstr ""
 
-#: ../gl/includes/ui/gl_bank_ui.inc:156
+#: ../gl/includes/ui/gl_bank_ui.inc:120
+msgid "Into:"
+msgstr ""
+
+#: ../gl/includes/ui/gl_bank_ui.inc:187
 #: ../includes/ui/simple_crud_class.inc:52
-#: ../inventory/includes/item_adjustments_ui.inc:88
-#: ../inventory/includes/stock_transfers_ui.inc:80
-#: ../manufacturing/includes/work_order_issue_ui.inc:59
-#: ../purchasing/includes/ui/invoice_ui.inc:519
-#: ../purchasing/includes/ui/po_ui.inc:267
+#: ../inventory/includes/item_adjustments_ui.inc:92
+#: ../inventory/includes/stock_transfers_ui.inc:84
+#: ../manufacturing/includes/work_order_issue_ui.inc:64
+#: ../purchasing/includes/ui/invoice_ui.inc:557
+#: ../purchasing/includes/ui/po_ui.inc:276
 #: ../sales/includes/ui/sales_credit_ui.inc:198
-#: ../sales/includes/ui/sales_order_ui.inc:203
+#: ../sales/includes/ui/sales_order_ui.inc:198
 msgid "Edit document line"
 msgstr ""
 
-#: ../gl/includes/ui/gl_bank_ui.inc:158
+#: ../gl/includes/ui/gl_bank_ui.inc:189
 #: ../includes/ui/simple_crud_class.inc:54
-#: ../inventory/includes/item_adjustments_ui.inc:90
-#: ../inventory/includes/stock_transfers_ui.inc:82
-#: ../manufacturing/includes/work_order_issue_ui.inc:61
-#: ../purchasing/includes/ui/invoice_ui.inc:285
-#: ../purchasing/includes/ui/po_ui.inc:269
+#: ../inventory/includes/item_adjustments_ui.inc:94
+#: ../inventory/includes/stock_transfers_ui.inc:86
+#: ../manufacturing/includes/work_order_issue_ui.inc:66
+#: ../purchasing/includes/ui/invoice_ui.inc:320
+#: ../purchasing/includes/ui/po_ui.inc:278
 #: ../sales/includes/ui/sales_credit_ui.inc:200
-#: ../sales/includes/ui/sales_order_ui.inc:205
+#: ../sales/includes/ui/sales_order_ui.inc:200
 msgid "Remove line from document"
 msgstr ""
 
-#: ../gl/includes/ui/gl_bank_ui.inc:247
-#: ../gl/includes/ui/gl_journal_ui.inc:222
+#: ../gl/includes/ui/gl_bank_ui.inc:278
+#: ../gl/includes/ui/gl_journal_ui.inc:258
 #: ../includes/ui/simple_crud_class.inc:56
-#: ../inventory/includes/item_adjustments_ui.inc:158
-#: ../inventory/includes/stock_transfers_ui.inc:138
-#: ../manufacturing/includes/work_order_issue_ui.inc:128
-#: ../purchasing/includes/ui/po_ui.inc:435
+#: ../inventory/includes/item_adjustments_ui.inc:164
+#: ../inventory/includes/stock_transfers_ui.inc:144
+#: ../manufacturing/includes/work_order_issue_ui.inc:139
+#: ../purchasing/includes/ui/po_ui.inc:460
 #: ../sales/includes/ui/sales_credit_ui.inc:294
-#: ../sales/includes/ui/sales_order_ui.inc:556
+#: ../sales/includes/ui/sales_order_ui.inc:547
 msgid "Confirm changes"
 msgstr ""
 
-#: ../gl/includes/ui/gl_bank_ui.inc:249
-#: ../gl/includes/ui/gl_journal_ui.inc:224
+#: ../gl/includes/ui/gl_bank_ui.inc:280
+#: ../gl/includes/ui/gl_journal_ui.inc:260
 #: ../includes/ui/simple_crud_class.inc:58
-#: ../inventory/includes/item_adjustments_ui.inc:160
-#: ../inventory/includes/stock_transfers_ui.inc:140
-#: ../manufacturing/includes/work_order_issue_ui.inc:130
-#: ../purchasing/includes/ui/po_ui.inc:437
+#: ../inventory/includes/item_adjustments_ui.inc:166
+#: ../inventory/includes/stock_transfers_ui.inc:146
+#: ../manufacturing/includes/work_order_issue_ui.inc:141
+#: ../purchasing/includes/ui/po_ui.inc:462
 #: ../sales/includes/ui/sales_credit_ui.inc:296
-#: ../sales/includes/ui/sales_order_ui.inc:558
+#: ../sales/includes/ui/sales_order_ui.inc:549
 msgid "Cancel changes"
 msgstr ""
 
-#: ../gl/includes/ui/gl_bank_ui.inc:254
-#: ../gl/includes/ui/gl_journal_ui.inc:228
-#: ../inventory/includes/item_adjustments_ui.inc:166
-#: ../inventory/includes/stock_transfers_ui.inc:146
-#: ../manufacturing/includes/work_order_issue_ui.inc:136
-#: ../purchasing/includes/ui/po_ui.inc:443
+#: ../gl/includes/ui/gl_bank_ui.inc:285
+#: ../gl/includes/ui/gl_journal_ui.inc:264
+#: ../inventory/includes/item_adjustments_ui.inc:172
+#: ../inventory/includes/stock_transfers_ui.inc:152
+#: ../manufacturing/includes/work_order_issue_ui.inc:147
+#: ../purchasing/includes/ui/po_ui.inc:468
 #: ../sales/includes/ui/sales_credit_ui.inc:302
-#: ../sales/includes/ui/sales_order_ui.inc:564
+#: ../sales/includes/ui/sales_order_ui.inc:555
 msgid "Add Item"
 msgstr ""
 
-#: ../gl/includes/ui/gl_bank_ui.inc:255
-#: ../inventory/includes/item_adjustments_ui.inc:167
-#: ../inventory/includes/stock_transfers_ui.inc:147
-#: ../manufacturing/includes/work_order_issue_ui.inc:137
-#: ../purchasing/includes/ui/po_ui.inc:444
+#: ../gl/includes/ui/gl_bank_ui.inc:286
+#: ../inventory/includes/item_adjustments_ui.inc:173
+#: ../inventory/includes/stock_transfers_ui.inc:153
+#: ../manufacturing/includes/work_order_issue_ui.inc:148
+#: ../purchasing/includes/ui/po_ui.inc:469
 #: ../sales/includes/ui/sales_credit_ui.inc:303
-#: ../sales/includes/ui/sales_order_ui.inc:565
+#: ../sales/includes/ui/sales_order_ui.inc:556
 msgid "Add new item to document"
 msgstr ""
 
+#: ../gl/includes/ui/gl_bank_ui.inc:309
+msgid "Settled AR Amount:"
+msgstr ""
+
+#: ../gl/includes/ui/gl_bank_ui.inc:309
+msgid "Settled AP Amount:"
+msgstr ""
+
 #: ../gl/includes/ui/gl_journal_ui.inc:38
 msgid "Reverse Transaction:"
 msgstr ""
@@ -5659,15 +6046,20 @@ msgstr ""
 msgid "balance from account"
 msgstr ""
 
-#: ../gl/includes/ui/gl_journal_ui.inc:123
+#: ../gl/includes/ui/gl_journal_ui.inc:135
 msgid "Edit journal line"
 msgstr ""
 
-#: ../gl/includes/ui/gl_journal_ui.inc:125
+#: ../gl/includes/ui/gl_journal_ui.inc:137
 msgid "Remove line from journal"
 msgstr ""
 
-#: ../gl/includes/ui/gl_journal_ui.inc:229
+#: ../gl/includes/ui/gl_journal_ui.inc:200
+#: ../gl/includes/ui/gl_journal_ui.inc:232
+msgid "[Select account]"
+msgstr ""
+
+#: ../gl/includes/ui/gl_journal_ui.inc:265
 msgid "Add new line to journal"
 msgstr ""
 
@@ -5736,8 +6128,8 @@ msgid "Dimensions configuration"
 msgstr ""
 
 #: ../includes/access_levels.inc:72
-#: ../inventory/manage/items.php:351
-#: ../reporting/reports_main.php:213
+#: ../inventory/manage/items.php:352
+#: ../reporting/reports_main.php:301
 msgid "Dimensions"
 msgstr ""
 
@@ -5849,6 +6241,10 @@ msgstr ""
 msgid "Password changes"
 msgstr ""
 
+#: ../includes/access_levels.inc:123
+msgid "Edit other users transactions"
+msgstr ""
+
 #: ../includes/access_levels.inc:127
 msgid "Sales types"
 msgstr ""
@@ -6146,220 +6542,279 @@ msgid "GL Account tags"
 msgstr ""
 
 #: ../includes/access_levels.inc:230
-msgid "Allow entry on non closed Fiscal years"
+msgid "Closing GL transactions"
+msgstr ""
+
+#: ../includes/access_levels.inc:231
+msgid "Reopening GL transactions"
 msgstr ""
 
 #: ../includes/access_levels.inc:232
+msgid "Allow entry on non closed Fiscal years"
+msgstr ""
+
+#: ../includes/access_levels.inc:234
 msgid "Bank transactions view"
 msgstr ""
 
-#: ../includes/access_levels.inc:233
+#: ../includes/access_levels.inc:235
 msgid "GL postings view"
 msgstr ""
 
-#: ../includes/access_levels.inc:234
+#: ../includes/access_levels.inc:236
 msgid "Exchange rate table changes"
 msgstr ""
 
-#: ../includes/access_levels.inc:235
+#: ../includes/access_levels.inc:237
 msgid "Bank payments"
 msgstr ""
 
-#: ../includes/access_levels.inc:236
+#: ../includes/access_levels.inc:238
 msgid "Bank deposits"
 msgstr ""
 
-#: ../includes/access_levels.inc:237
+#: ../includes/access_levels.inc:239
 msgid "Bank account transfers"
 msgstr ""
 
-#: ../includes/access_levels.inc:238
+#: ../includes/access_levels.inc:240
 msgid "Bank reconciliation"
 msgstr ""
 
-#: ../includes/access_levels.inc:239
+#: ../includes/access_levels.inc:241
 msgid "Manual journal entries"
 msgstr ""
 
-#: ../includes/access_levels.inc:240
+#: ../includes/access_levels.inc:242
 msgid "Journal entries to bank related accounts"
 msgstr ""
 
-#: ../includes/access_levels.inc:241
+#: ../includes/access_levels.inc:243
 msgid "Budget edition"
 msgstr ""
 
-#: ../includes/access_levels.inc:242
+#: ../includes/access_levels.inc:244
 msgid "Item standard costs"
 msgstr ""
 
-#: ../includes/access_levels.inc:245
+#: ../includes/access_levels.inc:247
 msgid "GL analytical reports and inquiries"
 msgstr ""
 
-#: ../includes/access_levels.inc:246
+#: ../includes/access_levels.inc:248
 msgid "Tax reports and inquiries"
 msgstr ""
 
-#: ../includes/access_levels.inc:247
+#: ../includes/access_levels.inc:249
 msgid "Bank reports and inquiries"
 msgstr ""
 
-#: ../includes/access_levels.inc:248
+#: ../includes/access_levels.inc:250
 msgid "GL reports and inquiries"
 msgstr ""
 
 #: ../includes/banking.inc:100
+#: ../includes/data_checks.inc:52
 #, php-format
 msgid ""
 "Cannot retrieve exchange rate for currency %s as of %s. Please add exchange "
 "rate manually on Exchange Rates page."
 msgstr ""
 
-#: ../includes/current_user.inc:79
+#: ../includes/current_user.inc:101
 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:80
-#: ../includes/ui/ui_controls.inc:174
-#: ../includes/ui/ui_view.inc:843
+#: ../includes/current_user.inc:102
+#: ../includes/ui/ui_controls.inc:197
+#: ../includes/ui/ui_view.inc:904
 msgid "Back"
 msgstr ""
 
-#: ../includes/current_user.inc:90
+#: ../includes/current_user.inc:112
 msgid "System is available for site admin only until full database upgrade"
 msgstr ""
 
-#: ../includes/current_user.inc:428
+#: ../includes/current_user.inc:163
+msgid "New password for"
+msgstr ""
+
+#: ../includes/current_user.inc:570
 msgid "Requesting data..."
 msgstr ""
 
-#: ../includes/errors.inc:76
+#: ../includes/data_checks.inc:508
+#, php-format
+msgid "%s #%s is closed for further edition."
+msgstr ""
+
+#: ../includes/data_checks.inc:534
+msgid "You have no edit access to transactions created by other users."
+msgstr ""
+
+#: ../includes/errors.inc:126
 msgid "in file"
 msgstr ""
 
-#: ../includes/errors.inc:76
+#: ../includes/errors.inc:126
 msgid "at line "
 msgstr ""
 
-#: ../includes/errors.inc:123
+#: ../includes/errors.inc:180
 msgid "Debug mode database warning:"
 msgstr ""
 
-#: ../includes/errors.inc:125
+#: ../includes/errors.inc:182
 msgid "DATABASE ERROR :"
 msgstr ""
 
-#: ../includes/errors.inc:156
+#: ../includes/errors.inc:217
 msgid ""
 "The entered information is a duplicate. Please go back and enter different "
 "values."
 msgstr ""
 
-#: ../includes/main.inc:41
+#: ../includes/main.inc:44
 msgid "This page is usable only with javascript enabled browsers."
 msgstr ""
 
-#: ../includes/packages.inc:190
+#: ../includes/packages.inc:189
 #, php-format
 msgid "No key field '%s' in file '%s'"
 msgstr ""
 
-#: ../includes/packages.inc:295
+#: ../includes/packages.inc:294
+msgid "Cannot download repo index file."
+msgstr ""
+
+#: ../includes/packages.inc:306
+#: ../includes/packages.inc:343
+#, php-format
+msgid "Cannot delete outdated '%s' file."
+msgstr ""
+
+#: ../includes/packages.inc:310
 msgid "Release file in repository is invalid, or public key is outdated."
 msgstr ""
 
-#: ../includes/packages.inc:311
+#: ../includes/packages.inc:327
 msgid "Repository version does not match application version."
 msgstr ""
 
-#: ../includes/packages.inc:325
+#: ../includes/packages.inc:335
+#: ../includes/packages.inc:377
+#, php-format
+msgid "Cannot download '%s' file."
+msgstr ""
+
+#: ../includes/packages.inc:347
 #, php-format
 msgid ""
 "Security alert: broken index file in repository '%s'. Please inform "
 "repository administrator about this issue."
 msgstr ""
 
-#: ../includes/packages.inc:358
+#: ../includes/packages.inc:383
 #, php-format
 msgid ""
 "Security alert: broken package '%s' in repository. Please inform repository "
 "administrator about this issue."
 msgstr ""
 
-#: ../includes/packages.inc:613
-#: ../includes/packages.inc:664
+#: ../includes/packages.inc:638
+#: ../includes/packages.inc:699
 #, php-format
 msgid "Package '%s' not found."
 msgstr ""
 
-#: ../includes/sav.session.inc:39
-#: ../includes/session.inc:39
+#: ../includes/session.inc:136
 msgid "Incorrect Password"
 msgstr ""
 
-#: ../includes/sav.session.inc:40
-#: ../includes/session.inc:40
+#: ../includes/session.inc:137
 msgid "The user and password combination is not valid for the system."
 msgstr ""
 
-#: ../includes/sav.session.inc:42
-#: ../includes/session.inc:42
+#: ../includes/session.inc:139
+#: ../includes/session.inc:154
 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/sav.session.inc:43
-#: ../includes/session.inc:43
+#: ../includes/session.inc:140
+#: ../includes/session.inc:155
 msgid "Try again"
 msgstr ""
 
-#: ../includes/sav.session.inc:58
-#: ../includes/session.inc:62
-msgid "Security settings have not been defined for your user account."
+#: ../includes/session.inc:151
+msgid "Incorrect Email"
 msgstr ""
 
-#: ../includes/sav.session.inc:59
-#: ../includes/session.inc:63
-msgid "Please contact your system administrator."
+#: ../includes/session.inc:152
+msgid "The email address does not exist in the system."
 msgstr ""
 
-#: ../includes/sav.session.inc:60
-#: ../includes/session.inc:64
-msgid ""
-"Please remove $security_groups and $security_headings arrays from config.php "
-"file!"
+#: ../includes/session.inc:166
+msgid "New password sent"
 msgstr ""
 
-#: ../includes/sav.session.inc:72
-#: ../includes/session.inc:80
-msgid ""
-"The security settings on your account do not permit you to access this "
-"function"
+#: ../includes/session.inc:167
+msgid "A new password has been sent to your mailbox."
 msgstr ""
 
-#: ../includes/session.inc:66
-msgid ""
-"Access to application has been blocked until database upgrade is completed "
-"by system administrator."
+#: ../includes/session.inc:169
+msgid "Login here"
 msgstr ""
 
-#: ../includes/session.inc:89
+#: ../includes/session.inc:209
+#, php-format
 msgid ""
-"System is blocked after source upgrade until database is updated on System/"
-"Software Upgrade page"
+"Brute force attack on account '%s' detected. Access for non-logged users "
+"temporarily blocked."
+msgstr ""
+
+#: ../includes/session.inc:240
+msgid "Security settings have not been defined for your user account."
+msgstr ""
+
+#: ../includes/session.inc:241
+msgid "Please contact your system administrator."
+msgstr ""
+
+#: ../includes/session.inc:242
+msgid ""
+"Please remove $security_groups and $security_headings arrays from config.php "
+"file!"
+msgstr ""
+
+#: ../includes/session.inc:244
+msgid ""
+"Access to application has been blocked until database upgrade is completed "
+"by system administrator."
+msgstr ""
+
+#: ../includes/session.inc:258
+msgid ""
+"The security settings on your account do not permit you to access this "
+"function"
+msgstr ""
+
+#: ../includes/session.inc:267
+msgid ""
+"System is blocked after source upgrade until database is updated on System/"
+"Software Upgrade page"
 msgstr ""
 
 #: ../includes/sysnames.inc:23
-#: ../includes/sysnames.inc:148
+#: ../includes/sysnames.inc:149
 msgid "Bank Payment"
 msgstr ""
 
 #: ../includes/sysnames.inc:24
-#: ../includes/sysnames.inc:147
+#: ../includes/sysnames.inc:148
 msgid "Bank Deposit"
 msgstr ""
 
@@ -6393,7 +6848,7 @@ msgid "Inventory Adjustment"
 msgstr ""
 
 #: ../includes/sysnames.inc:32
-#: ../purchasing/includes/ui/po_ui.inc:323
+#: ../purchasing/includes/ui/po_ui.inc:332
 #: ../purchasing/view/view_po.php:30
 msgid "Purchase Order"
 msgstr ""
@@ -6403,7 +6858,8 @@ msgid "Supplier Invoice"
 msgstr ""
 
 #: ../includes/sysnames.inc:34
-#: ../purchasing/supplier_credit.php:28
+#: ../purchasing/supplier_credit.php:58
+#: ../purchasing/supplier_credit.php:62
 msgid "Supplier Credit Note"
 msgstr ""
 
@@ -6430,13 +6886,13 @@ msgid "Work Order Production"
 msgstr ""
 
 #: ../includes/sysnames.inc:40
-#: ../sales/inquiry/sales_orders_view.php:134
-#: ../sales/inquiry/sales_orders_view.php:156
+#: ../sales/inquiry/sales_orders_view.php:151
+#: ../sales/inquiry/sales_orders_view.php:173
 msgid "Sales Order"
 msgstr ""
 
 #: ../includes/sysnames.inc:41
-#: ../sales/sales_order_entry.php:591
+#: ../sales/sales_order_entry.php:658
 msgid "Sales Quotation"
 msgstr ""
 
@@ -6473,7 +6929,7 @@ msgid "CP"
 msgstr ""
 
 #: ../includes/sysnames.inc:54
-#: ../sales/customer_invoice.php:450
+#: ../sales/customer_invoice.php:556
 msgid "DN"
 msgstr ""
 
@@ -6502,7 +6958,8 @@ msgid "SP"
 msgstr ""
 
 #: ../includes/sysnames.inc:61
-#: ../reporting/rep204.php:82
+#: ../reporting/rep204.php:84
+#: ../reporting/rep305.php:101
 msgid "GRN"
 msgstr ""
 
@@ -6543,7 +7000,7 @@ msgid "Chequing Account"
 msgstr ""
 
 #: ../includes/sysnames.inc:78
-#: ../manufacturing/work_order_costs.php:153
+#: ../manufacturing/work_order_costs.php:145
 msgid "Credit Account"
 msgstr ""
 
@@ -6560,72 +7017,74 @@ msgid "Cheque"
 msgstr ""
 
 #: ../includes/sysnames.inc:86
-#: ../includes/sysnames.inc:180
+#: ../includes/sysnames.inc:181
 msgid "Cash"
 msgstr ""
 
 #: ../includes/sysnames.inc:96
-#: ../reporting/rep101.php:137
-#: ../reporting/rep102.php:115
-#: ../reporting/rep102.php:122
-#: ../reporting/rep105.php:107
-#: ../reporting/rep106.php:81
+#: ../includes/sysnames.inc:195
+#: ../reporting/rep101.php:127
+#: ../reporting/rep102.php:125
+#: ../reporting/rep102.php:132
+#: ../reporting/rep105.php:109
+#: ../reporting/rep106.php:83
+#: ../reporting/rep114.php:95
 #: ../reporting/rep304.php:114
 #: ../reporting/rep304.php:124
 #: ../reporting/reports_main.php:32
 #: ../reporting/reports_main.php:36
-#: ../reporting/reports_main.php:43
-#: ../reporting/reports_main.php:94
-#: ../reporting/reports_main.php:193
-#: ../sales/create_recurrent_invoices.php:98
+#: ../reporting/reports_main.php:45
+#: ../reporting/reports_main.php:102
+#: ../reporting/reports_main.php:121
+#: ../reporting/reports_main.php:237
+#: ../sales/create_recurrent_invoices.php:134
 #: ../sales/customer_credit_invoice.php:235
-#: ../sales/customer_delivery.php:324
-#: ../sales/customer_invoice.php:372
+#: ../sales/customer_delivery.php:362
+#: ../sales/customer_invoice.php:455
 #: ../sales/allocations/customer_allocation_main.php:97
 #: ../sales/allocations/customer_allocation_main.php:105
-#: ../sales/manage/recurrent_invoices.php:85
+#: ../sales/manage/recurrent_invoices.php:102
 #: ../sales/view/view_credit.php:47
-#: ../sales/inquiry/customer_allocation_inquiry.php:147
-#: ../sales/inquiry/customer_allocation_inquiry.php:157
-#: ../sales/inquiry/customer_inquiry.php:218
-#: ../sales/inquiry/customer_inquiry.php:232
-#: ../sales/inquiry/sales_deliveries_view.php:180
-#: ../sales/inquiry/sales_orders_view.php:255
-#: ../sales/inquiry/sales_orders_view.php:269
-#: ../themes/exclusive/renderer.php:236
-#: ../themes/exclusive/renderer.php:254
-#: ../themes/exclusive/renderer.php:289
+#: ../sales/inquiry/customer_allocation_inquiry.php:150
+#: ../sales/inquiry/customer_allocation_inquiry.php:160
+#: ../sales/inquiry/customer_inquiry.php:206
+#: ../sales/inquiry/customer_inquiry.php:220
+#: ../sales/inquiry/sales_deliveries_view.php:182
+#: ../sales/inquiry/sales_orders_view.php:287
+#: ../sales/inquiry/sales_orders_view.php:301
 msgid "Customer"
 msgstr ""
 
 #: ../includes/sysnames.inc:97
-#: ../includes/sysnames.inc:172
-#: ../inventory/purchasing_data.php:127
+#: ../includes/sysnames.inc:173
+#: ../includes/sysnames.inc:196
+#: ../inventory/purchasing_data.php:148
 #: ../purchasing/includes/ui/grn_ui.inc:20
-#: ../purchasing/includes/ui/po_ui.inc:316
+#: ../purchasing/includes/ui/grn_ui.inc:52
+#: ../purchasing/includes/ui/po_ui.inc:325
 #: ../purchasing/view/view_supp_credit.php:42
-#: ../purchasing/view/view_supp_invoice.php:45
-#: ../purchasing/inquiry/po_search_completed.php:118
-#: ../purchasing/inquiry/po_search.php:132
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:128
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:141
-#: ../purchasing/inquiry/supplier_inquiry.php:165
-#: ../purchasing/inquiry/supplier_inquiry.php:179
+#: ../purchasing/view/view_supp_invoice.php:46
+#: ../purchasing/inquiry/po_search_completed.php:125
+#: ../purchasing/inquiry/po_search.php:134
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:129
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:142
+#: ../purchasing/inquiry/supplier_inquiry.php:176
+#: ../purchasing/inquiry/supplier_inquiry.php:191
 #: ../purchasing/allocations/supplier_allocation_main.php:98
 #: ../purchasing/allocations/supplier_allocation_main.php:106
-#: ../reporting/rep201.php:125
-#: ../reporting/rep202.php:118
-#: ../reporting/rep202.php:125
-#: ../reporting/rep203.php:98
-#: ../reporting/rep204.php:88
-#: ../reporting/reports_main.php:124
-#: ../reporting/reports_main.php:128
-#: ../reporting/reports_main.php:135
-#: ../reporting/reports_main.php:144
-#: ../reporting/reports_main.php:150
-#: ../themes/exclusive/renderer.php:333
-#: ../themes/exclusive/renderer.php:351
-#: ../themes/exclusive/renderer.php:383
+#: ../reporting/rep201.php:119
+#: ../reporting/rep202.php:130
+#: ../reporting/rep202.php:137
+#: ../reporting/rep203.php:100
+#: ../reporting/rep204.php:90
+#: ../reporting/rep306.php:141
+#: ../reporting/rep306.php:151
+#: ../reporting/reports_main.php:149
+#: ../reporting/reports_main.php:153
+#: ../reporting/reports_main.php:162
+#: ../reporting/reports_main.php:173
+#: ../reporting/reports_main.php:180
+#: ../reporting/reports_main.php:252
 msgid "Supplier"
 msgstr ""
 
@@ -6649,123 +7108,183 @@ msgstr ""
 msgid "Overhead Cost"
 msgstr ""
 
-#: ../includes/sysnames.inc:119
+#: ../includes/sysnames.inc:113
+msgid "Materials"
+msgstr ""
+
+#: ../includes/sysnames.inc:120
 msgid "Assets"
 msgstr ""
 
-#: ../includes/sysnames.inc:121
+#: ../includes/sysnames.inc:122
 msgid "Equity"
 msgstr ""
 
-#: ../includes/sysnames.inc:122
+#: ../includes/sysnames.inc:123
 msgid "Income"
 msgstr ""
 
-#: ../includes/sysnames.inc:123
+#: ../includes/sysnames.inc:124
 msgid "Cost of Goods Sold"
 msgstr ""
 
-#: ../includes/sysnames.inc:124
+#: ../includes/sysnames.inc:125
 msgid "Expense"
 msgstr ""
 
-#: ../includes/sysnames.inc:131
-#: ../themes/exclusive/renderer.php:290
-#: ../themes/exclusive/renderer.php:384
+#: ../includes/sysnames.inc:132
 msgid "Remainder"
 msgstr ""
 
-#: ../includes/sysnames.inc:133
+#: ../includes/sysnames.inc:134
 msgid "Amount, increase base"
 msgstr ""
 
-#: ../includes/sysnames.inc:134
+#: ../includes/sysnames.inc:135
 msgid "Amount, reduce base"
 msgstr ""
 
-#: ../includes/sysnames.inc:135
+#: ../includes/sysnames.inc:136
 msgid "% amount of base"
 msgstr ""
 
-#: ../includes/sysnames.inc:136
+#: ../includes/sysnames.inc:137
 msgid "% amount of base, increase base"
 msgstr ""
 
-#: ../includes/sysnames.inc:137
+#: ../includes/sysnames.inc:138
 msgid "% amount of base, reduce base"
 msgstr ""
 
-#: ../includes/sysnames.inc:138
+#: ../includes/sysnames.inc:139
 msgid "Taxes added"
 msgstr ""
 
-#: ../includes/sysnames.inc:139
+#: ../includes/sysnames.inc:140
 msgid "Taxes added, increase base"
 msgstr ""
 
-#: ../includes/sysnames.inc:140
+#: ../includes/sysnames.inc:141
 msgid "Taxes added, reduce base"
 msgstr ""
 
-#: ../includes/sysnames.inc:141
+#: ../includes/sysnames.inc:142
 msgid "Taxes included"
 msgstr ""
 
-#: ../includes/sysnames.inc:142
+#: ../includes/sysnames.inc:143
 msgid "Taxes included, increase base"
 msgstr ""
 
-#: ../includes/sysnames.inc:143
+#: ../includes/sysnames.inc:144
 msgid "Taxes included, reduce base"
 msgstr ""
 
-#: ../includes/sysnames.inc:150
+#: ../includes/sysnames.inc:151
 msgid "Supplier Invoice/Credit"
 msgstr ""
 
-#: ../includes/sysnames.inc:156
+#: ../includes/sysnames.inc:157
 #: ../manufacturing/search_work_orders.php:165
 #: ../manufacturing/includes/manufacturing_ui.inc:278
+#: ../reporting/rep402.php:103
 msgid "Manufactured"
 msgstr ""
 
-#: ../includes/sysnames.inc:157
+#: ../includes/sysnames.inc:158
 msgid "Purchased"
 msgstr ""
 
-#: ../includes/sysnames.inc:158
+#: ../includes/sysnames.inc:159
 msgid "Service"
 msgstr ""
 
-#: ../includes/sysnames.inc:171
+#: ../includes/sysnames.inc:172
 msgid "Customer branch"
 msgstr ""
 
-#: ../includes/sysnames.inc:173
+#: ../includes/sysnames.inc:174
 msgid "Shipper"
 msgstr ""
 
-#: ../includes/sysnames.inc:174
+#: ../includes/sysnames.inc:175
 msgid "Company internal"
 msgstr ""
 
-#: ../includes/sysnames.inc:179
+#: ../includes/sysnames.inc:180
 msgid "Prepayment"
 msgstr ""
 
-#: ../includes/sysnames.inc:181
+#: ../includes/sysnames.inc:182
 msgid "After No. of Days"
 msgstr ""
 
-#: ../includes/sysnames.inc:182
+#: ../includes/sysnames.inc:183
 msgid "Day In Following Month"
 msgstr ""
 
+#: ../includes/sysnames.inc:187
+msgid "Sum per line taxes"
+msgstr ""
+
+#: ../includes/sysnames.inc:188
+msgid "Taxes from totals"
+msgstr ""
+
+#: ../includes/sysnames.inc:200
+msgid "Jan"
+msgstr ""
+
+#: ../includes/sysnames.inc:200
+msgid "Feb"
+msgstr ""
+
+#: ../includes/sysnames.inc:200
+msgid "Mar"
+msgstr ""
+
+#: ../includes/sysnames.inc:200
+msgid "Apr"
+msgstr ""
+
+#: ../includes/sysnames.inc:200
+#: ../includes/ui/ui_view.inc:901
+msgid "May"
+msgstr ""
+
+#: ../includes/sysnames.inc:200
+msgid "Jun"
+msgstr ""
+
+#: ../includes/sysnames.inc:200
+msgid "Jul"
+msgstr ""
+
+#: ../includes/sysnames.inc:200
+msgid "Aug"
+msgstr ""
+
+#: ../includes/sysnames.inc:200
+msgid "Sep"
+msgstr ""
+
+#: ../includes/sysnames.inc:200
+msgid "Oct"
+msgstr ""
+
+#: ../includes/sysnames.inc:200
+msgid "Nov"
+msgstr ""
+
+#: ../includes/sysnames.inc:200
+msgid "Dec"
+msgstr ""
+
 #: ../includes/system_tests.inc:15
 #: ../includes/ui/ui_view.inc:210
-#: ../reporting/rep705.php:250
-#: ../reporting/rep705.php:261
-#: ../reporting/rep705.php:270
+#: ../reporting/rep705.php:254
+#: ../reporting/rep705.php:265
+#: ../reporting/rep705.php:274
 msgid "Info"
 msgstr ""
 
@@ -6892,6 +7411,7 @@ msgstr ""
 #: ../includes/system_tests.inc:340
 #: ../includes/system_tests.inc:349
 #: ../includes/system_tests.inc:358
+#: ../includes/system_tests.inc:366
 #, php-format
 msgid "'%s' is not writeable"
 msgstr ""
@@ -6957,182 +7477,194 @@ msgstr ""
 msgid "Extensions system"
 msgstr ""
 
-#: ../includes/system_tests.inc:363
+#: ../includes/system_tests.inc:371
 msgid "Extensions configuration files and directories should be writeable"
 msgstr ""
 
-#: ../includes/system_tests.inc:375
+#: ../includes/system_tests.inc:384
 #, php-format
 msgid "Non-standard theme directory '%s' is not writable"
 msgstr ""
 
-#: ../includes/system_tests.inc:385
+#: ../includes/system_tests.inc:394
 msgid ""
 "OpenSSL PHP extension have to be enabled to use extension repository system."
 msgstr ""
 
-#: ../includes/system_tests.inc:388
+#: ../includes/system_tests.inc:397
 msgid ""
 "OpenSSL have to be available on your server to use extension repository "
 "system."
 msgstr ""
 
-#: ../includes/system_tests.inc:411
+#: ../includes/system_tests.inc:420
 msgid "Test"
 msgstr ""
 
-#: ../includes/system_tests.inc:411
+#: ../includes/system_tests.inc:420
 msgid "Test type"
 msgstr ""
 
-#: ../includes/system_tests.inc:411
-#: ../includes/ui/view_package.php:37
-#: ../reporting/rep204.php:83
-#: ../reporting/rep301.php:99
+#: ../includes/system_tests.inc:420
+#: ../includes/ui/view_package.php:47
+#: ../reporting/rep204.php:85
+#: ../reporting/rep301.php:169
+#: ../reporting/rep308.php:231
 msgid "Value"
 msgstr ""
 
-#: ../includes/system_tests.inc:411
-#: ../reporting/reports_main.php:39
-#: ../reporting/reports_main.php:48
-#: ../reporting/reports_main.php:56
-#: ../reporting/reports_main.php:64
-#: ../reporting/reports_main.php:72
-#: ../reporting/reports_main.php:78
-#: ../reporting/reports_main.php:86
+#: ../includes/system_tests.inc:420
+#: ../reporting/reports_main.php:40
+#: ../reporting/reports_main.php:51
+#: ../reporting/reports_main.php:60
+#: ../reporting/reports_main.php:67
+#: ../reporting/reports_main.php:76
+#: ../reporting/reports_main.php:85
 #: ../reporting/reports_main.php:92
-#: ../reporting/reports_main.php:98
-#: ../reporting/reports_main.php:105
+#: ../reporting/reports_main.php:101
 #: ../reporting/reports_main.php:111
-#: ../reporting/reports_main.php:117
-#: ../reporting/reports_main.php:122
-#: ../reporting/reports_main.php:131
+#: ../reporting/reports_main.php:118
+#: ../reporting/reports_main.php:125
+#: ../reporting/reports_main.php:133
 #: ../reporting/reports_main.php:140
-#: ../reporting/reports_main.php:147
-#: ../reporting/reports_main.php:151
-#: ../reporting/reports_main.php:158
-#: ../reporting/reports_main.php:164
-#: ../reporting/reports_main.php:172
-#: ../reporting/reports_main.php:177
-#: ../reporting/reports_main.php:186
-#: ../reporting/reports_main.php:194
-#: ../reporting/reports_main.php:199
-#: ../reporting/reports_main.php:206
+#: ../reporting/reports_main.php:146
+#: ../reporting/reports_main.php:157
+#: ../reporting/reports_main.php:168
+#: ../reporting/reports_main.php:176
+#: ../reporting/reports_main.php:181
+#: ../reporting/reports_main.php:188
+#: ../reporting/reports_main.php:196
+#: ../reporting/reports_main.php:203
 #: ../reporting/reports_main.php:212
-#: ../reporting/reports_main.php:220
-#: ../reporting/reports_main.php:231
-#: ../reporting/reports_main.php:237
-#: ../reporting/reports_main.php:243
-#: ../reporting/reports_main.php:257
-#: ../reporting/reports_main.php:264
-#: ../reporting/reports_main.php:274
+#: ../reporting/reports_main.php:218
+#: ../reporting/reports_main.php:229
+#: ../reporting/reports_main.php:238
+#: ../reporting/reports_main.php:244
+#: ../reporting/reports_main.php:254
+#: ../reporting/reports_main.php:262
+#: ../reporting/reports_main.php:270
+#: ../reporting/reports_main.php:277
 #: ../reporting/reports_main.php:285
-#: ../reporting/reports_main.php:294
-#: ../reporting/reports_main.php:305
-#: ../reporting/reports_main.php:311
-#: ../reporting/reports_main.php:320
-#: ../reporting/reports_main.php:330
-#: ../reporting/reports_main.php:338
-#: ../reporting/reports_main.php:348
-#: ../reporting/reports_main.php:353
-#: ../reporting/reports_main.php:361
-#: ../reporting/reports_main.php:370
-#: ../reporting/reports_main.php:377
-#: ../reporting/reports_main.php:384
-#: ../reporting/reports_main.php:391
+#: ../reporting/reports_main.php:292
+#: ../reporting/reports_main.php:299
+#: ../reporting/reports_main.php:308
+#: ../reporting/reports_main.php:321
+#: ../reporting/reports_main.php:328
+#: ../reporting/reports_main.php:334
+#: ../reporting/reports_main.php:341
+#: ../reporting/reports_main.php:356
+#: ../reporting/reports_main.php:364
+#: ../reporting/reports_main.php:375
+#: ../reporting/reports_main.php:387
+#: ../reporting/reports_main.php:397
+#: ../reporting/reports_main.php:409
+#: ../reporting/reports_main.php:416
+#: ../reporting/reports_main.php:426
+#: ../reporting/reports_main.php:437
+#: ../reporting/reports_main.php:446
+#: ../reporting/reports_main.php:457
+#: ../reporting/reports_main.php:463
+#: ../reporting/reports_main.php:472
+#: ../reporting/reports_main.php:482
+#: ../reporting/reports_main.php:490
+#: ../reporting/reports_main.php:498
+#: ../reporting/reports_main.php:506
 #: ../reporting/includes/excel_report.inc:295
 #: ../reporting/includes/excel_report.inc:428
 #: ../reporting/includes/pdf_report.inc:346
-#: ../reporting/includes/pdf_report.inc:617
-#: ../sales/view/view_sales_order.php:84
+#: ../reporting/includes/pdf_report.inc:618
+#: ../sales/view/view_sales_order.php:98
 msgid "Comments"
 msgstr ""
 
-#: ../includes/system_tests.inc:435
+#: ../includes/system_tests.inc:444
 msgid "Ok"
 msgstr ""
 
-#: ../includes/db/audit_trail_db.inc:93
+#: ../includes/db/audit_trail_db.inc:99
 msgid ""
 "Some transactions journal GL postings were not indexed due to lack of audit "
 "trail record."
 msgstr ""
 
-#: ../includes/db/inventory_db.inc:280
-#: ../includes/db/inventory_db.inc.old:285
-msgid "Cost was "
-msgstr ""
-
-#: ../includes/db/inventory_db.inc:280
-#: ../includes/db/inventory_db.inc.old:285
-msgid " changed to "
+#: ../includes/db/inventory_db.inc:284
+#: ../inventory/includes/db/items_trans_db.inc:66
+#, php-format
+msgid "Cost was %s changed to %s x quantity on hand for item '%s'"
 msgstr ""
 
-#: ../includes/db/inventory_db.inc:280
-#: ../includes/db/inventory_db.inc.old:285
-msgid " for item "
+#: ../includes/db/inventory_db.inc:325
+msgid "Zero/negative inventory handling"
 msgstr ""
 
-#: ../includes/db/inventory_db.inc.old:227
+#: ../includes/ui/allocation_cart.inc:288
 #, php-format
-msgid "Cost was %s changed to %s for item '%s'"
+msgid "Allocated amounts in %s:"
 msgstr ""
 
-#: ../includes/ui/allocation_cart.inc:263
+#: ../includes/ui/allocation_cart.inc:290
 #: ../purchasing/allocations/supplier_allocation_main.php:94
 #: ../sales/allocations/customer_allocation_main.php:93
 msgid "Transaction Type"
 msgstr ""
 
-#: ../includes/ui/allocation_cart.inc:263
-#: ../reporting/rep704.php:78
-#: ../reporting/rep704.php:81
-#: ../reporting/rep704.php:84
-#: ../reporting/rep709.php:107
+#: ../includes/ui/allocation_cart.inc:290
+msgid "Supplier Ref"
+msgstr ""
+
+#: ../includes/ui/allocation_cart.inc:290
+#: ../reporting/rep704.php:83
+#: ../reporting/rep704.php:86
+#: ../reporting/rep704.php:89
+#: ../reporting/rep709.php:116
 #: ../sales/view/view_credit.php:68
-#: ../sales/view/view_sales_order.php:95
-#: ../sales/view/view_sales_order.php:128
-#: ../sales/view/view_sales_order.php:160
-#: ../sales/inquiry/sales_orders_view.php:218
-#: ../sales/inquiry/sales_orders_view.php:254
-#: ../sales/inquiry/sales_orders_view.php:268
+#: ../sales/view/view_sales_order.php:109
+#: ../sales/view/view_sales_order.php:142
+#: ../sales/view/view_sales_order.php:179
+#: ../sales/inquiry/sales_orders_view.php:248
+#: ../sales/inquiry/sales_orders_view.php:286
+#: ../sales/inquiry/sales_orders_view.php:300
 msgid "Ref"
 msgstr ""
 
-#: ../includes/ui/allocation_cart.inc:264
+#: ../includes/ui/allocation_cart.inc:291
 msgid "Other Allocations"
 msgstr ""
 
-#: ../includes/ui/allocation_cart.inc:264
-#: ../includes/ui/ui_view.inc:481
-#: ../reporting/includes/doctext.inc:108
-msgid "This Allocation"
-msgstr ""
-
-#: ../includes/ui/allocation_cart.inc:264
-#: ../includes/ui/allocation_cart.inc:311
-#: ../includes/ui/ui_view.inc:481
+#: ../includes/ui/allocation_cart.inc:291
+#: ../includes/ui/allocation_cart.inc:344
+#: ../includes/ui/ui_view.inc:548
 #: ../purchasing/allocations/supplier_allocation_main.php:101
-#: ../reporting/includes/doctext.inc:108
-#: ../reporting/includes/doctext.inc:166
+#: ../reporting/rep112.php:145
+#: ../reporting/rep210.php:152
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:208
 #: ../sales/allocations/customer_allocation_main.php:100
 msgid "Left to Allocate"
 msgstr ""
 
-#: ../includes/ui/allocation_cart.inc:294
-#: ../reporting/includes/doctext.inc:165
+#: ../includes/ui/allocation_cart.inc:291
+#: ../includes/ui/ui_view.inc:548
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:208
+msgid "This Allocation"
+msgstr ""
+
+#: ../includes/ui/allocation_cart.inc:324
+#: ../reporting/rep112.php:142
+#: ../reporting/rep210.php:149
 msgid "Total Allocated"
 msgstr ""
 
-#: ../includes/ui/allocation_cart.inc:331
+#: ../includes/ui/allocation_cart.inc:366
 msgid "The entry for one or more amounts is invalid or negative."
 msgstr ""
 
-#: ../includes/ui/allocation_cart.inc:340
+#: ../includes/ui/allocation_cart.inc:377
 msgid "At least one transaction is overallocated."
 msgstr ""
 
-#: ../includes/ui/allocation_cart.inc:358
+#: ../includes/ui/allocation_cart.inc:396
 msgid ""
 "These allocations cannot be processed because the amount allocated is more "
 "than the total amount left to allocate."
@@ -7147,8 +7679,9 @@ msgid "Sec Phone"
 msgstr ""
 
 #: ../includes/ui/contacts_view.inc:41
-#: ../reporting/rep103.php:223
-#: ../reporting/includes/header2.inc:92
+#: ../reporting/rep103.php:266
+#: ../reporting/rep205.php:184
+#: ../reporting/includes/header2.inc:107
 #: ../sales/manage/sales_people.php:99
 msgid "Fax"
 msgstr ""
@@ -7174,25 +7707,27 @@ msgid "Contact active for:"
 msgstr ""
 
 #: ../includes/ui/contacts_view.inc:102
+#: ../sales/manage/customers.php:256
 msgid "Phone:"
 msgstr ""
 
 #: ../includes/ui/contacts_view.inc:105
 #: ../inventory/manage/locations.php:207
-#: ../purchasing/manage/suppliers.php:108
-#: ../sales/manage/customer_branches.php:263
+#: ../purchasing/manage/suppliers.php:141
+#: ../sales/manage/customer_branches.php:265
+#: ../sales/manage/customers.php:259
 #: ../sales/manage/sales_people.php:158
 msgid "E-mail:"
 msgstr ""
 
 #: ../includes/ui/contacts_view.inc:110
-#: ../purchasing/manage/suppliers.php:109
-#: ../sales/manage/customer_branches.php:264
+#: ../purchasing/manage/suppliers.php:142
+#: ../sales/manage/customer_branches.php:266
 msgid "Document Language:"
 msgstr ""
 
 #: ../includes/ui/contacts_view.inc:110
-#: ../sales/manage/customer_branches.php:264
+#: ../sales/manage/customer_branches.php:266
 msgid "Customer default"
 msgstr ""
 
@@ -7200,20 +7735,20 @@ msgstr ""
 msgid "Notes:"
 msgstr ""
 
-#: ../includes/ui/contacts_view.inc:132
+#: ../includes/ui/contacts_view.inc:131
 msgid "The contact name cannot be empty."
 msgstr ""
 
-#: ../includes/ui/contacts_view.inc:137
+#: ../includes/ui/contacts_view.inc:136
 msgid "Contact reference cannot be empty."
 msgstr ""
 
-#: ../includes/ui/contacts_view.inc:142
+#: ../includes/ui/contacts_view.inc:141
 msgid "You have to select at least one category."
 msgstr ""
 
 #: ../includes/ui/db_pager_view.inc:166
-#: ../includes/ui/ui_input.inc:892
+#: ../includes/ui/ui_input.inc:904
 msgid "Show also Inactive"
 msgstr ""
 
@@ -7243,95 +7778,108 @@ msgid "No records"
 msgstr ""
 
 #: ../includes/ui/simple_crud_class.inc:227
-#: ../includes/ui/ui_input.inc:203
+#: ../includes/ui/ui_input.inc:208
+#: ../taxes/sav.tax_types.php:255
 msgid "Submit changes"
 msgstr ""
 
 #: ../includes/ui/simple_crud_class.inc:229
-#: ../includes/ui/ui_input.inc:204
+#: ../includes/ui/ui_input.inc:209
 msgid "Clone"
 msgstr ""
 
 #: ../includes/ui/simple_crud_class.inc:229
-#: ../includes/ui/ui_input.inc:205
+#: ../includes/ui/ui_input.inc:210
 msgid "Edit new record with current data"
 msgstr ""
 
 #: ../includes/ui/simple_crud_class.inc:231
-#: ../includes/ui/ui_input.inc:206
+#: ../includes/ui/ui_input.inc:211
 msgid "Cancel edition"
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:123
+#: ../includes/ui/ui_controls.inc:79
+msgid "Request from outside of this page is forbidden."
+msgstr ""
+
+#: ../includes/ui/ui_controls.inc:80
+msgid "CSRF attack detected from: "
+msgstr ""
+
+#: ../includes/ui/ui_controls.inc:146
 msgid "You should automatically be forwarded."
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:124
+#: ../includes/ui/ui_controls.inc:147
 msgid "If this does not happen"
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:124
+#: ../includes/ui/ui_controls.inc:147
 msgid "click here"
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:124
+#: ../includes/ui/ui_controls.inc:147
 msgid "to continue"
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:171
-msgid "View Attachment"
-msgstr ""
-
-#: ../includes/ui/ui_controls.inc:174
+#: ../includes/ui/ui_controls.inc:197
 msgid "Close"
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:425
-#: ../sales/manage/customers.php:16
+#: ../includes/ui/ui_controls.inc:459
+#: ../sales/manage/customers.php:23
 msgid "Customers"
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:427
+#: ../includes/ui/ui_controls.inc:461
 msgid "Branches"
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:429
-#: ../purchasing/manage/suppliers.php:16
+#: ../includes/ui/ui_controls.inc:463
+#: ../purchasing/manage/suppliers.php:22
 msgid "Suppliers"
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:431
-#: ../inventory/transfers.php:230
-#: ../inventory/manage/items.php:16
+#: ../includes/ui/ui_controls.inc:465
+#: ../inventory/transfers.php:224
+#: ../inventory/manage/items.php:22
+#: ../reporting/rep402.php:108
+#: ../reporting/reports_main.php:253
+#: ../reporting/reports_main.php:289
 msgid "Items"
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:575
+#: ../includes/ui/ui_controls.inc:610
 msgid "Entered data has not been saved yet.\\nDo you want to abandon changes?"
 msgstr ""
 
-#: ../includes/ui/ui_input.inc:621
-#: ../reporting/includes/reports_classes.inc:210
+#: ../includes/ui/ui_input.inc:632
+#: ../reporting/includes/reports_classes.inc:222
 msgid "Click Here to Pick up the date"
 msgstr ""
 
-#: ../includes/ui/ui_input.inc:904
-#: ../includes/ui/ui_lists.inc:2120
-#: ../reporting/rep301.php:147
-#: ../reporting/rep302.php:166
-#: ../reporting/rep303.php:170
-#: ../reporting/rep304.php:168
-#: ../reporting/rep304.php:172
-#: ../reporting/rep305.php:111
-#: ../sales/manage/customer_branches.php:302
+#: ../includes/ui/ui_input.inc:916
+#: ../includes/ui/ui_lists.inc:2162
+#: ../reporting/rep301.php:229
+#: ../reporting/rep302.php:170
+#: ../reporting/rep303.php:184
+#: ../reporting/rep304.php:170
+#: ../reporting/rep304.php:174
+#: ../reporting/rep306.php:235
+#: ../reporting/rep306.php:242
+#: ../sales/manage/customer_branches.php:304
 msgid "Inactive"
 msgstr ""
 
-#: ../includes/ui/ui_input.inc:914
 #: ../includes/ui/ui_input.inc:926
+#: ../includes/ui/ui_input.inc:938
 msgid "Current Credit:"
 msgstr ""
 
+#: ../includes/ui/ui_input.inc:972
+msgid "Bank Balance:"
+msgstr ""
+
 #: ../includes/ui/ui_lists.inc:17
 msgid "Set filter"
 msgstr ""
@@ -7348,339 +7896,363 @@ msgstr ""
 msgid "Enter description fragment to search or * for all"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:438
-#: ../includes/ui/ui_lists.inc:1356
+#: ../includes/ui/ui_lists.inc:454
+#: ../includes/ui/ui_lists.inc:1391
 msgid "All Suppliers"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:442
+#: ../includes/ui/ui_lists.inc:458
 msgid "Press Space tab to filter by name fragment"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:443
+#: ../includes/ui/ui_lists.inc:459
 msgid "Select supplier"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:487
+#: ../includes/ui/ui_lists.inc:507
 msgid "All Customers"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:491
+#: ../includes/ui/ui_lists.inc:511
 msgid "Press Space tab to filter by name fragment; F2 - entry new customer"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:492
+#: ../includes/ui/ui_lists.inc:512
 msgid "Select customer"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:535
+#: ../includes/ui/ui_lists.inc:559
 msgid "All branches"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:538
+#: ../includes/ui/ui_lists.inc:562
 msgid "Select customer branch"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:573
+#: ../includes/ui/ui_lists.inc:602
 msgid "All Locations"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:725
-#: ../includes/ui/ui_lists.inc:790
+#: ../includes/ui/ui_lists.inc:754
+#: ../includes/ui/ui_lists.inc:822
 msgid "All Items"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1263
+#: ../includes/ui/ui_lists.inc:1298
 msgid "All Sales Types"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1592
+#: ../includes/ui/ui_lists.inc:1635
 msgid "Use Item Sales Accounts"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1904
-#: ../includes/ui/ui_lists.inc:1921
-#: ../includes/ui/ui_lists.inc:1938
+#: ../includes/ui/ui_lists.inc:1946
+#: ../includes/ui/ui_lists.inc:1963
+#: ../includes/ui/ui_lists.inc:1980
 msgid "All Types"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1905
-#: ../sales/view/view_sales_order.php:126
+#: ../includes/ui/ui_lists.inc:1947
+#: ../sales/view/view_sales_order.php:140
 msgid "Sales Invoices"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1906
-#: ../includes/ui/ui_lists.inc:1923
-#: ../includes/ui/ui_lists.inc:1941
+#: ../includes/ui/ui_lists.inc:1948
+#: ../includes/ui/ui_lists.inc:1965
+#: ../includes/ui/ui_lists.inc:1983
 msgid "Overdue Invoices"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1907
-#: ../includes/ui/ui_lists.inc:1924
-#: ../includes/ui/ui_lists.inc:1942
+#: ../includes/ui/ui_lists.inc:1949
+#: ../includes/ui/ui_lists.inc:1966
+#: ../includes/ui/ui_lists.inc:1984
+#: ../includes/ui/ui_view.inc:610
+#: ../includes/ui/ui_view.inc:614
 msgid "Payments"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1908
-#: ../includes/ui/ui_lists.inc:1925
-#: ../includes/ui/ui_lists.inc:1943
-#: ../sales/view/view_sales_order.php:157
+#: ../includes/ui/ui_lists.inc:1950
+#: ../includes/ui/ui_lists.inc:1967
+#: ../includes/ui/ui_lists.inc:1985
+#: ../sales/view/view_sales_order.php:176
 msgid "Credit Notes"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1909
-#: ../sales/view/view_sales_order.php:92
+#: ../includes/ui/ui_lists.inc:1951
+#: ../sales/view/view_sales_order.php:106
 msgid "Delivery Notes"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1922
-#: ../includes/ui/ui_lists.inc:1940
+#: ../includes/ui/ui_lists.inc:1964
+#: ../includes/ui/ui_lists.inc:1982
 msgid "Invoices"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1926
-#: ../includes/ui/ui_lists.inc:1944
+#: ../includes/ui/ui_lists.inc:1968
+#: ../includes/ui/ui_lists.inc:1986
 msgid "Overdue Credit Notes"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1939
+#: ../includes/ui/ui_lists.inc:1981
 msgid "GRNs"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1957
+#: ../includes/ui/ui_lists.inc:1999
 msgid "Automatically put balance on back order"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1958
+#: ../includes/ui/ui_lists.inc:2000
 msgid "Cancel any quantites not delivered"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1975
+#: ../includes/ui/ui_lists.inc:2017
 msgid "Items Returned to Inventory Location"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1976
+#: ../includes/ui/ui_lists.inc:2018
 msgid "Items Written Off"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2146
+#: ../includes/ui/ui_lists.inc:2188
 msgid "New role"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2204
+#: ../includes/ui/ui_lists.inc:2240
 msgid "No tags defined."
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2204
+#: ../includes/ui/ui_lists.inc:2240
 msgid "No active tags defined."
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2242
+#: ../includes/ui/ui_lists.inc:2278
 #, php-format
 msgid "Activated for '%s'"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2245
+#: ../includes/ui/ui_lists.inc:2281
 msgid "Available and/or installed"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2315
+#: ../includes/ui/ui_lists.inc:2351
 msgid "Standard new company American COA (4 digit)"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2317
+#: ../includes/ui/ui_lists.inc:2353
 msgid "Standard American COA (4 digit) with demo data"
 msgstr ""
 
-#: ../includes/ui/ui_msgs.inc:66
+#: ../includes/ui/ui_lists.inc:2374
+msgid "No payment Link"
+msgstr ""
+
+#: ../includes/ui/ui_msgs.inc:63
 msgid "in units of : "
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:306
+#: ../includes/ui/ui_view.inc:301
+#, php-format
+msgid ""
+"Cannot retrieve exchange rate for currency %s. Please adjust approximate "
+"rate if needed."
+msgstr ""
+
+#: ../includes/ui/ui_view.inc:342
 msgid "Date Voided:"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:404
-#: ../reporting/rep107.php:188
-#: ../reporting/rep109.php:182
+#: ../includes/ui/ui_view.inc:443
+#: ../reporting/rep107.php:256
+#: ../reporting/rep109.php:186
 #: ../reporting/rep110.php:184
-#: ../reporting/rep209.php:188
+#: ../reporting/rep111.php:183
+#: ../reporting/rep113.php:169
+#: ../reporting/rep209.php:186
 msgid "Total Tax Excluded"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:410
-#: ../includes/ui/ui_view.inc:426
-#: ../includes/ui/ui_view.inc:444
-#: ../reporting/includes/doctext.inc:149
+#: ../includes/ui/ui_view.inc:449
+#: ../includes/ui/ui_view.inc:468
+#: ../includes/ui/ui_view.inc:492
+#: ../includes/ui/ui_view.inc:509
+#: ../reporting/rep107.php:265
+#: ../reporting/rep109.php:195
+#: ../reporting/rep110.php:193
+#: ../reporting/rep111.php:192
+#: ../reporting/rep113.php:178
+#: ../reporting/rep209.php:195
 msgid "Included"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:476
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:99
-msgid "Allocations"
-msgstr ""
-
-#: ../includes/ui/ui_view.inc:480
-#: ../reporting/includes/doctext.inc:108
+#: ../includes/ui/ui_view.inc:547
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:208
 msgid "Total Amount"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:504
+#: ../includes/ui/ui_view.inc:571
 msgid "Total Allocated:"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:508
+#: ../includes/ui/ui_view.inc:577
 msgid "Left to Allocate:"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:544
+#: ../includes/ui/ui_view.inc:593
+#: ../includes/ui/ui_view.inc:597
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:100
+msgid "Allocations"
+msgstr ""
+
+#: ../includes/ui/ui_view.inc:610
+#: ../includes/ui/ui_view.inc:614
+msgid "Pre-Payments"
+msgstr ""
+
+#: ../includes/ui/ui_view.inc:630
 msgid "No Quick Entries are defined."
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:572
+#: ../includes/ui/ui_view.inc:658
 msgid "No Quick Entry lines are defined."
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:754
-#: ../purchasing/includes/ui/invoice_ui.inc:451
+#: ../includes/ui/ui_view.inc:840
+#: ../purchasing/includes/ui/invoice_ui.inc:488
 msgid "and"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:901
 msgid "January"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:901
 msgid "February"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:901
 msgid "March"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:901
 msgid "April"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:840
-msgid "May"
-msgstr ""
-
-#: ../includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:901
 msgid "June"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:901
 msgid "July"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:901
 msgid "August"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:901
 msgid "September"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:901
 msgid "October"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:901
 msgid "November"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:901
 msgid "December"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc:902
 msgid "Su"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc:902
 msgid "Mo"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc:902
 msgid "Tu"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc:902
 msgid "We"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc:902
 msgid "Th"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc:902
 msgid "Fr"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc:902
 msgid "Sa"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc:903
 msgid "W"
 msgstr ""
 
-#: ../includes/ui/view_package.php:7
+#: ../includes/ui/view_package.php:17
 msgid "Package Details"
 msgstr ""
 
-#: ../includes/ui/view_package.php:14
+#: ../includes/ui/view_package.php:24
 msgid ""
 "The script must be called with a valid package id to review the info for."
 msgstr ""
 
-#: ../includes/ui/view_package.php:19
+#: ../includes/ui/view_package.php:29
 msgid "Available version"
 msgstr ""
 
-#: ../includes/ui/view_package.php:20
+#: ../includes/ui/view_package.php:30
 msgid "Package type"
 msgstr ""
 
-#: ../includes/ui/view_package.php:21
+#: ../includes/ui/view_package.php:31
 msgid "Package content"
 msgstr ""
 
-#: ../includes/ui/view_package.php:23
+#: ../includes/ui/view_package.php:33
 msgid "Author"
 msgstr ""
 
-#: ../includes/ui/view_package.php:24
+#: ../includes/ui/view_package.php:34
 msgid "Home page"
 msgstr ""
 
-#: ../includes/ui/view_package.php:25
+#: ../includes/ui/view_package.php:35
 msgid "Package maintainer"
 msgstr ""
 
-#: ../includes/ui/view_package.php:26
+#: ../includes/ui/view_package.php:36
 msgid "Installation path"
 msgstr ""
 
-#: ../includes/ui/view_package.php:27
+#: ../includes/ui/view_package.php:37
 msgid "Minimal software versions"
 msgstr ""
 
-#: ../includes/ui/view_package.php:28
+#: ../includes/ui/view_package.php:38
 msgid "Right to left"
 msgstr ""
 
-#: ../includes/ui/view_package.php:29
+#: ../includes/ui/view_package.php:39
 msgid "Charset encoding"
 msgstr ""
 
-#: ../includes/ui/view_package.php:34
+#: ../includes/ui/view_package.php:44
 #, php-format
 msgid "Content information for package '%s'"
 msgstr ""
 
-#: ../includes/ui/view_package.php:37
+#: ../includes/ui/view_package.php:47
 msgid "Property"
 msgstr ""
 
@@ -7718,70 +8290,69 @@ msgid "Enter &Another Adjustment"
 msgstr ""
 
 #: ../inventory/adjustments.php:88
-#: ../inventory/transfers.php:87
-#: ../sales/sales_order_entry.php:345
+#: ../inventory/transfers.php:84
+#: ../sales/sales_order_entry.php:376
 msgid "You must enter at least one non empty item line."
 msgstr ""
 
 #: ../inventory/adjustments.php:108
-#: ../inventory/transfers.php:105
 msgid "The entered date for the adjustment is invalid."
 msgstr ""
 
-#: ../inventory/adjustments.php:122
+#: ../inventory/adjustments.php:124
 msgid ""
-"The adjustment cannot be processed because an adjustment item would cause a "
-"negative inventory balance :"
+"The adjustment cannot be processed because it would cause negative inventory "
+"balance for marked items as of document date or later."
 msgstr ""
 
-#: ../inventory/adjustments.php:152
-#: ../manufacturing/work_order_issue.php:141
+#: ../inventory/adjustments.php:153
+#: ../manufacturing/work_order_issue.php.orig:141
 msgid "The quantity entered is negative or invalid."
 msgstr ""
 
-#: ../inventory/adjustments.php:159
-#: ../manufacturing/work_order_issue.php:148
+#: ../inventory/adjustments.php:160
+#: ../manufacturing/work_order_issue.php.orig:148
 msgid "The entered standard cost is negative or invalid."
 msgstr ""
 
-#: ../inventory/adjustments.php:228
+#: ../inventory/adjustments.php:229
 msgid "Adjustment Items"
 msgstr ""
 
-#: ../inventory/adjustments.php:234
+#: ../inventory/adjustments.php:235
 msgid "Process Adjustment"
 msgstr ""
 
-#: ../inventory/cost_update.php:26
+#: ../inventory/cost_update.php:29
 msgid "Inventory Item Cost Update"
 msgstr ""
 
-#: ../inventory/cost_update.php:30
+#: ../inventory/cost_update.php:33
 msgid ""
 "There are no costable inventory items defined in the system (Purchased or "
 "manufactured items)."
 msgstr ""
 
-#: ../inventory/cost_update.php:51
+#: ../inventory/cost_update.php:54
 msgid "The entered cost is not numeric."
 msgstr ""
 
-#: ../inventory/cost_update.php:57
+#: ../inventory/cost_update.php:60
 msgid "The new cost is the same as the old cost. Cost was not updated."
 msgstr ""
 
-#: ../inventory/cost_update.php:67
+#: ../inventory/cost_update.php:70
 msgid "Cost has been updated."
 msgstr ""
 
-#: ../inventory/cost_update.php:71
+#: ../inventory/cost_update.php:74
 msgid "View the GL Journal Entries for this Cost Update"
 msgstr ""
 
-#: ../inventory/cost_update.php:85
-#: ../inventory/prices.php:56
-#: ../inventory/purchasing_data.php:101
-#: ../inventory/reorder_level.php:43
+#: ../inventory/cost_update.php:94
+#: ../inventory/prices.php:62
+#: ../inventory/purchasing_data.php:118
+#: ../inventory/reorder_level.php:50
 #: ../inventory/inquiry/stock_movements.php:49
 #: ../inventory/inquiry/stock_status.php:41
 #: ../inventory/manage/item_codes.php:105
@@ -7789,241 +8360,261 @@ msgstr ""
 #: ../manufacturing/work_order_entry.php:399
 #: ../purchasing/inquiry/po_search.php:74
 #: ../sales/inquiry/sales_deliveries_view.php:114
-#: ../sales/inquiry/sales_orders_view.php:233
+#: ../sales/inquiry/sales_orders_view.php:263
 msgid "Item:"
 msgstr ""
 
-#: ../inventory/cost_update.php:111
+#: ../inventory/cost_update.php:115
 msgid "Standard Material Cost Per Unit"
 msgstr ""
 
-#: ../inventory/cost_update.php:114
+#: ../inventory/cost_update.php:123
 msgid "Standard Labour Cost Per Unit"
 msgstr ""
 
-#: ../inventory/cost_update.php:115
+#: ../inventory/cost_update.php:124
 msgid "Standard Overhead Cost Per Unit"
 msgstr ""
 
-#: ../inventory/prices.php:16
+#: ../inventory/prices.php:25
 msgid "Inventory Item Sales prices"
 msgstr ""
 
-#: ../inventory/prices.php:27
-#: ../inventory/inquiry/stock_movements.php:30
-#: ../inventory/inquiry/stock_status.php:34
+#: ../inventory/prices.php:29
+#: ../inventory/inquiry/stock_movements.php:29
+#: ../inventory/inquiry/stock_status.php:32
 #: ../inventory/manage/sales_kits.php:24
 #: ../manufacturing/inquiry/where_used_inquiry.php:21
 #: ../sales/credit_note_entry.php:49
 msgid "There are no items defined in the system."
 msgstr ""
 
-#: ../inventory/prices.php:29
+#: ../inventory/prices.php:31
 msgid ""
 "There are no sales types in the system. Please set up sales types befor "
 "entering pricing."
 msgstr ""
 
-#: ../inventory/prices.php:70
+#: ../inventory/prices.php:78
 msgid "The price entered must be numeric."
 msgstr ""
 
-#: ../inventory/prices.php:83
+#: ../inventory/prices.php:84
+msgid ""
+"The sales pricing for this item, sales type and currency has already been "
+"added."
+msgstr ""
+
+#: ../inventory/prices.php:97
 msgid "This price has been updated."
 msgstr ""
 
-#: ../inventory/prices.php:91
+#: ../inventory/prices.php:105
 msgid "The new price has been added."
 msgstr ""
 
-#: ../inventory/prices.php:105
+#: ../inventory/prices.php:119
 msgid "The selected price has been deleted."
 msgstr ""
 
-#: ../inventory/prices.php:133
-#: ../reporting/rep104.php:116
-#: ../sales/customer_delivery.php:341
-#: ../sales/customer_invoice.php:394
+#: ../inventory/prices.php:147
+#: ../reporting/rep104.php:118
+#: ../sales/customer_delivery.php:379
+#: ../sales/customer_invoice.php:477
 #: ../sales/view/view_credit.php:73
 #: ../sales/view/view_dispatch.php:93
-#: ../sales/view/view_invoice.php:92
+#: ../sales/view/view_invoice.php:93
 #: ../sales/includes/ui/sales_credit_ui.inc:102
 msgid "Sales Type"
 msgstr ""
 
-#: ../inventory/prices.php:133
-#: ../inventory/purchasing_data.php:127
-#: ../purchasing/includes/ui/invoice_ui.inc:483
+#: ../inventory/prices.php:147
+#: ../inventory/purchasing_data.php:148
+#: ../purchasing/includes/ui/invoice_ui.inc:520
 #: ../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:103
-#: ../reporting/includes/doctext.inc:111
+#: ../reporting/rep104.php:111
+#: ../reporting/includes/doctext.inc:30
+#: ../reporting/includes/doctext.inc:192
 #: ../sales/customer_credit_invoice.php:281
-#: ../sales/customer_delivery.php:419
-#: ../sales/customer_invoice.php:447
+#: ../sales/customer_delivery.php:457
+#: ../sales/customer_invoice.php:551
+#: ../sales/customer_invoice.php:554
 #: ../sales/view/view_credit.php:91
 #: ../sales/view/view_dispatch.php:113
-#: ../sales/view/view_invoice.php:114
-#: ../sales/view/view_sales_order.php:201
+#: ../sales/view/view_invoice.php:116
+#: ../sales/view/view_sales_order.php:220
 #: ../sales/includes/ui/sales_credit_ui.inc:168
 msgid "Price"
 msgstr ""
 
-#: ../inventory/prices.php:155
+#: ../inventory/prices.php:169
 msgid "There are no prices set up for this part."
 msgstr ""
 
-#: ../inventory/prices.php:174
+#: ../inventory/prices.php:192
 msgid "Currency:"
 msgstr ""
 
-#: ../inventory/prices.php:176
+#: ../inventory/prices.php:194
 msgid "Sales Type:"
 msgstr ""
 
-#: ../inventory/prices.php:184
-#: ../inventory/purchasing_data.php:189
+#: ../inventory/prices.php:202
+#: ../inventory/purchasing_data.php:215
 msgid "Price:"
 msgstr ""
 
-#: ../inventory/prices.php:184
+#: ../inventory/prices.php:202
 msgid "per"
 msgstr ""
 
-#: ../inventory/prices.php:188
+#: ../inventory/prices.php:206
 msgid "The price is calculated."
 msgstr ""
 
-#: ../inventory/purchasing_data.php:16
+#: ../inventory/purchasing_data.php:24
 msgid "Supplier Purchasing Data"
 msgstr ""
 
-#: ../inventory/purchasing_data.php:23
-#: ../purchasing/po_entry_items.php:64
+#: ../inventory/purchasing_data.php:26
+#: ../purchasing/po_entry_items.php:70
 msgid "There are no purchasable inventory items defined in the system."
 msgstr ""
 
-#: ../inventory/purchasing_data.php:24
-#: ../purchasing/po_entry_items.php:62
-#: ../purchasing/supplier_credit.php:32
-#: ../purchasing/supplier_invoice.php:32
+#: ../inventory/purchasing_data.php:27
+#: ../purchasing/po_entry_items.php:68
+#: ../purchasing/supplier_credit.php:31
+#: ../purchasing/supplier_invoice.php:30
 #: ../purchasing/supplier_payment.php:40
 msgid "There are no suppliers defined in the system."
 msgstr ""
 
-#: ../inventory/purchasing_data.php:38
+#: ../inventory/purchasing_data.php:45
 #: ../inventory/manage/item_codes.php:35
 msgid "There is no item selected."
 msgstr ""
 
-#: ../inventory/purchasing_data.php:44
+#: ../inventory/purchasing_data.php:51
 msgid "The price entered was not numeric."
 msgstr ""
 
-#: ../inventory/purchasing_data.php:50
+#: ../inventory/purchasing_data.php:57
 msgid ""
 "The conversion factor entered was not numeric. The conversion factor is the "
 "number by which the price must be divided by to get the unit price in our "
 "unit of measure."
 msgstr ""
 
-#: ../inventory/purchasing_data.php:60
+#: ../inventory/purchasing_data.php:63
+msgid "The purchasing data for this supplier has already been added."
+msgstr ""
+
+#: ../inventory/purchasing_data.php:72
 msgid "This supplier purchasing data has been added."
 msgstr ""
 
-#: ../inventory/purchasing_data.php:66
+#: ../inventory/purchasing_data.php:78
 msgid "Supplier purchasing data has been updated."
 msgstr ""
 
-#: ../inventory/purchasing_data.php:77
+#: ../inventory/purchasing_data.php:89
 msgid "The purchasing data item has been sucessfully deleted."
 msgstr ""
 
-#: ../inventory/purchasing_data.php:112
+#: ../inventory/purchasing_data.php:133
 msgid "Entered item is not defined. Please re-enter."
 msgstr ""
 
-#: ../inventory/purchasing_data.php:121
+#: ../inventory/purchasing_data.php:142
 msgid "There is no purchasing data set up for the part selected"
 msgstr ""
 
-#: ../inventory/purchasing_data.php:128
+#: ../inventory/purchasing_data.php:149
 msgid "Supplier's Unit"
 msgstr ""
 
-#: ../inventory/purchasing_data.php:128
+#: ../inventory/purchasing_data.php:149
 msgid "Conversion Factor"
 msgstr ""
 
-#: ../inventory/purchasing_data.php:128
+#: ../inventory/purchasing_data.php:149
 msgid "Supplier's Description"
 msgstr ""
 
-#: ../inventory/purchasing_data.php:190
+#: ../inventory/purchasing_data.php:216
 msgid "Suppliers Unit of Measure:"
 msgstr ""
 
-#: ../inventory/purchasing_data.php:196
+#: ../inventory/purchasing_data.php:222
 msgid "Conversion Factor (to our UOM):"
 msgstr ""
 
-#: ../inventory/purchasing_data.php:198
+#: ../inventory/purchasing_data.php:224
 msgid "Supplier's Code or Description:"
 msgstr ""
 
-#: ../inventory/reorder_level.php:16
+#: ../inventory/reorder_level.php:24
 msgid "Reorder Levels"
 msgstr ""
 
-#: ../inventory/reorder_level.php:24
+#: ../inventory/reorder_level.php:26
 #: ../inventory/transfers.php:32
 msgid ""
 "There are no inventory items defined in the system (Purchased or "
 "manufactured items)."
 msgstr ""
 
-#: ../inventory/reorder_level.php:57
-#: ../inventory/inquiry/stock_status.php:65
-#: ../inventory/inquiry/stock_status.php:69
+#: ../inventory/reorder_level.php:67
+#: ../inventory/inquiry/stock_movements.php:79
+#: ../inventory/inquiry/stock_status.php:66
+#: ../inventory/inquiry/stock_status.php:70
 #: ../manufacturing/search_work_orders.php:162
 #: ../manufacturing/inquiry/where_used_inquiry.php:45
 #: ../manufacturing/manage/bom_edit.php:70
-#: ../purchasing/inquiry/po_search_completed.php:119
-#: ../purchasing/inquiry/po_search_completed.php:129
-#: ../purchasing/inquiry/po_search.php:133
-#: ../purchasing/inquiry/po_search.php:144
-#: ../reporting/rep105.php:118
-#: ../reporting/rep301.php:105
-#: ../reporting/rep302.php:130
-#: ../reporting/rep303.php:122
+#: ../purchasing/inquiry/po_search_completed.php:126
+#: ../purchasing/inquiry/po_search_completed.php:136
+#: ../purchasing/inquiry/po_search.php:135
+#: ../purchasing/inquiry/po_search.php:146
+#: ../reporting/rep105.php:120
+#: ../reporting/rep301.php:176
+#: ../reporting/rep302.php:132
+#: ../reporting/rep303.php:134
 #: ../reporting/rep304.php:123
-#: ../reporting/reports_main.php:170
-#: ../reporting/reports_main.php:176
-#: ../reporting/reports_main.php:181
-#: ../reporting/reports_main.php:192
+#: ../reporting/rep306.php:150
+#: ../reporting/rep307.php:124
+#: ../reporting/rep308.php:238
+#: ../reporting/rep402.php:103
+#: ../reporting/rep402.php:109
+#: ../reporting/reports_main.php:210
+#: ../reporting/reports_main.php:217
+#: ../reporting/reports_main.php:223
+#: ../reporting/reports_main.php:236
+#: ../reporting/reports_main.php:251
+#: ../reporting/reports_main.php:261
+#: ../reporting/reports_main.php:269
+#: ../reporting/reports_main.php:290
 #: ../sales/manage/sales_points.php:84
 msgid "Location"
 msgstr ""
 
-#: ../inventory/reorder_level.php:57
-#: ../inventory/inquiry/stock_movements.php:77
-#: ../inventory/inquiry/stock_status.php:69
-#: ../purchasing/supplier_credit.php:203
-#: ../sales/sales_order_entry.php:485
-#: ../sales/includes/ui/sales_order_ui.inc:175
+#: ../inventory/reorder_level.php:67
+#: ../inventory/inquiry/stock_movements.php:80
+#: ../inventory/inquiry/stock_status.php:70
+#: ../purchasing/supplier_credit.php:228
 msgid "Quantity On Hand"
 msgstr ""
 
-#: ../inventory/reorder_level.php:57
-#: ../inventory/inquiry/stock_status.php:69
-#: ../sales/includes/db/sales_order_db.inc:110
-#: ../sales/includes/db/sales_order_db.inc:263
+#: ../inventory/reorder_level.php:67
+#: ../inventory/includes/inventory_db.inc:72
+#: ../inventory/inquiry/stock_status.php:70
+#: ../sales/includes/db/old.sales_order_db.inc:110
+#: ../sales/includes/db/old.sales_order_db.inc:263
 msgid "Re-Order Level"
 msgstr ""
 
-#: ../inventory/reorder_level.php:75
+#: ../inventory/reorder_level.php:90
 msgid "Reorder levels has been updated."
 msgstr ""
 
@@ -8043,24 +8634,46 @@ msgstr ""
 msgid "Enter &Another Inventory Transfer"
 msgstr ""
 
-#: ../inventory/transfers.php:117
+#: ../inventory/transfers.php:102
+msgid "The entered transfer date is invalid."
+msgstr ""
+
+#: ../inventory/transfers.php:114
 msgid "The locations to transfer from and to must be different."
 msgstr ""
 
-#: ../inventory/transfers.php:127
+#: ../inventory/transfers.php:124
 msgid ""
-"The quantity entered is greater than the available quantity for this item at "
-"the source location :"
+"The transfer cannot be processed because it would cause negative inventory "
+"balance in source location for marked items as of document date or later."
 msgstr ""
 
-#: ../inventory/transfers.php:160
+#: ../inventory/transfers.php:154
 msgid "The quantity entered must be a positive number."
 msgstr ""
 
-#: ../inventory/transfers.php:237
+#: ../inventory/transfers.php:231
 msgid "Process Transfer"
 msgstr ""
 
+#: ../inventory/includes/inventory_db.inc:69
+#: ../sales/includes/db/old.sales_order_db.inc:107
+#: ../sales/includes/db/old.sales_order_db.inc:259
+msgid "Stocks below Re-Order Level at "
+msgstr ""
+
+#: ../inventory/includes/inventory_db.inc:72
+#: ../sales/includes/db/old.sales_order_db.inc:110
+#: ../sales/includes/db/old.sales_order_db.inc:264
+msgid "Below"
+msgstr ""
+
+#: ../inventory/includes/inventory_db.inc:73
+#: ../sales/includes/db/old.sales_order_db.inc:111
+#: ../sales/includes/db/old.sales_order_db.inc:265
+msgid "Please reorder"
+msgstr ""
+
 #: ../inventory/includes/item_adjustments_ui.inc:20
 #: ../inventory/includes/stock_transfers_ui.inc:20
 #: ../manufacturing/includes/work_order_issue_ui.inc:20
@@ -8072,7 +8685,7 @@ msgstr ""
 #: ../manufacturing/work_order_entry.php:209
 #: ../purchasing/inquiry/po_search.php:67
 #: ../sales/inquiry/sales_deliveries_view.php:107
-#: ../sales/inquiry/sales_orders_view.php:224
+#: ../sales/inquiry/sales_orders_view.php:254
 msgid "Location:"
 msgstr ""
 
@@ -8091,49 +8704,51 @@ msgstr ""
 #: ../inventory/includes/item_adjustments_ui.inc:62
 #: ../inventory/includes/stock_transfers_ui.inc:60
 #: ../manufacturing/includes/work_order_issue_ui.inc:33
-#: ../purchasing/includes/ui/po_ui.inc:236
+#: ../purchasing/includes/ui/po_ui.inc:245
 #: ../purchasing/po_receive_items.php:62
 #: ../purchasing/view/view_grn.php:40
 #: ../purchasing/view/view_po.php:45
-#: ../reporting/includes/doctext.inc:102
-#: ../reporting/includes/doctext.inc:105
-#: ../reporting/includes/doctext.inc:110
+#: ../reporting/includes/doctext.inc:29
+#: ../reporting/includes/doctext.inc:191
+#: ../reporting/includes/doctext.inc:228
 #: ../sales/customer_credit_invoice.php:280
-#: ../sales/customer_delivery.php:417
-#: ../sales/customer_invoice.php:446
+#: ../sales/customer_delivery.php:455
+#: ../sales/customer_invoice.php:550
+#: ../sales/customer_invoice.php:553
 #: ../sales/view/view_credit.php:90
 #: ../sales/view/view_dispatch.php:112
-#: ../sales/view/view_invoice.php:113
-#: ../sales/view/view_sales_order.php:200
+#: ../sales/view/view_invoice.php:115
+#: ../sales/view/view_sales_order.php:219
 #: ../sales/includes/ui/sales_credit_ui.inc:167
-#: ../sales/includes/ui/sales_order_ui.inc:140
+#: ../sales/includes/ui/sales_order_ui.inc:146
 msgid "Item Code"
 msgstr ""
 
 #: ../inventory/includes/item_adjustments_ui.inc:62
 #: ../inventory/includes/stock_transfers_ui.inc:60
 #: ../manufacturing/includes/work_order_issue_ui.inc:33
-#: ../purchasing/includes/ui/po_ui.inc:236
+#: ../purchasing/includes/ui/po_ui.inc:245
 #: ../purchasing/view/view_grn.php:40
 #: ../purchasing/view/view_po.php:45
-#: ../reporting/includes/doctext.inc:102
-#: ../reporting/includes/doctext.inc:105
-#: ../reporting/includes/doctext.inc:110
+#: ../reporting/includes/doctext.inc:29
+#: ../reporting/includes/doctext.inc:191
+#: ../reporting/includes/doctext.inc:228
 #: ../sales/customer_credit_invoice.php:280
-#: ../sales/customer_delivery.php:417
-#: ../sales/customer_invoice.php:446
+#: ../sales/customer_delivery.php:455
+#: ../sales/customer_invoice.php:550
+#: ../sales/customer_invoice.php:553
 #: ../sales/view/view_credit.php:90
 #: ../sales/view/view_dispatch.php:112
-#: ../sales/view/view_invoice.php:113
-#: ../sales/view/view_sales_order.php:200
+#: ../sales/view/view_invoice.php:115
+#: ../sales/view/view_sales_order.php:219
 #: ../sales/includes/ui/sales_credit_ui.inc:167
-#: ../sales/includes/ui/sales_order_ui.inc:140
+#: ../sales/includes/ui/sales_order_ui.inc:146
 msgid "Item Description"
 msgstr ""
 
 #: ../inventory/includes/item_adjustments_ui.inc:62
 #: ../inventory/includes/stock_transfers_ui.inc:60
-#: ../inventory/manage/item_codes.php:122
+#: ../inventory/manage/item_codes.php:124
 #: ../inventory/manage/sales_kits.php:40
 #: ../inventory/view/view_adjustment.php:56
 #: ../inventory/view/view_transfer.php:56
@@ -8143,24 +8758,24 @@ msgstr ""
 #: ../manufacturing/includes/manufacturing_ui.inc:157
 #: ../manufacturing/includes/manufacturing_ui.inc:332
 #: ../manufacturing/includes/work_order_issue_ui.inc:33
-#: ../purchasing/includes/ui/invoice_ui.inc:483
-#: ../purchasing/includes/ui/po_ui.inc:236
+#: ../purchasing/includes/ui/invoice_ui.inc:520
+#: ../purchasing/includes/ui/po_ui.inc:245
 #: ../purchasing/view/view_grn.php:40
 #: ../purchasing/view/view_po.php:45
-#: ../reporting/rep301.php:99
-#: ../reporting/rep303.php:109
-#: ../reporting/rep303.php:115
-#: ../reporting/rep401.php:69
-#: ../reporting/includes/doctext.inc:47
-#: ../reporting/includes/doctext.inc:103
-#: ../reporting/includes/doctext.inc:110
+#: ../reporting/rep301.php:169
+#: ../reporting/rep303.php:121
+#: ../reporting/rep303.php:127
+#: ../reporting/rep401.php:71
+#: ../reporting/includes/doctext.inc:29
+#: ../reporting/includes/doctext.inc:192
+#: ../reporting/includes/doctext.inc:225
+#: ../sales/customer_invoice.php:550
 #: ../sales/view/view_credit.php:90
 #: ../sales/view/view_dispatch.php:112
-#: ../sales/view/view_invoice.php:113
-#: ../sales/view/view_sales_order.php:200
+#: ../sales/view/view_invoice.php:115
+#: ../sales/view/view_sales_order.php:219
 #: ../sales/includes/ui/sales_credit_ui.inc:167
-#: ../sales/includes/ui/sales_order_ui.inc:140
-#: ../themes/exclusive/renderer.php:433
+#: ../sales/includes/ui/sales_order_ui.inc:146
 msgid "Quantity"
 msgstr ""
 
@@ -8168,17 +8783,17 @@ msgstr ""
 #: ../inventory/includes/stock_transfers_ui.inc:60
 #: ../inventory/manage/item_units.php:94
 #: ../manufacturing/includes/work_order_issue_ui.inc:34
-#: ../purchasing/includes/ui/po_ui.inc:237
+#: ../purchasing/includes/ui/po_ui.inc:246
 #: ../purchasing/view/view_grn.php:41
 #: ../purchasing/view/view_po.php:45
-#: ../reporting/includes/doctext.inc:103
-#: ../reporting/includes/doctext.inc:111
+#: ../reporting/includes/doctext.inc:30
+#: ../reporting/includes/doctext.inc:192
 #: ../sales/view/view_credit.php:91
 #: ../sales/view/view_dispatch.php:113
-#: ../sales/view/view_invoice.php:114
-#: ../sales/view/view_sales_order.php:200
+#: ../sales/view/view_invoice.php:116
+#: ../sales/view/view_sales_order.php:219
 #: ../sales/includes/ui/sales_credit_ui.inc:167
-#: ../sales/includes/ui/sales_order_ui.inc:142
+#: ../sales/includes/ui/sales_order_ui.inc:148
 msgid "Unit"
 msgstr ""
 
@@ -8186,13 +8801,18 @@ msgstr ""
 #: ../inventory/view/view_adjustment.php:57
 #: ../manufacturing/includes/manufacturing_ui.inc:29
 #: ../manufacturing/includes/work_order_issue_ui.inc:34
-#: ../reporting/rep301.php:99
+#: ../reporting/rep301.php:169
 msgid "Unit Cost"
 msgstr ""
 
+#: ../inventory/includes/item_adjustments_ui.inc:110
+msgid ""
+"Marked items have insufficient quantities in stock as on day of adjustment."
+msgstr ""
+
 #: ../inventory/includes/stock_transfers_ui.inc:35
 #: ../inventory/inquiry/stock_movements.php:56
-#: ../manufacturing/includes/work_order_issue_ui.inc:160
+#: ../manufacturing/includes/work_order_issue_ui.inc:171
 msgid "From Location:"
 msgstr ""
 
@@ -8204,33 +8824,38 @@ msgstr ""
 msgid "Transfer Type:"
 msgstr ""
 
-#: ../inventory/includes/db/items_db.inc:119
+#: ../inventory/includes/stock_transfers_ui.inc:100
+msgid ""
+"Marked items have insufficient quantities in stock as on day of transfer."
+msgstr ""
+
+#: ../inventory/includes/db/items_db.inc:121
 msgid ""
 "Cannot delete this item because there are stock movements that refer to this "
 "item."
 msgstr ""
 
-#: ../inventory/includes/db/items_db.inc:122
+#: ../inventory/includes/db/items_db.inc:124
 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:125
-#: ../inventory/includes/db/items_db.inc:128
+#: ../inventory/includes/db/items_db.inc:127
+#: ../inventory/includes/db/items_db.inc:130
 msgid ""
 "Cannot delete this item because there are existing purchase order items for "
 "it."
 msgstr ""
 
-#: ../inventory/includes/db/items_db.inc:146
+#: ../inventory/includes/db/items_db.inc:148
 msgid ""
 "This item cannot be deleted because some code aliases \n"
 "\t\t\t\tor foreign codes was entered for it, or there are kits defined \n"
 "\t\t\t\tusing this item as component"
 msgstr ""
 
-#: ../inventory/inquiry/stock_movements.php:27
+#: ../inventory/inquiry/stock_movements.php:26
 msgid "Inventory Item Movement"
 msgstr ""
 
@@ -8239,55 +8864,56 @@ msgid "Show Movements"
 msgstr ""
 
 #: ../inventory/inquiry/stock_movements.php:61
-#: ../purchasing/includes/ui/invoice_ui.inc:452
+#: ../purchasing/includes/ui/invoice_ui.inc:489
 #: ../purchasing/inquiry/supplier_allocation_inquiry.php:57
-#: ../purchasing/inquiry/supplier_inquiry.php:54
+#: ../purchasing/inquiry/supplier_inquiry.php:55
 #: ../sales/inquiry/customer_allocation_inquiry.php:51
 #: ../sales/inquiry/customer_inquiry.php:54
 msgid "Refresh Inquiry"
 msgstr ""
 
-#: ../inventory/inquiry/stock_movements.php:76
+#: ../inventory/inquiry/stock_movements.php:80
 msgid "Detail"
 msgstr ""
 
-#: ../inventory/inquiry/stock_movements.php:77
+#: ../inventory/inquiry/stock_movements.php:80
+#: ../reporting/rep307.php:117
 msgid "Quantity In"
 msgstr ""
 
-#: ../inventory/inquiry/stock_movements.php:77
+#: ../inventory/inquiry/stock_movements.php:80
+#: ../reporting/rep307.php:117
 msgid "Quantity Out"
 msgstr ""
 
-#: ../inventory/inquiry/stock_movements.php:92
+#: ../inventory/inquiry/stock_movements.php:97
 msgid "Quantity on hand before"
 msgstr ""
 
-#: ../inventory/inquiry/stock_movements.php:180
+#: ../inventory/inquiry/stock_movements.php:188
 msgid "Quantity on hand after"
 msgstr ""
 
-#: ../inventory/inquiry/stock_status.php:18
-#: ../inventory/inquiry/stock_status.php:20
+#: ../inventory/inquiry/stock_status.php:16
 msgid "Inventory Item Status"
 msgstr ""
 
-#: ../inventory/inquiry/stock_status.php:55
+#: ../inventory/inquiry/stock_status.php:56
 msgid ""
 "This is a service and cannot have a stock holding, only the total quantity "
 "on outstanding sales orders is shown."
 msgstr ""
 
-#: ../inventory/inquiry/stock_status.php:65
-#: ../inventory/inquiry/stock_status.php:70
-#: ../reporting/rep303.php:109
-#: ../reporting/rep303.php:115
+#: ../inventory/inquiry/stock_status.php:66
+#: ../inventory/inquiry/stock_status.php:71
+#: ../reporting/rep303.php:121
+#: ../reporting/rep303.php:127
 msgid "Demand"
 msgstr ""
 
-#: ../inventory/inquiry/stock_status.php:70
-#: ../reporting/rep303.php:109
-#: ../reporting/rep303.php:115
+#: ../inventory/inquiry/stock_status.php:71
+#: ../reporting/rep303.php:121
+#: ../reporting/rep303.php:127
 msgid "On Order"
 msgstr ""
 
@@ -8322,7 +8948,7 @@ msgid "Tax type"
 msgstr ""
 
 #: ../inventory/manage/item_categories.php:98
-#: ../inventory/manage/item_codes.php:122
+#: ../inventory/manage/item_codes.php:124
 #: ../inventory/manage/sales_kits.php:40
 #: ../inventory/view/view_adjustment.php:57
 #: ../inventory/view/view_transfer.php:56
@@ -8330,8 +8956,9 @@ msgstr ""
 #: ../manufacturing/manage/bom_edit.php:71
 #: ../purchasing/po_receive_items.php:62
 #: ../sales/customer_credit_invoice.php:280
-#: ../sales/customer_delivery.php:418
-#: ../sales/customer_invoice.php:446
+#: ../sales/customer_delivery.php:456
+#: ../sales/customer_invoice.php:550
+#: ../sales/customer_invoice.php:553
 msgid "Units"
 msgstr ""
 
@@ -8355,40 +8982,45 @@ msgstr ""
 msgid "Assembly Account"
 msgstr ""
 
-#: ../inventory/manage/item_categories.php:180
+#: ../inventory/manage/item_categories.php:182
 msgid "Category Name:"
 msgstr ""
 
-#: ../inventory/manage/item_categories.php:182
+#: ../inventory/manage/item_categories.php:184
 msgid "Default values for new items"
 msgstr ""
 
-#: ../inventory/manage/item_categories.php:184
-#: ../inventory/manage/items.php:336
+#: ../inventory/manage/item_categories.php:186
+#: ../inventory/manage/items.php:335
 msgid "Item Tax Type:"
 msgstr ""
 
-#: ../inventory/manage/item_categories.php:186
-#: ../inventory/manage/items.php:338
+#: ../inventory/manage/item_categories.php:188
+#: ../inventory/manage/items.php:337
 msgid "Item Type:"
 msgstr ""
 
-#: ../inventory/manage/item_categories.php:188
-#: ../inventory/manage/items.php:340
+#: ../inventory/manage/item_categories.php:190
+#: ../inventory/manage/items.php:339
 msgid "Units of Measure:"
 msgstr ""
 
-#: ../inventory/manage/item_categories.php:190
-#: ../inventory/manage/items.php:344
+#: ../inventory/manage/item_categories.php:192
+#: ../inventory/manage/items.php:343
 msgid "Exclude from sales:"
 msgstr ""
 
+#: ../inventory/manage/item_categories.php:194
+#: ../inventory/manage/items.php:345
+msgid "Exclude from purchases:"
+msgstr ""
+
 #: ../inventory/manage/item_codes.php:16
 msgid "Foreign Item Codes"
 msgstr ""
 
 #: ../inventory/manage/item_codes.php:23
-#: ../sales/sales_order_entry.php:636
+#: ../sales/sales_order_entry.php:703
 msgid "There are no inventory items defined in the system."
 msgstr ""
 
@@ -8402,7 +9034,7 @@ msgid "Item code description cannot be empty."
 msgstr ""
 
 #: ../inventory/manage/item_codes.php:55
-#: ../inventory/manage/items.php:150
+#: ../inventory/manage/items.php:163
 #: ../inventory/manage/sales_kits.php:88
 msgid "This item code is already assigned to stock item or sale kit."
 msgstr ""
@@ -8419,175 +9051,210 @@ msgstr ""
 msgid "Item code has been sucessfully deleted."
 msgstr ""
 
-#: ../inventory/manage/item_codes.php:122
+#: ../inventory/manage/item_codes.php:124
 msgid "EAN/UPC Code"
 msgstr ""
 
-#: ../inventory/manage/item_codes.php:123
-#: ../reporting/rep104.php:115
-#: ../reporting/rep105.php:117
-#: ../reporting/rep301.php:99
-#: ../reporting/rep301.php:104
-#: ../reporting/rep302.php:122
-#: ../reporting/rep302.php:129
-#: ../reporting/rep303.php:121
+#: ../inventory/manage/item_codes.php:125
+#: ../reporting/rep104.php:117
+#: ../reporting/rep105.php:119
+#: ../reporting/rep301.php:169
+#: ../reporting/rep301.php:175
+#: ../reporting/rep302.php:124
+#: ../reporting/rep302.php:131
+#: ../reporting/rep303.php:133
 #: ../reporting/rep304.php:114
 #: ../reporting/rep304.php:122
+#: ../reporting/rep306.php:141
+#: ../reporting/rep306.php:149
+#: ../reporting/rep307.php:117
+#: ../reporting/rep307.php:123
+#: ../reporting/rep308.php:230
+#: ../reporting/rep308.php:237
+#: ../reporting/rep309.php:104
 msgid "Category"
 msgstr ""
 
-#: ../inventory/manage/item_codes.php:176
+#: ../inventory/manage/item_codes.php:178
 msgid "UPC/EAN code:"
 msgstr ""
 
-#: ../inventory/manage/item_codes.php:177
+#: ../inventory/manage/item_codes.php:179
 #: ../inventory/manage/sales_kits.php:245
-#: ../manufacturing/work_order_add_finished.php:206
+#: ../manufacturing/work_order_add_finished.php:203
 #: ../manufacturing/work_order_entry.php:422
 #: ../manufacturing/manage/bom_edit.php:228
 msgid "Quantity:"
 msgstr ""
 
-#: ../inventory/manage/item_codes.php:178
-#: ../inventory/manage/items.php:311
+#: ../inventory/manage/item_codes.php:180
+#: ../inventory/manage/items.php:309
 #: ../inventory/manage/movement_types.php:129
 #: ../inventory/manage/sales_kits.php:206
 #: ../inventory/manage/sales_kits.php:232
 #: ../manufacturing/manage/work_centres.php:138
 #: ../sales/manage/credit_status.php:145
-#: ../sales/manage/recurrent_invoices.php:147
-#: ../taxes/item_tax_types.php:168
-#: ../taxes/tax_groups.php:204
+#: ../sales/manage/recurrent_invoices.php:165
+#: ../taxes/item_tax_types.php:173
+#: ../taxes/sav.tax_types.php:241
+#: ../taxes/tax_groups.php:162
 #: ../taxes/tax_types.php:158
 msgid "Description:"
 msgstr ""
 
-#: ../inventory/manage/item_codes.php:179
-#: ../inventory/manage/items.php:313
+#: ../inventory/manage/item_codes.php:181
+#: ../inventory/manage/items.php:311
 #: ../inventory/manage/sales_kits.php:207
 #: ../inventory/manage/sales_kits.php:233
 msgid "Category:"
 msgstr ""
 
-#: ../inventory/manage/items.php:69
-msgid "Only jpg files are supported - a file extension of .jpg is expected"
+#: ../inventory/manage/items.php:81
+msgid ""
+"Only graphics files are supported - a file extension of .jpg, .png or .gif "
+"is expected"
 msgstr ""
 
-#: ../inventory/manage/items.php:100
+#: ../inventory/manage/items.php:112
 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:102
+#: ../inventory/manage/items.php:114
 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:129
+#: ../inventory/manage/items.php:142
 msgid "The item name must be entered."
 msgstr ""
 
-#: ../inventory/manage/items.php:135
+#: ../inventory/manage/items.php:148
 msgid "The item code cannot be empty"
 msgstr ""
 
-#: ../inventory/manage/items.php:143
+#: ../inventory/manage/items.php:156
 msgid ""
 "The item code cannot contain any of the following characters -  & + OR a "
 "space OR quotes"
 msgstr ""
 
-#: ../inventory/manage/items.php:179
+#: ../inventory/manage/items.php:192
 msgid "Item has been updated."
 msgstr ""
 
-#: ../inventory/manage/items.php:192
+#: ../inventory/manage/items.php:205
 msgid "A new item has been added."
 msgstr ""
 
-#: ../inventory/manage/items.php:234
+#: ../inventory/manage/items.php:248
 msgid "Selected item has been deleted."
 msgstr ""
 
-#: ../inventory/manage/items.php:250
-msgid "Select an item:"
-msgstr ""
-
-#: ../inventory/manage/items.php:251
-msgid "New item"
-msgstr ""
-
-#: ../inventory/manage/items.php:268
+#: ../inventory/manage/items.php:265
 #: ../inventory/view/view_adjustment.php:56
 #: ../inventory/view/view_transfer.php:39
 #: ../inventory/view/view_transfer.php:56
 #: ../manufacturing/search_work_orders.php:163
 #: ../manufacturing/view/wo_issue_view.php:44
 #: ../manufacturing/view/wo_production_view.php:45
-#: ../purchasing/includes/ui/invoice_ui.inc:470
-#: ../purchasing/includes/ui/invoice_ui.inc:482
-#: ../reporting/rep204.php:82
-#: ../themes/exclusive/renderer.php:433
-#: ../themes/exclusive/renderer.php:452
+#: ../purchasing/includes/ui/invoice_ui.inc:507
+#: ../purchasing/includes/ui/invoice_ui.inc:519
+#: ../reporting/rep204.php:84
+#: ../reporting/rep306.php:152
+#: ../reporting/rep402.php:103
 msgid "Item"
 msgstr ""
 
-#: ../inventory/manage/items.php:273
-#: ../inventory/manage/items.php:304
+#: ../inventory/manage/items.php:270
+#: ../inventory/manage/items.php:302
 msgid "Item Code:"
 msgstr ""
 
-#: ../inventory/manage/items.php:342
+#: ../inventory/manage/items.php:341
 msgid "Editable description:"
 msgstr ""
 
-#: ../inventory/manage/items.php:362
-#: ../sales/manage/customer_branches.php:248
+#: ../inventory/manage/items.php:363
+#: ../sales/manage/customer_branches.php:249
 msgid "GL Accounts"
 msgstr ""
 
-#: ../inventory/manage/items.php:385
+#: ../inventory/manage/items.php:386
 msgid "Other"
 msgstr ""
 
-#: ../inventory/manage/items.php:388
+#: ../inventory/manage/items.php:389
 msgid "Image File (.jpg)"
 msgstr ""
 
-#: ../inventory/manage/items.php:403
+#: ../inventory/manage/items.php:404
 msgid "No image"
 msgstr ""
 
-#: ../inventory/manage/items.php:408
+#: ../inventory/manage/items.php:409
 msgid "Delete Image:"
 msgstr ""
 
-#: ../inventory/manage/items.php:410
+#: ../inventory/manage/items.php:411
 msgid "Item status:"
 msgstr ""
 
-#: ../inventory/manage/items.php:416
+#: ../inventory/manage/items.php:417
 msgid "Insert New Item"
 msgstr ""
 
-#: ../inventory/manage/items.php:420
+#: ../inventory/manage/items.php:421
 msgid "Update Item"
 msgstr ""
 
-#: ../inventory/manage/items.php:423
+#: ../inventory/manage/items.php:424
 msgid "Select this items and return to document entry."
 msgstr ""
 
-#: ../inventory/manage/items.php:424
+#: ../inventory/manage/items.php:425
 msgid "Clone This Item"
 msgstr ""
 
-#: ../inventory/manage/items.php:425
+#: ../inventory/manage/items.php:426
 msgid "Delete This Item"
 msgstr ""
 
+#: ../inventory/manage/items.php:441
+msgid "Select an item:"
+msgstr ""
+
+#: ../inventory/manage/items.php:442
+msgid "New item"
+msgstr ""
+
+#: ../inventory/manage/items.php:465
+#: ../purchasing/manage/suppliers.php:310
+#: ../sales/manage/customer_branches.php:324
+#: ../sales/manage/customers.php:348
+msgid "&General settings"
+msgstr ""
+
+#: ../inventory/manage/items.php:466
+msgid "S&ales Pricing"
+msgstr ""
+
+#: ../inventory/manage/items.php:467
+msgid "&Purchasing Pricing"
+msgstr ""
+
+#: ../inventory/manage/items.php:470
+#: ../purchasing/manage/suppliers.php:312
+#: ../sales/manage/customers.php:350
+msgid "&Transactions"
+msgstr ""
+
+#: ../inventory/manage/items.php:471
+msgid "&Status"
+msgstr ""
+
 #: ../inventory/manage/item_units.php:16
 msgid "Units of Measure"
 msgstr ""
@@ -8863,7 +9530,7 @@ msgstr ""
 #: ../manufacturing/view/wo_issue_view.php:44
 #: ../manufacturing/includes/manufacturing_ui.inc:29
 #: ../manufacturing/includes/manufacturing_ui.inc:83
-#: ../reporting/includes/doctext.inc:106
+#: ../reporting/includes/doctext.inc:229
 msgid "From Location"
 msgstr ""
 
@@ -8889,10 +9556,10 @@ msgid "for item:"
 msgstr ""
 
 #: ../manufacturing/search_work_orders.php:78
-#: ../purchasing/inquiry/po_search_completed.php:74
-#: ../purchasing/inquiry/po_search.php:76
-#: ../sales/inquiry/sales_deliveries_view.php:116
-#: ../sales/inquiry/sales_orders_view.php:238
+#: ../purchasing/inquiry/po_search_completed.php:77
+#: ../purchasing/inquiry/po_search.php:78
+#: ../sales/inquiry/sales_deliveries_view.php:118
+#: ../sales/inquiry/sales_orders_view.php:270
 msgid "Select documents"
 msgstr ""
 
@@ -8913,14 +9580,16 @@ msgid "Costs"
 msgstr ""
 
 #: ../manufacturing/search_work_orders.php:164
+#: ../reporting/rep402.php:103
 msgid "Required"
 msgstr ""
 
 #: ../manufacturing/search_work_orders.php:167
 #: ../manufacturing/includes/manufacturing_ui.inc:277
 #: ../manufacturing/includes/manufacturing_ui.inc:281
-#: ../reporting/includes/doctext.inc:44
-#: ../sales/inquiry/sales_orders_view.php:259
+#: ../reporting/rep402.php:103
+#: ../reporting/includes/doctext.inc:227
+#: ../sales/inquiry/sales_orders_view.php:291
 msgid "Required By"
 msgstr ""
 
@@ -8939,15 +9608,16 @@ msgstr ""
 #: ../manufacturing/work_order_add_finished.php:46
 #: ../manufacturing/work_order_costs.php:45
 #: ../manufacturing/work_order_entry.php:56
-#: ../manufacturing/work_order_issue.php:38
-#: ../manufacturing/work_order_release.php:72
+#: ../manufacturing/work_order_issue.php:40
+#: ../manufacturing/work_order_issue.php.orig:40
+#: ../manufacturing/work_order_release.php:75
 msgid "View this Work Order"
 msgstr ""
 
 #: ../manufacturing/work_order_add_finished.php:48
-#: ../manufacturing/work_order_costs.php:47
-#: ../manufacturing/work_order_entry.php:65
-#: ../manufacturing/work_order_issue.php:40
+#: ../manufacturing/work_order_entry.php:64
+#: ../manufacturing/work_order_issue.php:42
+#: ../manufacturing/work_order_issue.php.orig:42
 msgid "View the GL Journal Entries for this Work Order"
 msgstr ""
 
@@ -8957,14 +9627,15 @@ msgid "Print the GL Journal Entries for this Work Order"
 msgstr ""
 
 #: ../manufacturing/work_order_add_finished.php:52
-#: ../manufacturing/work_order_costs.php:51
-#: ../manufacturing/work_order_issue.php:42
+#: ../manufacturing/work_order_costs.php:49
+#: ../manufacturing/work_order_issue.php:44
+#: ../manufacturing/work_order_issue.php.orig:44
 msgid "Select another &Work Order to Process"
 msgstr ""
 
 #: ../manufacturing/work_order_add_finished.php:65
-#: ../manufacturing/work_order_costs.php:64
-#: ../manufacturing/work_order_entry.php:340
+#: ../manufacturing/work_order_costs.php:62
+#: ../manufacturing/work_order_entry.php:339
 #: ../manufacturing/includes/db/work_order_issues_db.inc:30
 #: ../manufacturing/includes/db/work_order_produce_items_db.inc:27
 msgid "The order number sent is not valid."
@@ -8984,32 +9655,32 @@ msgid ""
 "The production exceeds the quantity needed. Please change the Work Order."
 msgstr ""
 
-#: ../manufacturing/work_order_add_finished.php:129
+#: ../manufacturing/work_order_add_finished.php:126
 msgid ""
 "The unassembling cannot be processed because there is insufficient stock."
 msgstr ""
 
-#: ../manufacturing/work_order_add_finished.php:147
+#: ../manufacturing/work_order_add_finished.php:144
 msgid ""
 "The production cannot be processed because a required item would cause a "
 "negative inventory balance :"
 msgstr ""
 
-#: ../manufacturing/work_order_add_finished.php:204
+#: ../manufacturing/work_order_add_finished.php:201
 msgid "Produce Finished Items"
 msgstr ""
 
-#: ../manufacturing/work_order_add_finished.php:204
+#: ../manufacturing/work_order_add_finished.php:201
 msgid "Return Items to Work Order"
 msgstr ""
 
-#: ../manufacturing/work_order_add_finished.php:214
-#: ../purchasing/allocations/supplier_allocate.php:65
-#: ../sales/allocations/customer_allocate.php:64
+#: ../manufacturing/work_order_add_finished.php:211
+#: ../purchasing/allocations/supplier_allocate.php:75
+#: ../sales/allocations/customer_allocate.php:73
 msgid "Process"
 msgstr ""
 
-#: ../manufacturing/work_order_add_finished.php:215
+#: ../manufacturing/work_order_add_finished.php:212
 msgid "Process And Close Order"
 msgstr ""
 
@@ -9021,28 +9692,28 @@ msgstr ""
 msgid "The additional cost has been entered."
 msgstr ""
 
-#: ../manufacturing/work_order_costs.php:49
+#: ../manufacturing/work_order_costs.php:47
 msgid "Enter another additional cost."
 msgstr ""
 
-#: ../manufacturing/work_order_costs.php:76
+#: ../manufacturing/work_order_costs.php:73
 msgid "The amount entered is not a valid number or less then zero."
 msgstr ""
 
-#: ../manufacturing/work_order_costs.php:95
+#: ../manufacturing/work_order_costs.php:92
 msgid ""
 "The additional cost date cannot be before the release date of the work order."
 msgstr ""
 
-#: ../manufacturing/work_order_costs.php:151
+#: ../manufacturing/work_order_costs.php:143
 msgid "Additional Costs:"
 msgstr ""
 
-#: ../manufacturing/work_order_costs.php:152
+#: ../manufacturing/work_order_costs.php:144
 msgid "Debit Account"
 msgstr ""
 
-#: ../manufacturing/work_order_costs.php:159
+#: ../manufacturing/work_order_costs.php:151
 msgid "Process Additional Cost"
 msgstr ""
 
@@ -9059,47 +9730,47 @@ msgid "The work order been added."
 msgstr ""
 
 #: ../manufacturing/work_order_entry.php:62
-msgid "Print this Work Order"
+msgid "&Print This Work Order"
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:64
-msgid "Email this Work Order"
+#: ../manufacturing/work_order_entry.php:63
+msgid "&Email This Work Order"
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:79
+#: ../manufacturing/work_order_entry.php:80
 msgid "The work order been updated."
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:89
+#: ../manufacturing/work_order_entry.php:90
 msgid "Work order has been deleted."
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:99
+#: ../manufacturing/work_order_entry.php:100
 msgid ""
 "This work order has been closed. There can be no more issues against it."
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:109
+#: ../manufacturing/work_order_entry.php:110
 msgid "Enter a new work order"
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:110
+#: ../manufacturing/work_order_entry.php:111
 msgid "Select an existing work order"
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:146
+#: ../manufacturing/work_order_entry.php:147
 msgid "The quantity entered is invalid or less than zero."
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:168
+#: ../manufacturing/work_order_entry.php:169
 msgid "The selected item to manufacture does not have a bom."
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:177
+#: ../manufacturing/work_order_entry.php:178
 msgid "The labour cost entered is invalid or less than zero."
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:185
+#: ../manufacturing/work_order_entry.php:186
 msgid "The cost entered is invalid or less than zero."
 msgstr ""
 
@@ -9109,23 +9780,23 @@ msgid ""
 "for component:"
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:222
+#: ../manufacturing/work_order_entry.php:221
 msgid ""
 "The selected item cannot be unassembled because there is insufficient stock."
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:248
+#: ../manufacturing/work_order_entry.php:247
 msgid ""
 "The quantity cannot be changed to be less than the quantity already "
 "manufactured for this order."
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:297
+#: ../manufacturing/work_order_entry.php:296
 msgid ""
 "This work order cannot be deleted because it has already been processed."
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:348
+#: ../manufacturing/work_order_entry.php:347
 msgid "This work order is closed and cannot be edited."
 msgstr ""
 
@@ -9170,43 +9841,46 @@ msgstr ""
 msgid "Add Workorder"
 msgstr ""
 
-#: ../manufacturing/work_order_issue.php:29
+#: ../manufacturing/work_order_issue.php:31
+#: ../manufacturing/work_order_issue.php.orig:31
 msgid "Issue Items to Work Order"
 msgstr ""
 
-#: ../manufacturing/work_order_issue.php:36
+#: ../manufacturing/work_order_issue.php:38
+#: ../manufacturing/work_order_issue.php.orig:38
 msgid "The work order issue has been entered."
 msgstr ""
 
-#: ../manufacturing/work_order_issue.php:79
+#: ../manufacturing/work_order_issue.php:78
+#: ../manufacturing/work_order_issue.php.orig:78
 msgid "The entered date for the issue is invalid."
 msgstr ""
 
-#: ../manufacturing/work_order_issue.php:106
+#: ../manufacturing/work_order_issue.php.orig:106
 msgid ""
 "The issue cannot be processed because an entered item would cause a negative "
 "inventory balance :"
 msgstr ""
 
-#: ../manufacturing/work_order_issue.php:124
+#: ../manufacturing/work_order_issue.php.orig:124
 msgid ""
 "The process cannot be completed because there is an insufficient total "
 "quantity for a component."
 msgstr ""
 
-#: ../manufacturing/work_order_issue.php:125
+#: ../manufacturing/work_order_issue.php.orig:125
 msgid "Component is :"
 msgstr ""
 
-#: ../manufacturing/work_order_issue.php:126
+#: ../manufacturing/work_order_issue.php.orig:126
 msgid "From location :"
 msgstr ""
 
-#: ../manufacturing/work_order_issue.php:219
+#: ../manufacturing/work_order_issue.php.orig:219
 msgid "Items to Issue"
 msgstr ""
 
-#: ../manufacturing/work_order_issue.php:225
+#: ../manufacturing/work_order_issue.php.orig:225
 msgid "Process Issue"
 msgstr ""
 
@@ -9218,37 +9892,46 @@ msgstr ""
 msgid "This work order has already been released."
 msgstr ""
 
-#: ../manufacturing/work_order_release.php:57
+#: ../manufacturing/work_order_release.php:60
 msgid ""
 "This Work Order cannot be released. The selected item to manufacture does "
 "not have a bom."
 msgstr ""
 
-#: ../manufacturing/work_order_release.php:70
+#: ../manufacturing/work_order_release.php:73
 msgid "The work order has been released to manufacturing."
 msgstr ""
 
-#: ../manufacturing/work_order_release.php:74
+#: ../manufacturing/work_order_release.php:77
 msgid "Select another &work order"
 msgstr ""
 
-#: ../manufacturing/work_order_release.php:95
+#: ../manufacturing/work_order_release.php:98
 msgid "Work Order #:"
 msgstr ""
 
-#: ../manufacturing/work_order_release.php:96
+#: ../manufacturing/work_order_release.php:99
 msgid "Work Order Reference:"
 msgstr ""
 
-#: ../manufacturing/work_order_release.php:98
+#: ../manufacturing/work_order_release.php:101
 #: ../manufacturing/includes/manufacturing_ui.inc:278
 msgid "Released Date"
 msgstr ""
 
-#: ../manufacturing/work_order_release.php:104
+#: ../manufacturing/work_order_release.php:107
 msgid "Release Work Order"
 msgstr ""
 
+#: ../manufacturing/view/wo_costs_view.php:20
+msgid "View Work Order Costs"
+msgstr ""
+
+#: ../manufacturing/view/wo_costs_view.php:62
+#, php-format
+msgid "Production Costs for Work Order # %d"
+msgstr ""
+
 #: ../manufacturing/view/wo_issue_view.php:19
 msgid "View Work Order Issue"
 msgstr ""
@@ -9281,8 +9964,8 @@ msgstr ""
 #: ../manufacturing/view/wo_issue_view.php:77
 #: ../manufacturing/includes/manufacturing_ui.inc:28
 #: ../manufacturing/includes/manufacturing_ui.inc:83
-#: ../reporting/rep401.php:69
-#: ../reporting/rep401.php:74
+#: ../reporting/rep401.php:71
+#: ../reporting/rep401.php:76
 msgid "Component"
 msgstr ""
 
@@ -9315,7 +9998,7 @@ msgid "BOM for item:"
 msgstr ""
 
 #: ../manufacturing/view/work_order_view.php:56
-#: ../reporting/rep409.php:93
+#: ../reporting/rep409.php:87
 msgid "Work Order Requirements"
 msgstr ""
 
@@ -9366,7 +10049,7 @@ msgstr ""
 #: ../manufacturing/manage/bom_edit.php:71
 #: ../manufacturing/includes/manufacturing_ui.inc:28
 #: ../manufacturing/includes/manufacturing_ui.inc:83
-#: ../reporting/includes/doctext.inc:106
+#: ../reporting/includes/doctext.inc:229
 msgid "Work Centre"
 msgstr ""
 
@@ -9387,7 +10070,7 @@ msgid ""
 msgstr ""
 
 #: ../manufacturing/manage/bom_edit.php:70
-#: ../reporting/rep105.php:112
+#: ../reporting/rep105.php:114
 msgid "Code"
 msgstr ""
 
@@ -9470,17 +10153,17 @@ msgid "There are no Requirements for this Order."
 msgstr ""
 
 #: ../manufacturing/includes/manufacturing_ui.inc:84
-#: ../reporting/includes/doctext.inc:106
+#: ../reporting/includes/doctext.inc:229
 msgid "Unit Quantity"
 msgstr ""
 
 #: ../manufacturing/includes/manufacturing_ui.inc:84
-#: ../reporting/includes/doctext.inc:106
+#: ../reporting/includes/doctext.inc:229
 msgid "Total Quantity"
 msgstr ""
 
 #: ../manufacturing/includes/manufacturing_ui.inc:84
-#: ../reporting/includes/doctext.inc:106
+#: ../reporting/includes/doctext.inc:229
 msgid "Units Issued"
 msgstr ""
 
@@ -9512,14 +10195,14 @@ msgstr ""
 #: ../manufacturing/includes/manufacturing_ui.inc:276
 #: ../manufacturing/includes/manufacturing_ui.inc:280
 #: ../manufacturing/includes/manufacturing_ui.inc:331
-#: ../reporting/includes/doctext.inc:43
+#: ../reporting/includes/doctext.inc:223
 msgid "Manufactured Item"
 msgstr ""
 
 #: ../manufacturing/includes/manufacturing_ui.inc:277
 #: ../manufacturing/includes/manufacturing_ui.inc:281
 #: ../manufacturing/includes/manufacturing_ui.inc:332
-#: ../reporting/includes/doctext.inc:46
+#: ../reporting/includes/doctext.inc:224
 msgid "Into Location"
 msgstr ""
 
@@ -9528,191 +10211,240 @@ msgstr ""
 msgid "This work order is closed."
 msgstr ""
 
-#: ../manufacturing/includes/work_order_issue_ui.inc:158
+#: ../manufacturing/includes/work_order_issue_ui.inc:82
+msgid "Marked items have insufficient quantities in stock as on day of issue."
+msgstr ""
+
+#: ../manufacturing/includes/work_order_issue_ui.inc:169
 msgid "Return Items to Location"
 msgstr ""
 
-#: ../manufacturing/includes/work_order_issue_ui.inc:158
+#: ../manufacturing/includes/work_order_issue_ui.inc:169
 msgid "Issue Items to Work order"
 msgstr ""
 
-#: ../manufacturing/includes/work_order_issue_ui.inc:161
+#: ../manufacturing/includes/work_order_issue_ui.inc:172
 msgid "To Work Centre:"
 msgstr ""
 
-#: ../manufacturing/includes/work_order_issue_ui.inc:163
+#: ../manufacturing/includes/work_order_issue_ui.inc:174
 msgid "Issue Date:"
 msgstr ""
 
-#: ../manufacturing/includes/db/work_order_issues_db.inc:72
+#: ../manufacturing/includes/db/work_order_issues_db.inc:81
 msgid "Issue of"
 msgstr ""
 
-#: ../manufacturing/includes/db/work_order_issues_db.inc:80
+#: ../manufacturing/includes/db/work_order_issues_db.inc:90
 msgid "Issue to"
 msgstr ""
 
-#: ../manufacturing/includes/db/work_order_produce_items_db.inc:65
+#: ../manufacturing/includes/db/work_order_issues_db.inc:208
+msgid "Reversed the issue of"
+msgstr ""
+
+#: ../manufacturing/includes/db/work_order_issues_db.inc:220
+msgid "Reversed the issue to"
+msgstr ""
+
+#: ../manufacturing/includes/db/work_order_produce_items_db.inc:73
 msgid "Production."
 msgstr ""
 
-#: ../manufacturing/includes/db/work_orders_db.inc:179
-#: ../purchasing/includes/db/po_db.inc:115
-#: ../sales/includes/db/cust_trans_db.inc:109
-#: ../sales/includes/db/sales_order_db.inc:249
+#: ../manufacturing/includes/db/work_order_produce_items_db.inc:157
+msgid "Reversed the production "
+msgstr ""
+
+#: ../manufacturing/includes/db/work_orders_db.inc.orig:79
+#: ../purchasing/includes/db/po_db.inc:123
+#: ../sales/includes/db/cust_trans_db.inc:114
+#: ../sales/includes/db/old.sales_order_db.inc:249
+#: ../sales/includes/db/sales_order_db.inc:213
 msgid "Updated."
 msgstr ""
 
-#: ../manufacturing/includes/db/work_orders_db.inc:200
+#: ../manufacturing/includes/db/work_orders_db.inc.orig:100
 msgid "Canceled."
 msgstr ""
 
-#: ../manufacturing/includes/db/work_orders_db.inc:276
+#: ../manufacturing/includes/db/work_orders_db.inc.orig:176
 msgid "Released."
 msgstr ""
 
-#: ../manufacturing/includes/db/work_orders_quick_db.inc:89
+#: ../manufacturing/includes/db/work_orders_quick_db.inc:104
 msgid "Quick production."
 msgstr ""
 
-#: ../manufacturing/includes/db/work_orders_quick_db.inc:188
+#: ../manufacturing/includes/db/work_orders_quick_db.inc:184
 msgid "Produced"
 msgstr ""
 
-#: ../purchasing/includes/db/invoice_db.inc:595
-#: ../purchasing/includes/db/invoice_db.inc:597
+#: ../purchasing/includes/purchasing_db.inc:219
+msgid "Payment for:"
+msgstr ""
+
+#: ../purchasing/includes/db/invoice_db.inc:334
+msgid "Supplier invoice adjustment for zero inventory of "
+msgstr ""
+
+#: ../purchasing/includes/db/invoice_db.inc:334
+#: ../reporting/rep106.php:83
+#: ../sales/inquiry/sales_deliveries_view.php:168
+#: ../sales/inquiry/sales_orders_view.php:159
+msgid "Invoice"
+msgstr ""
+
+#: ../purchasing/includes/db/invoice_db.inc:693
+#: ../purchasing/includes/db/invoice_db.inc:695
 msgid "GRN Removal"
 msgstr ""
 
 #: ../purchasing/includes/ui/grn_ui.inc:23
-#: ../purchasing/includes/ui/po_ui.inc:319
-#: ../sales/view/view_sales_order.php:73
+#: ../purchasing/includes/ui/grn_ui.inc:55
+#: ../purchasing/includes/ui/po_ui.inc:328
+#: ../sales/view/view_sales_order.php:74
 msgid "Order Currency"
 msgstr ""
 
 #: ../purchasing/includes/ui/grn_ui.inc:25
+#: ../purchasing/includes/ui/grn_ui.inc:57
 msgid "For Purchase Order"
 msgstr ""
 
 #: ../purchasing/includes/ui/grn_ui.inc:28
-#: ../sales/view/view_sales_order.php:66
+#: ../purchasing/includes/ui/grn_ui.inc:59
+#: ../sales/view/view_sales_order.php:67
 msgid "Ordered On"
 msgstr ""
 
-#: ../purchasing/includes/ui/grn_ui.inc:40
-#: ../purchasing/includes/ui/grn_ui.inc:54
-#: ../purchasing/includes/ui/po_ui.inc:334
-#: ../purchasing/includes/ui/po_ui.inc:339
+#: ../purchasing/includes/ui/grn_ui.inc:33
+#: ../purchasing/includes/ui/grn_ui.inc:69
+#: ../purchasing/includes/ui/po_ui.inc:343
+#: ../purchasing/includes/ui/po_ui.inc:348
 msgid "Deliver Into Location"
 msgstr ""
 
-#: ../purchasing/includes/ui/grn_ui.inc:46
-msgid "Date Items Received"
-msgstr ""
-
-#: ../purchasing/includes/ui/grn_ui.inc:49
-#: ../purchasing/includes/ui/grn_ui.inc:55
-#: ../purchasing/includes/ui/po_ui.inc:344
+#: ../purchasing/includes/ui/grn_ui.inc:34
+#: ../purchasing/includes/ui/grn_ui.inc:79
+#: ../purchasing/includes/ui/po_ui.inc:353
 #: ../purchasing/view/view_supp_credit.php:44
-#: ../purchasing/view/view_supp_invoice.php:47
-#: ../purchasing/inquiry/po_search_completed.php:120
-#: ../purchasing/inquiry/po_search.php:134
-#: ../purchasing/inquiry/supplier_inquiry.php:166
+#: ../purchasing/view/view_supp_invoice.php:48
+#: ../purchasing/inquiry/po_search_completed.php:127
+#: ../purchasing/inquiry/po_search.php:136
+#: ../purchasing/inquiry/supplier_inquiry.php:177
+#: ../reporting/includes/doctext.inc:164
+#: ../reporting/includes/doctext.inc:187
 msgid "Supplier's Reference"
 msgstr ""
 
-#: ../purchasing/includes/ui/grn_ui.inc:62
-#: ../purchasing/includes/ui/po_ui.inc:348
-#: ../sales/view/view_sales_order.php:78
+#: ../purchasing/includes/ui/grn_ui.inc:38
+#: ../purchasing/includes/ui/grn_ui.inc:81
+#: ../purchasing/includes/ui/po_ui.inc:357
+#: ../sales/view/view_sales_order.php:92
 msgid "Delivery Address"
 msgstr ""
 
-#: ../purchasing/includes/ui/grn_ui.inc:65
-#: ../purchasing/includes/ui/po_ui.inc:352
+#: ../purchasing/includes/ui/grn_ui.inc:41
+#: ../purchasing/includes/ui/grn_ui.inc:84
+#: ../purchasing/includes/ui/po_ui.inc:369
 msgid "Order Comments"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:96
-#: ../purchasing/includes/ui/invoice_ui.inc:99
+#: ../purchasing/includes/ui/grn_ui.inc:74
+msgid "Date Items Received"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:123
+msgid "Source Invoices:"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:125
 msgid "Supplier's Ref.:"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:114
+#: ../purchasing/includes/ui/invoice_ui.inc:140
 msgid "Terms:"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:126
-#: ../purchasing/manage/suppliers.php:92
-#: ../purchasing/manage/suppliers.php:97
+#: ../purchasing/includes/ui/invoice_ui.inc:152
+#: ../purchasing/manage/suppliers.php:101
+#: ../purchasing/manage/suppliers.php:106
 msgid "Supplier's Currency:"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:130
-#: ../purchasing/manage/suppliers.php:99
-#: ../sales/manage/customer_branches.php:246
+#: ../purchasing/includes/ui/invoice_ui.inc:156
+#: ../purchasing/manage/suppliers.php:108
+#: ../sales/manage/customer_branches.php:247
+#: ../sales/manage/customers.php:298
 msgid "Tax Group:"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:145
+#: ../purchasing/includes/ui/invoice_ui.inc:174
 msgid "Sub-total:"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:153
+#: ../purchasing/includes/ui/invoice_ui.inc:182
 msgid "Invoice Total:"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:156
+#: ../purchasing/includes/ui/invoice_ui.inc:185
 #: ../sales/customer_credit_invoice.php:330
 #: ../sales/includes/ui/sales_credit_ui.inc:233
 msgid "Credit Note Total"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:187
+#: ../purchasing/includes/ui/invoice_ui.inc:190
+#: ../purchasing/includes/ui/po_ui.inc:489
+#: ../purchasing/po_entry_items.php:481
+msgid "Tax algorithm:"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:222
 msgid "Add GL Line"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:188
+#: ../purchasing/includes/ui/invoice_ui.inc:223
 msgid "Reset"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:189
-#: ../purchasing/po_receive_items.php:327
+#: ../purchasing/includes/ui/invoice_ui.inc:224
+#: ../purchasing/po_receive_items.php:333
 msgid "Clear all GL entry fields"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:207
+#: ../purchasing/includes/ui/invoice_ui.inc:242
 msgid "GL Items for this Invoice"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:209
+#: ../purchasing/includes/ui/invoice_ui.inc:244
 msgid "GL Items for this Credit Note"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:219
+#: ../purchasing/includes/ui/invoice_ui.inc:254
 msgid "Quick Entry:"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:391
+#: ../purchasing/includes/ui/invoice_ui.inc:427
 msgid "Add to Invoice"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:393
+#: ../purchasing/includes/ui/invoice_ui.inc:429
 msgid "Add to Credit Note"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:395
-#: ../sales/customer_invoice.php:501
+#: ../purchasing/includes/ui/invoice_ui.inc:431
+#: ../sales/customer_invoice.php:612
 msgid "Remove"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:395
-#: ../purchasing/includes/ui/invoice_ui.inc:430
+#: ../purchasing/includes/ui/invoice_ui.inc:431
+#: ../purchasing/includes/ui/invoice_ui.inc:466
 msgid ""
 "WARNING! Be careful with removal. The operation is executed immediately and "
 "cannot be undone !!!"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:397
+#: ../purchasing/includes/ui/invoice_ui.inc:433
 #, php-format
 msgid ""
 "You are about to remove all yet non-invoiced items from delivery line #%d. "
@@ -9720,427 +10452,459 @@ msgid ""
 "continue ?"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:428
+#: ../purchasing/includes/ui/invoice_ui.inc:464
 msgid "Items Received Yet to be Invoiced"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:433
+#: ../purchasing/includes/ui/invoice_ui.inc:469
 msgid "Delivery Item Selected For Adding To A Supplier Credit Note"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:438
+#: ../purchasing/includes/ui/invoice_ui.inc:474
 msgid "Received Items Charged on this Invoice"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:440
+#: ../purchasing/includes/ui/invoice_ui.inc:476
 msgid "Received Items Credited on this Note"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:450
+#: ../purchasing/includes/ui/invoice_ui.inc:486
 msgid "Received between"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:461
+#: ../purchasing/includes/ui/invoice_ui.inc:498
 msgid "Add All Items"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:470
-#: ../purchasing/includes/ui/invoice_ui.inc:482
-#: ../sales/inquiry/sales_orders_view.php:150
+#: ../purchasing/includes/ui/invoice_ui.inc:507
+#: ../purchasing/includes/ui/invoice_ui.inc:519
+#: ../reporting/rep308.php:230
+#: ../sales/inquiry/sales_orders_view.php:167
 msgid "Delivery"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:470
+#: ../purchasing/includes/ui/invoice_ui.inc:507
 msgid "Sequence #"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:470
+#: ../purchasing/includes/ui/invoice_ui.inc:507
 msgid "P.O."
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:471
+#: ../purchasing/includes/ui/invoice_ui.inc:508
 msgid "Received On"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:471
+#: ../purchasing/includes/ui/invoice_ui.inc:508
 #: ../purchasing/view/view_po.php:46
 msgid "Quantity Received"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:471
+#: ../purchasing/includes/ui/invoice_ui.inc:508
 #: ../purchasing/view/view_grn.php:41
 #: ../purchasing/view/view_po.php:46
 msgid "Quantity Invoiced"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:472
+#: ../purchasing/includes/ui/invoice_ui.inc:509
 msgid "Qty Yet To Invoice"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:472
-#: ../purchasing/includes/ui/po_ui.inc:238
-#: ../sales/includes/ui/sales_order_ui.inc:142
+#: ../purchasing/includes/ui/invoice_ui.inc:509
+#: ../purchasing/includes/ui/po_ui.inc:247
+#: ../sales/includes/ui/sales_order_ui.inc:148
 msgid "Price after Tax"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:472
-#: ../purchasing/includes/ui/po_ui.inc:238
-#: ../sales/includes/ui/sales_order_ui.inc:142
+#: ../purchasing/includes/ui/invoice_ui.inc:509
+#: ../purchasing/includes/ui/po_ui.inc:247
+#: ../sales/includes/ui/sales_order_ui.inc:148
 msgid "Price before Tax"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:478
+#: ../purchasing/includes/ui/invoice_ui.inc:515
 msgid "Qty Yet To Credit"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:483
+#: ../purchasing/includes/ui/invoice_ui.inc:520
 msgid "Line Value"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:550
+#: ../purchasing/includes/ui/invoice_ui.inc:588
 msgid ""
 "There are no outstanding items received from this supplier that have not "
 "been invoiced by them."
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:553
+#: ../purchasing/includes/ui/invoice_ui.inc:591
 msgid ""
 "There are no received items for the selected supplier that have been "
 "invoiced."
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:554
+#: ../purchasing/includes/ui/invoice_ui.inc:592
 msgid "Credits can only be applied to invoiced items."
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:149
-msgid "Supplier Currency:"
-msgstr ""
-
-#: ../purchasing/includes/ui/po_ui.inc:178
-#: ../sales/sales_order_entry.php:660
+#: ../purchasing/includes/ui/po_ui.inc:166
+#: ../sales/sales_order_entry.php:727
 msgid "Order Date:"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:179
-#: ../sales/sales_order_entry.php:647
+#: ../purchasing/includes/ui/po_ui.inc:167
+#: ../sales/sales_order_entry.php:714
 msgid "Delivery Date:"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:179
-#: ../sales/sales_order_entry.php:641
+#: ../purchasing/includes/ui/po_ui.inc:167
+#: ../sales/sales_order_entry.php:708
 msgid "Invoice Date:"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:190
+#: ../purchasing/includes/ui/po_ui.inc:180
+msgid "Supplier Currency:"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:199
 msgid "Due Date:"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:192
+#: ../purchasing/includes/ui/po_ui.inc:201
 msgid "Supplier's Reference:"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:193
+#: ../purchasing/includes/ui/po_ui.inc:202
 msgid "Receive Into:"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:218
+#: ../purchasing/includes/ui/po_ui.inc:227
 msgid ""
 "The default stock location set up for this user is not a currently defined "
 "stock location. Your system administrator needs to amend your user record."
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:222
+#: ../purchasing/includes/ui/po_ui.inc:231
 msgid "Deliver to:"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:231
+#: ../purchasing/includes/ui/po_ui.inc:240
 msgid "Order Items"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:237
+#: ../purchasing/includes/ui/po_ui.inc:246
 #: ../purchasing/po_receive_items.php:62
 msgid "Received"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:238
-#: ../sales/includes/ui/sales_order_ui.inc:608
+#: ../purchasing/includes/ui/po_ui.inc:247
+#: ../sales/includes/ui/sales_order_ui.inc:602
 msgid "Required Delivery Date"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:238
+#: ../purchasing/includes/ui/po_ui.inc:247
 #: ../purchasing/view/view_grn.php:41
 #: ../purchasing/view/view_po.php:46
 msgid "Line Total"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:289
+#: ../purchasing/includes/ui/po_ui.inc:298
 #: ../purchasing/po_receive_items.php:114
-#: ../reporting/includes/doctext.inc:147
+#: ../reporting/rep107.php:231
+#: ../reporting/rep109.php:155
+#: ../reporting/rep110.php:159
+#: ../reporting/rep111.php:152
+#: ../reporting/rep113.php:144
+#: ../reporting/rep209.php:162
 #: ../sales/customer_credit_invoice.php:322
-#: ../sales/customer_delivery.php:487
-#: ../sales/customer_invoice.php:542
+#: ../sales/customer_delivery.php:541
+#: ../sales/customer_invoice.php:656
 #: ../sales/view/view_dispatch.php:146
-#: ../sales/view/view_invoice.php:148
+#: ../sales/view/view_invoice.php:150
 #: ../sales/includes/ui/sales_credit_ui.inc:217
-#: ../sales/includes/ui/sales_order_ui.inc:229
+#: ../sales/includes/ui/sales_order_ui.inc:224
 msgid "Sub-total"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:298
+#: ../purchasing/includes/ui/po_ui.inc:307
 #: ../purchasing/po_receive_items.php:122
 #: ../purchasing/view/view_grn.php:79
 #: ../purchasing/view/view_po.php:93
-#: ../sales/customer_delivery.php:494
-#: ../sales/view/view_sales_order.php:243
-#: ../sales/includes/ui/sales_order_ui.inc:236
+#: ../sales/customer_delivery.php:548
+#: ../sales/view/view_sales_order.php:262
+#: ../sales/includes/ui/sales_order_ui.inc:231
 msgid "Amount Total"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:299
-#: ../purchasing/allocations/supplier_allocate.php:64
-#: ../sales/allocations/customer_allocate.php:63
-#: ../sales/includes/ui/sales_order_ui.inc:237
+#: ../purchasing/includes/ui/po_ui.inc:308
+#: ../purchasing/allocations/supplier_allocate.php:74
+#: ../sales/allocations/customer_allocate.php:72
+#: ../sales/includes/ui/sales_order_ui.inc:232
 msgid "Refresh"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:38
+#: ../purchasing/includes/ui/po_ui.inc:363
+#: ../sales/view/view_sales_order.php:83
+msgid "Required Pre-Payment"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:364
+msgid "Pre-Payments Allocated"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:490
+#: ../purchasing/po_entry_items.php:482
+#: ../sales/customer_invoice.php:463
+#: ../sales/includes/ui/sales_order_ui.inc:398
+#: ../sales/includes/ui/sales_order_ui.inc:400
+msgid "Payment:"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:490
+#: ../purchasing/po_entry_items.php:482
+msgid "Delayed"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:492
+#: ../sales/includes/ui/sales_order_ui.inc:613
+#: ../sales/includes/ui/sales_order_ui.inc:615
+msgid "Pre-Payment Required:"
+msgstr ""
+
+#: ../purchasing/po_entry_items.php:41
 msgid "Modify Purchase Order #"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:43
+#: ../purchasing/po_entry_items.php:46
 msgid "Purchase Order Entry"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:48
+#: ../purchasing/po_entry_items.php:51
 msgid "Direct GRN Entry"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:53
+#: ../purchasing/po_entry_items.php:56
 msgid "Direct Purchase Invoice Entry"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:74
+#: ../purchasing/po_entry_items.php:80
 msgid "Purchase Order has been entered"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:76
+#: ../purchasing/po_entry_items.php:82
 msgid "Purchase Order has been updated"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:77
+#: ../purchasing/po_entry_items.php:83
 msgid "&View this order"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:79
-#: ../sales/sales_order_entry.php:105
-#: ../sales/sales_order_entry.php:125
+#: ../purchasing/po_entry_items.php:85
+#: ../sales/sales_order_entry.php:119
+#: ../sales/sales_order_entry.php:139
 msgid "&Print This Order"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:81
-#: ../sales/sales_order_entry.php:106
-#: ../sales/sales_order_entry.php:126
+#: ../purchasing/po_entry_items.php:87
+#: ../sales/sales_order_entry.php:120
+#: ../sales/sales_order_entry.php:140
 msgid "&Email This Order"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:83
+#: ../purchasing/po_entry_items.php:89
 msgid "&Receive Items on this Purchase Order"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:85
+#: ../purchasing/po_entry_items.php:91
 msgid "Enter &Another Purchase Order"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:87
+#: ../purchasing/po_entry_items.php:93
 msgid "Select An &Outstanding Purchase Order"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:96
+#: ../purchasing/po_entry_items.php:102
 msgid "Direct GRN has been entered"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:98
+#: ../purchasing/po_entry_items.php:104
 msgid "&View this GRN"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:102
+#: ../purchasing/po_entry_items.php:108
 #: ../purchasing/po_receive_items.php:40
 msgid "View the GL Journal Entries for this Delivery"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:107
+#: ../purchasing/po_entry_items.php:113
 #: ../purchasing/po_receive_items.php:42
 msgid "Entry purchase &invoice for this receival"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:109
-#: ../purchasing/po_entry_items.php:133
-#: ../purchasing/supplier_credit.php:49
-#: ../purchasing/supplier_invoice.php:52
-msgid "Add an Attachment"
-msgstr ""
-
-#: ../purchasing/po_entry_items.php:112
+#: ../purchasing/po_entry_items.php:118
 msgid "Enter &Another GRN"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:121
+#: ../purchasing/po_entry_items.php:127
 msgid "Direct Purchase Invoice has been entered"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:123
+#: ../purchasing/po_entry_items.php:129
 msgid "&View this Invoice"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:128
-#: ../purchasing/supplier_invoice.php:46
+#: ../purchasing/po_entry_items.php:134
+#: ../purchasing/supplier_invoice.php:69
 msgid "View the GL Journal Entries for this Invoice"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:130
-#: ../purchasing/supplier_invoice.php:48
-msgid "Entry supplier &payment for this invoice"
-msgstr ""
-
-#: ../purchasing/po_entry_items.php:136
+#: ../purchasing/po_entry_items.php:139
 msgid "Enter &Another Direct Invoice"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:168
+#: ../purchasing/po_entry_items.php:171
 msgid ""
 "This item cannot be deleted because some of it has already been received."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:183
+#: ../purchasing/po_entry_items.php:186
 msgid ""
 "This order cannot be cancelled because some of it has already been received."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:184
+#: ../purchasing/po_entry_items.php:187
 msgid ""
 "The line item quantities may be modified to quantities more than already "
 "received. prices cannot be altered for lines that have already been received "
 "and quantities cannot be reduced below the quantity already received."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:199
+#: ../purchasing/po_entry_items.php:202
 msgid "This purchase order has been cancelled."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:201
+#: ../purchasing/po_entry_items.php:204
 msgid "Enter a new purchase order"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:213
-#: ../sales/sales_order_entry.php:457
+#: ../purchasing/po_entry_items.php:216
+#: ../sales/sales_order_entry.php:520
 msgid "Item description cannot be empty."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:223
+#: ../purchasing/po_entry_items.php:226
 msgid "The quantity of the order item must be numeric and not less than "
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:230
+#: ../purchasing/po_entry_items.php:233
 msgid "The price entered must be numeric and not less than zero."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:254
+#: ../purchasing/po_entry_items.php:257
 msgid ""
 "You are attempting to make the quantity ordered a quantity less than has "
 "already been invoiced or received.  This is prohibited."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:255
+#: ../purchasing/po_entry_items.php:258
 msgid ""
 "The quantity received can only be modified by entering a negative receipt "
 "and the quantity invoiced can only be reduced by entering a credit note "
 "against this item."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:283
+#: ../purchasing/po_entry_items.php:286
 msgid "The selected item is already on this order."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:310
+#: ../purchasing/po_entry_items.php:313
 msgid ""
 "The selected item does not exist or it is a kit part and therefore cannot be "
 "purchased."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:326
-#: ../purchasing/supplier_invoice.php:352
-#: ../purchasing/supplier_payment.php:118
+#: ../purchasing/po_entry_items.php:329
+#: ../purchasing/supplier_invoice.php:394
+#: ../purchasing/supplier_payment.php:123
 msgid "There is no supplier selected."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:333
+#: ../purchasing/po_entry_items.php:336
 msgid "The entered order date is invalid."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:340
+#: ../purchasing/po_entry_items.php:349
 msgid "The entered due date is invalid."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:349
+#: ../purchasing/po_entry_items.php:358
 msgid "There is no reference entered for this purchase order."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:364
-#: ../purchasing/supplier_invoice.php:161
+#: ../purchasing/po_entry_items.php:373
+#: ../purchasing/supplier_invoice.php:197
 msgid "You must enter a supplier's invoice reference."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:370
+#: ../purchasing/po_entry_items.php:380
+#: ../purchasing/supplier_invoice.php:223
+msgid ""
+"This invoice number has already been entered. It cannot be entered again."
+msgstr ""
+
+#: ../purchasing/po_entry_items.php:386
 msgid "There is no delivery address specified."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:376
+#: ../purchasing/po_entry_items.php:392
 msgid "There is no location specified to move any items into."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:383
+#: ../purchasing/po_entry_items.php:400
 msgid ""
 "The order cannot be placed because there are no lines entered on this order."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:509
-#: ../sales/sales_order_entry.php:664
+#: ../purchasing/po_entry_items.php:405
+msgid "Required prepayment is greater than total invoice value."
+msgstr ""
+
+#: ../purchasing/po_entry_items.php:490
+#: ../sales/sales_order_entry.php:731
 msgid "Place Order"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:510
+#: ../purchasing/po_entry_items.php:491
 msgid "Update Order"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:511
-#: ../sales/sales_order_entry.php:663
+#: ../purchasing/po_entry_items.php:492
+#: ../sales/sales_order_entry.php:730
 msgid "Cancel Order"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:513
+#: ../purchasing/po_entry_items.php:494
 msgid "Process GRN"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:514
+#: ../purchasing/po_entry_items.php:495
 msgid "Update GRN"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:515
+#: ../purchasing/po_entry_items.php:496
 msgid "Cancel GRN"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:518
-#: ../sales/customer_invoice.php:561
+#: ../purchasing/po_entry_items.php:499
+#: ../sales/customer_invoice.php:695
 msgid "Process Invoice"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:519
+#: ../purchasing/po_entry_items.php:500
 msgid "Update Invoice"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:520
-#: ../sales/sales_order_entry.php:644
+#: ../purchasing/po_entry_items.php:501
+#: ../sales/sales_order_entry.php:711
 msgid "Cancel Invoice"
 msgstr ""
 
@@ -10167,44 +10931,44 @@ msgid ""
 msgstr ""
 
 #: ../purchasing/po_receive_items.php:62
-#: ../reporting/rep105.php:112
-#: ../sales/customer_delivery.php:418
+#: ../reporting/rep105.php:114
+#: ../sales/customer_delivery.php:456
 msgid "Ordered"
 msgstr ""
 
 #: ../purchasing/po_receive_items.php:63
-#: ../reporting/rep101.php:131
-#: ../reporting/rep105.php:113
-#: ../reporting/rep105.php:167
-#: ../reporting/rep201.php:119
-#: ../reporting/includes/doctext.inc:117
+#: ../reporting/rep101.php:119
+#: ../reporting/rep105.php:115
+#: ../reporting/rep105.php:166
+#: ../reporting/rep201.php:111
+#: ../reporting/includes/doctext.inc:247
 msgid "Outstanding"
 msgstr ""
 
 #: ../purchasing/po_receive_items.php:63
-#: ../sales/customer_delivery.php:419
+#: ../sales/customer_delivery.php:457
 msgid "This Delivery"
 msgstr ""
 
 #: ../purchasing/po_receive_items.php:168
-#: ../purchasing/po_receive_items.php:217
+#: ../purchasing/po_receive_items.php:222
 msgid ""
 "There is nothing to process. Please enter valid quantities greater than zero."
 msgstr ""
 
-#: ../purchasing/po_receive_items.php:222
+#: ../purchasing/po_receive_items.php:227
 msgid ""
 "Entered quantities cannot be greater than the quantity entered on the "
 "purchase order including the allowed over-receive percentage"
 msgstr ""
 
-#: ../purchasing/po_receive_items.php:224
+#: ../purchasing/po_receive_items.php:229
 msgid ""
 "Modify the ordered items on the purchase order if you wish to increase the "
 "quantities."
 msgstr ""
 
-#: ../purchasing/po_receive_items.php:242
+#: ../purchasing/po_receive_items.php:247
 msgid ""
 "This order has been changed or invoiced since this delivery was started to "
 "be actioned. Processing halted. To enter a delivery against this purchase "
@@ -10212,162 +10976,166 @@ msgid ""
 "by the other user."
 msgstr ""
 
-#: ../purchasing/po_receive_items.php:245
+#: ../purchasing/po_receive_items.php:250
 msgid "Select a different purchase order for receiving goods against"
 msgstr ""
 
-#: ../purchasing/po_receive_items.php:248
+#: ../purchasing/po_receive_items.php:253
 msgid "Re-Read the updated purchase order for receiving goods against"
 msgstr ""
 
-#: ../purchasing/po_receive_items.php:322
+#: ../purchasing/po_receive_items.php:328
 msgid "Items to Receive"
 msgstr ""
 
-#: ../purchasing/po_receive_items.php:327
+#: ../purchasing/po_receive_items.php:333
 msgid "Process Receive Items"
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:43
+#: ../purchasing/supplier_credit.php:77
 msgid "Supplier credit note has been processed."
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:44
+#: ../purchasing/supplier_credit.php:78
 msgid "View this Credit Note"
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:46
+#: ../purchasing/supplier_credit.php:80
 msgid "View the GL Journal Entries for this Credit Note"
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:48
+#: ../purchasing/supplier_credit.php:82
 msgid "Enter Another Credit Note"
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:102
-#: ../purchasing/supplier_invoice.php:102
+#: ../purchasing/supplier_credit.php:127
+#: ../purchasing/supplier_invoice.php:137
 msgid ""
 "The account code entered is not a valid code, this line cannot be added to "
 "the transaction."
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:112
-#: ../purchasing/supplier_invoice.php:112
+#: ../purchasing/supplier_credit.php:137
+#: ../purchasing/supplier_invoice.php:147
 msgid ""
 "The amount entered is not numeric. This line cannot be added to the "
 "transaction."
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:142
+#: ../purchasing/supplier_credit.php:168
 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:149
+#: ../purchasing/supplier_credit.php:175
 msgid "You must enter an credit note reference."
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:163
+#: ../purchasing/supplier_credit.php:189
 msgid "You must enter a supplier's credit note reference."
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:170
+#: ../purchasing/supplier_credit.php:196
 msgid ""
 "The credit note as entered cannot be processed because the date entered is "
 "not valid."
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:182
-#: ../purchasing/supplier_invoice.php:180
+#: ../purchasing/supplier_credit.php:208
+#: ../purchasing/supplier_invoice.php:216
 msgid ""
 "The invoice as entered cannot be processed because the due date is in an "
 "incorrect format."
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:189
+#: ../purchasing/supplier_credit.php:215
 msgid ""
 "The credit note total as entered is less than the sum of the the general "
 "ledger entires (if any) and the charges for goods received. There must be a "
 "mistake somewhere, the credit note as entered will not be processed."
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:201
+#: ../purchasing/supplier_credit.php:226
 msgid ""
 "The return cannot be processed because there is an insufficient quantity for "
 "item:"
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:245
+#: ../purchasing/supplier_credit.php:269
 msgid "The quantity to credit must be numeric and greater than zero."
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:252
+#: ../purchasing/supplier_credit.php:276
 msgid "The price is either not numeric or negative."
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:354
+#: ../purchasing/supplier_credit.php:378
 msgid "Enter Credit Note"
 msgstr ""
 
-#: ../purchasing/supplier_invoice.php:28
+#: ../purchasing/supplier_invoice.php:43
 msgid "Enter Supplier Invoice"
 msgstr ""
 
-#: ../purchasing/supplier_invoice.php:43
+#: ../purchasing/supplier_invoice.php:48
+#, php-format
+msgid "Modifying Purchase Invoice # %d"
+msgstr ""
+
+#: ../purchasing/supplier_invoice.php:66
 msgid "Supplier invoice has been processed."
 msgstr ""
 
-#: ../purchasing/supplier_invoice.php:44
+#: ../purchasing/supplier_invoice.php:67
 msgid "View this Invoice"
 msgstr ""
 
-#: ../purchasing/supplier_invoice.php:50
+#: ../purchasing/supplier_invoice.php:71
+msgid "Entry supplier &payment for this invoice"
+msgstr ""
+
+#: ../purchasing/supplier_invoice.php:74
 msgid "Enter Another Invoice"
 msgstr ""
 
-#: ../purchasing/supplier_invoice.php:141
+#: ../purchasing/supplier_invoice.php:177
 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:147
+#: ../purchasing/supplier_invoice.php:183
 msgid "You must enter an invoice reference."
 msgstr ""
 
-#: ../purchasing/supplier_invoice.php:168
+#: ../purchasing/supplier_invoice.php:204
 msgid ""
 "The invoice as entered cannot be processed because the invoice date is in an "
 "incorrect format."
 msgstr ""
 
-#: ../purchasing/supplier_invoice.php:187
-msgid ""
-"This invoice number has already been entered. It cannot be entered again."
-msgstr ""
-
-#: ../purchasing/supplier_invoice.php:224
+#: ../purchasing/supplier_invoice.php:265
 msgid "The quantity to invoice must be numeric and greater than zero."
 msgstr ""
 
-#: ../purchasing/supplier_invoice.php:231
+#: ../purchasing/supplier_invoice.php:272
 msgid "The price is not numeric."
 msgstr ""
 
-#: ../purchasing/supplier_invoice.php:244
+#: ../purchasing/supplier_invoice.php:285
 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:245
-#: ../purchasing/supplier_invoice.php:258
+#: ../purchasing/supplier_invoice.php:286
+#: ../purchasing/supplier_invoice.php:299
 msgid "The over-charge percentage allowance is :"
 msgstr ""
 
-#: ../purchasing/supplier_invoice.php:257
+#: ../purchasing/supplier_invoice.php:298
 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 "
@@ -10375,12 +11143,12 @@ msgid ""
 "necessary."
 msgstr ""
 
-#: ../purchasing/supplier_invoice.php:334
+#: ../purchasing/supplier_invoice.php:376
 #, php-format
 msgid "All yet non-invoiced items on delivery line # %d has been removed."
 msgstr ""
 
-#: ../purchasing/supplier_invoice.php:376
+#: ../purchasing/supplier_invoice.php:418
 msgid "Enter Invoice"
 msgstr ""
 
@@ -10388,72 +11156,94 @@ msgstr ""
 msgid "Supplier Payment Entry"
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:89
+#: ../purchasing/supplier_payment.php:92
 msgid "Invalid purchase invoice number."
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:96
+#: ../purchasing/supplier_payment.php:98
 msgid "Payment has been sucessfully entered"
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:98
+#: ../purchasing/supplier_payment.php:100
 msgid "&Print This Remittance"
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:99
+#: ../purchasing/supplier_payment.php:101
 msgid "&Email This Remittance"
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:101
+#: ../purchasing/supplier_payment.php:103
+msgid "View this Payment"
+msgstr ""
+
+#: ../purchasing/supplier_payment.php:104
 msgid "View the GL &Journal Entries for this Payment"
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:105
+#: ../purchasing/supplier_payment.php:106
 msgid "Enter another supplier &payment"
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:152
-#: ../sales/customer_payments.php:139
-msgid "The exchange rate must be numeric and greater than zero."
+#: ../purchasing/supplier_payment.php:107
+#: ../sales/customer_payments.php:106
+msgid "Enter Other &Payment"
+msgstr ""
+
+#: ../purchasing/supplier_payment.php:108
+msgid "Enter &Customer Payment"
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:164
+#: ../purchasing/supplier_payment.php:109
+#: ../sales/customer_payments.php:104
+msgid "Enter Other &Deposit"
+msgstr ""
+
+#: ../purchasing/supplier_payment.php:110
+#: ../sales/customer_payments.php:107
+msgid "Bank Account &Transfer"
+msgstr ""
+
+#: ../purchasing/supplier_payment.php:162
 msgid "The entered discount is invalid or less than zero."
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:172
+#: ../purchasing/supplier_payment.php:170
 msgid ""
 "The total of the amount and the discount is zero or negative. Please enter "
 "positive values."
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:273
+#: ../purchasing/supplier_payment.php:177
+msgid "The entered bank amount is zero or negative."
+msgstr ""
+
+#: ../purchasing/supplier_payment.php:275
 msgid "Payment To:"
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:277
+#: ../purchasing/supplier_payment.php:290
 msgid "From Bank Account:"
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:283
+#: ../purchasing/supplier_payment.php:296
 #: ../purchasing/view/view_supp_payment.php:55
 msgid "Date Paid"
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:306
-#: ../sales/customer_payments.php:287
-msgid "Amount of Discount:"
+#: ../purchasing/supplier_payment.php:310
+msgid "Bank Amount:"
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:307
-msgid "Amount of Payment:"
+#: ../purchasing/supplier_payment.php:323
+#: ../sales/customer_payments.php:398
+msgid "Amount of Discount:"
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:313
-msgid "The amount and discount are in the bank account's currency."
+#: ../purchasing/supplier_payment.php:324
+msgid "Amount of Payment:"
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:316
+#: ../purchasing/supplier_payment.php:328
 msgid "Enter Payment"
 msgstr ""
 
@@ -10468,23 +11258,24 @@ msgstr ""
 
 #: ../purchasing/view/view_grn.php:37
 #: ../purchasing/view/view_po.php:41
-#: ../sales/view/view_sales_order.php:197
+#: ../sales/view/view_sales_order.php:216
 msgid "Line Details"
 msgstr ""
 
 #: ../purchasing/view/view_grn.php:40
-#: ../reporting/includes/doctext.inc:36
-#: ../reporting/includes/doctext.inc:103
-#: ../sales/inquiry/sales_deliveries_view.php:186
+#: ../reporting/includes/doctext.inc:77
+#: ../reporting/includes/doctext.inc:192
+#: ../reporting/includes/doctext.inc:244
+#: ../sales/inquiry/sales_deliveries_view.php:188
 msgid "Delivery Date"
 msgstr ""
 
 #: ../purchasing/view/view_grn.php:70
 #: ../purchasing/view/view_po.php:84
 #: ../purchasing/view/view_supp_credit.php:60
-#: ../purchasing/view/view_supp_invoice.php:65
+#: ../purchasing/view/view_supp_invoice.php:66
 #: ../sales/view/view_credit.php:136
-#: ../sales/view/view_sales_order.php:233
+#: ../sales/view/view_sales_order.php:252
 msgid "Sub Total"
 msgstr ""
 
@@ -10505,18 +11296,18 @@ msgid "Requested By"
 msgstr ""
 
 #: ../purchasing/view/view_po.php:100
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:147
-#: ../purchasing/inquiry/supplier_inquiry.php:187
-#: ../sales/inquiry/customer_allocation_inquiry.php:162
-#: ../sales/inquiry/customer_inquiry.php:239
-#: ../sales/inquiry/sales_deliveries_view.php:206
-#: ../sales/inquiry/sales_orders_view.php:307
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:148
+#: ../purchasing/inquiry/supplier_inquiry.php:197
+#: ../sales/inquiry/customer_allocation_inquiry.php:165
+#: ../sales/inquiry/customer_inquiry.php:227
+#: ../sales/inquiry/sales_deliveries_view.php:208
+#: ../sales/inquiry/sales_orders_view.php:345
 msgid "Marked items are overdue."
 msgstr ""
 
 #: ../purchasing/view/view_po.php:113
-#: ../sales/view/view_invoice.php:97
-#: ../sales/view/view_sales_order.php:50
+#: ../sales/view/view_invoice.php:98
+#: ../sales/view/view_sales_order.php:51
 msgid "Deliveries"
 msgstr ""
 
@@ -10525,7 +11316,7 @@ msgid "Delivered On"
 msgstr ""
 
 #: ../purchasing/view/view_po.php:138
-#: ../sales/view/view_sales_order.php:52
+#: ../sales/view/view_sales_order.php:53
 msgid "Invoices/Credits"
 msgstr ""
 
@@ -10538,9 +11329,10 @@ msgid "SUPPLIER CREDIT NOTE"
 msgstr ""
 
 #: ../purchasing/view/view_supp_credit.php:47
-#: ../purchasing/view/view_supp_invoice.php:50
+#: ../purchasing/view/view_supp_invoice.php:51
+#: ../reporting/includes/doctext.inc:141
 #: ../sales/customer_credit_invoice.php:268
-#: ../sales/view/view_invoice.php:95
+#: ../sales/view/view_invoice.php:100
 msgid "Invoice Date"
 msgstr ""
 
@@ -10553,22 +11345,23 @@ msgstr ""
 msgid "This credit note has been voided."
 msgstr ""
 
-#: ../purchasing/view/view_supp_invoice.php:23
+#: ../purchasing/view/view_supp_invoice.php:24
 msgid "View Supplier Invoice"
 msgstr ""
 
-#: ../purchasing/view/view_supp_invoice.php:40
+#: ../purchasing/view/view_supp_invoice.php:41
 msgid "SUPPLIER INVOICE"
 msgstr ""
 
-#: ../purchasing/view/view_supp_invoice.php:72
-#: ../reporting/includes/doctext.inc:151
-#: ../sales/view/view_invoice.php:164
+#: ../purchasing/view/view_supp_invoice.php:73
+#: ../reporting/rep107.php:280
+#: ../reporting/rep107.php:286
+#: ../sales/view/view_invoice.php:166
 msgid "TOTAL INVOICE"
 msgstr ""
 
-#: ../purchasing/view/view_supp_invoice.php:76
-#: ../sales/view/view_invoice.php:168
+#: ../purchasing/view/view_supp_invoice.php:77
+#: ../sales/view/view_invoice.php:170
 msgid "This invoice has been voided."
 msgstr ""
 
@@ -10585,47 +11378,49 @@ msgid "To Supplier"
 msgstr ""
 
 #: ../purchasing/view/view_supp_payment.php:59
-#: ../sales/view/view_receipt.php:43
 msgid "Payment Currency"
 msgstr ""
 
-#: ../purchasing/view/view_supp_payment.php:66
+#: ../purchasing/view/view_supp_payment.php:62
+#: ../reporting/rep112.php:150
+#: ../reporting/rep210.php:159
+#: ../sales/customer_delivery.php:457
+#: ../sales/customer_invoice.php:551
+#: ../sales/customer_invoice.php:554
+#: ../sales/view/view_receipt.php:45
+#: ../sales/view/view_sales_order.php:220
+msgid "Discount"
+msgstr ""
+
+#: ../purchasing/view/view_supp_payment.php:69
 msgid "Supplier's Currency"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:21
+#: ../purchasing/manage/suppliers.php:27
 #: ../sales/manage/customer_branches.php:33
 msgid ""
 "There are no tax groups defined in the system. At least one tax group is "
 "required before proceeding."
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:83
+#: ../purchasing/manage/suppliers.php:91
 msgid "Basic Data"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:85
+#: ../purchasing/manage/suppliers.php:93
 msgid "Supplier Name:"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:86
+#: ../purchasing/manage/suppliers.php:94
 msgid "Supplier Short Name:"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:89
+#: ../purchasing/manage/suppliers.php:97
 msgid "Website:"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:100
-msgid "Our Customer No:"
-msgstr ""
-
-#: ../purchasing/manage/suppliers.php:103
-msgid "Contact Data"
-msgstr ""
-
 #: ../purchasing/manage/suppliers.php:109
-msgid "System default"
+msgid "Our Customer No:"
 msgstr ""
 
 #: ../purchasing/manage/suppliers.php:111
@@ -10637,12 +11432,12 @@ msgid "Bank Name/Account:"
 msgstr ""
 
 #: ../purchasing/manage/suppliers.php:113
-#: ../sales/manage/customers.php:228
+#: ../sales/manage/customers.php:268
 msgid "Credit Limit:"
 msgstr ""
 
 #: ../purchasing/manage/suppliers.php:114
-#: ../sales/manage/customers.php:230
+#: ../sales/manage/customers.php:270
 msgid "Payment Terms:"
 msgstr ""
 
@@ -10652,123 +11447,137 @@ msgid "Prices contain tax included:"
 msgstr ""
 
 #: ../purchasing/manage/suppliers.php:125
-#: ../reporting/rep704.php:91
-#: ../reporting/rep704.php:101
-#: ../reporting/rep704.php:109
+msgid "Tax Calculation Algorithm:"
+msgstr ""
+
+#: ../purchasing/manage/suppliers.php:129
+#: ../reporting/rep704.php:96
+#: ../reporting/rep704.php:106
+#: ../reporting/rep704.php:114
 msgid "Accounts"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:126
+#: ../purchasing/manage/suppliers.php:130
 msgid "Accounts Payable Account:"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:127
+#: ../purchasing/manage/suppliers.php:131
 msgid "Purchase Account:"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:128
+#: ../purchasing/manage/suppliers.php:132
 msgid "Use Item Inventory/COGS Account"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:146
-#: ../sales/manage/customer_branches.php:266
+#: ../purchasing/manage/suppliers.php:135
+#: ../purchasing/manage/suppliers.php:139
+msgid "Contact Data"
+msgstr ""
+
+#: ../purchasing/manage/suppliers.php:142
+msgid "System default"
+msgstr ""
+
+#: ../purchasing/manage/suppliers.php:159
+#: ../sales/manage/customer_branches.php:268
 msgid "Addresses"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:147
-#: ../sales/manage/customer_branches.php:267
+#: ../purchasing/manage/suppliers.php:160
+#: ../reporting/rep205.php:102
+#: ../sales/manage/customer_branches.php:269
 msgid "Mailing Address:"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:148
+#: ../purchasing/manage/suppliers.php:161
 msgid "Physical Address:"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:150
+#: ../purchasing/manage/suppliers.php:163
 msgid "General"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:151
-#: ../sales/manage/customer_branches.php:269
-#: ../sales/manage/customers.php:251
+#: ../purchasing/manage/suppliers.php:164
+#: ../sales/manage/customer_branches.php:271
+#: ../sales/manage/customers.php:291
 msgid "General Notes:"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:153
+#: ../purchasing/manage/suppliers.php:166
 msgid "Supplier status:"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:160
+#: ../purchasing/manage/suppliers.php:172
 msgid "Update Supplier"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:161
+#: ../purchasing/manage/suppliers.php:173
 msgid "Update supplier data"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:162
+#: ../purchasing/manage/suppliers.php:174
 msgid "Select this supplier and return to document entry."
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:163
+#: ../purchasing/manage/suppliers.php:175
 msgid "Delete Supplier"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:164
+#: ../purchasing/manage/suppliers.php:176
 msgid "Delete supplier data if have been never used"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:168
+#: ../purchasing/manage/suppliers.php:180
 msgid "Add New Supplier Details"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:187
+#: ../purchasing/manage/suppliers.php:199
 msgid "The supplier name must be entered."
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:194
+#: ../purchasing/manage/suppliers.php:206
 msgid "The supplier short name must be entered."
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:214
+#: ../purchasing/manage/suppliers.php:226
 msgid "Supplier has been updated."
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:232
+#: ../purchasing/manage/suppliers.php:244
 msgid "A new supplier has been added."
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:250
+#: ../purchasing/manage/suppliers.php:262
 msgid ""
 "Cannot delete this supplier because there are transactions that refer to "
 "this supplier."
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:258
+#: ../purchasing/manage/suppliers.php:270
 msgid ""
 "Cannot delete the supplier record because purchase orders have been created "
 "against this supplier."
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:279
+#: ../purchasing/manage/suppliers.php:291
+#: ../purchasing/inquiry/po_search_completed.php:75
+#: ../purchasing/inquiry/po_search.php:76
 #: ../purchasing/inquiry/supplier_allocation_inquiry.php:48
 msgid "Select a supplier: "
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:280
+#: ../purchasing/manage/suppliers.php:292
 msgid "New supplier"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:298
-#: ../sales/manage/customer_branches.php:322
-#: ../sales/manage/customers.php:300
-msgid "&General settings"
+#: ../purchasing/manage/suppliers.php:311
+#: ../sales/manage/customer_branches.php:325
+#: ../sales/manage/customers.php:349
+msgid "&Contacts"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:299
-#: ../sales/manage/customer_branches.php:323
-#: ../sales/manage/customers.php:301
-msgid "&Contacts"
+#: ../purchasing/manage/suppliers.php:313
+msgid "Purchase &Orders"
 msgstr ""
 
 #: ../purchasing/inquiry/po_search_completed.php:24
@@ -10778,7 +11587,7 @@ msgstr ""
 #: ../purchasing/inquiry/po_search_completed.php:60
 #: ../purchasing/inquiry/po_search.php:62
 #: ../sales/inquiry/sales_deliveries_view.php:103
-#: ../sales/inquiry/sales_orders_view.php:217
+#: ../sales/inquiry/sales_orders_view.php:247
 msgid "#:"
 msgstr ""
 
@@ -10786,15 +11595,16 @@ msgstr ""
 msgid "into location:"
 msgstr ""
 
-#: ../purchasing/inquiry/po_search_completed.php:121
-#: ../purchasing/inquiry/po_search.php:135
-#: ../sales/inquiry/sales_orders_view.php:258
+#: ../purchasing/inquiry/po_search_completed.php:128
+#: ../purchasing/inquiry/po_search.php:137
+#: ../reporting/includes/doctext.inc:188
+#: ../sales/inquiry/sales_orders_view.php:290
 msgid "Order Date"
 msgstr ""
 
-#: ../purchasing/inquiry/po_search_completed.php:123
-#: ../purchasing/inquiry/po_search.php:137
-#: ../sales/inquiry/sales_orders_view.php:261
+#: ../purchasing/inquiry/po_search_completed.php:130
+#: ../purchasing/inquiry/po_search.php:139
+#: ../sales/inquiry/sales_orders_view.php:293
 msgid "Order Total"
 msgstr ""
 
@@ -10802,11 +11612,11 @@ msgstr ""
 msgid "Search Outstanding Purchase Orders"
 msgstr ""
 
-#: ../purchasing/inquiry/po_search.php:98
+#: ../purchasing/inquiry/po_search.php:100
 msgid "Receive"
 msgstr ""
 
-#: ../purchasing/inquiry/po_search.php:148
+#: ../purchasing/inquiry/po_search.php:150
 msgid "Marked orders have overdue items."
 msgstr ""
 
@@ -10819,15 +11629,19 @@ msgstr ""
 msgid "show settled:"
 msgstr ""
 
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:129
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:103
+msgid "Pay"
+msgstr ""
+
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:130
 msgid "Supp Reference"
 msgstr ""
 
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:135
-#: ../reporting/rep101.php:131
-#: ../reporting/rep201.php:119
-#: ../reporting/includes/doctext.inc:117
-#: ../sales/inquiry/customer_allocation_inquiry.php:151
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:136
+#: ../reporting/rep101.php:119
+#: ../reporting/rep201.php:111
+#: ../reporting/includes/doctext.inc:247
+#: ../sales/inquiry/customer_allocation_inquiry.php:154
 msgid "Allocated"
 msgstr ""
 
@@ -10835,73 +11649,73 @@ msgstr ""
 msgid "Supplier Inquiry"
 msgstr ""
 
-#: ../purchasing/inquiry/supplier_inquiry.php:47
+#: ../purchasing/inquiry/supplier_inquiry.php:48
 msgid "Select a supplier:"
 msgstr ""
 
-#: ../purchasing/inquiry/supplier_inquiry.php:66
 #: ../purchasing/inquiry/supplier_inquiry.php:67
 #: ../purchasing/inquiry/supplier_inquiry.php:68
-#: ../reporting/rep102.php:110
-#: ../reporting/rep102.php:111
-#: ../reporting/rep102.php:112
-#: ../reporting/rep102.php:227
-#: ../reporting/rep202.php:112
-#: ../reporting/rep202.php:113
-#: ../reporting/rep202.php:114
-#: ../reporting/rep202.php:143
-#: ../reporting/rep202.php:144
-#: ../reporting/rep202.php:145
-#: ../reporting/rep202.php:233
-#: ../reporting/includes/doctext.inc:179
-#: ../sales/create_recurrent_invoices.php:98
-#: ../sales/manage/recurrent_invoices.php:85
+#: ../purchasing/inquiry/supplier_inquiry.php:69
+#: ../reporting/rep102.php:120
+#: ../reporting/rep102.php:121
+#: ../reporting/rep102.php:122
+#: ../reporting/rep102.php:244
+#: ../reporting/rep108.php:151
+#: ../reporting/rep108.php:152
+#: ../reporting/rep108.php:153
+#: ../reporting/rep202.php:124
+#: ../reporting/rep202.php:125
+#: ../reporting/rep202.php:126
+#: ../reporting/rep202.php:158
+#: ../reporting/rep202.php:159
+#: ../reporting/rep202.php:160
+#: ../reporting/rep202.php:252
+#: ../sales/create_recurrent_invoices.php:134
+#: ../sales/manage/recurrent_invoices.php:102
 #: ../sales/inquiry/customer_inquiry.php:71
 #: ../sales/inquiry/customer_inquiry.php:72
 #: ../sales/inquiry/customer_inquiry.php:73
-#: ../themes/exclusive/renderer.php:290
-#: ../themes/exclusive/renderer.php:384
 msgid "Days"
 msgstr ""
 
-#: ../purchasing/inquiry/supplier_inquiry.php:68
-#: ../reporting/rep102.php:112
-#: ../reporting/rep202.php:114
-#: ../reporting/rep202.php:145
-#: ../reporting/includes/doctext.inc:180
+#: ../purchasing/inquiry/supplier_inquiry.php:69
+#: ../reporting/rep102.php:122
+#: ../reporting/rep108.php:153
+#: ../reporting/rep202.php:126
+#: ../reporting/rep202.php:160
 #: ../sales/inquiry/customer_inquiry.php:73
 msgid "Over"
 msgstr ""
 
-#: ../purchasing/inquiry/supplier_inquiry.php:72
+#: ../purchasing/inquiry/supplier_inquiry.php:73
 #: ../sales/inquiry/customer_inquiry.php:76
 msgid "Terms"
 msgstr ""
 
-#: ../purchasing/inquiry/supplier_inquiry.php:72
-#: ../reporting/rep102.php:115
-#: ../reporting/rep102.php:225
-#: ../reporting/rep202.php:118
-#: ../reporting/rep202.php:231
-#: ../reporting/includes/doctext.inc:175
+#: ../purchasing/inquiry/supplier_inquiry.php:73
+#: ../reporting/rep102.php:125
+#: ../reporting/rep102.php:242
+#: ../reporting/rep108.php:155
+#: ../reporting/rep202.php:130
+#: ../reporting/rep202.php:250
 #: ../sales/inquiry/customer_inquiry.php:76
 msgid "Current"
 msgstr ""
 
-#: ../purchasing/inquiry/supplier_inquiry.php:73
-#: ../reporting/rep102.php:116
-#: ../reporting/rep202.php:119
-#: ../reporting/includes/doctext.inc:176
+#: ../purchasing/inquiry/supplier_inquiry.php:74
+#: ../reporting/rep102.php:126
+#: ../reporting/rep108.php:155
+#: ../reporting/rep202.php:131
 #: ../sales/inquiry/customer_inquiry.php:77
 msgid "Total Balance"
 msgstr ""
 
-#: ../purchasing/inquiry/supplier_inquiry.php:127
-#: ../sales/inquiry/customer_inquiry.php:158
+#: ../purchasing/inquiry/supplier_inquiry.php:133
+#: ../sales/inquiry/customer_inquiry.php:162
 msgid "Credit This"
 msgstr ""
 
-#: ../purchasing/inquiry/supplier_inquiry.php:149
+#: ../purchasing/inquiry/supplier_inquiry.php:155
 msgid "Print Remittance"
 msgstr ""
 
@@ -10909,41 +11723,46 @@ msgstr ""
 msgid "Allocate Supplier Payment or Credit Note"
 msgstr ""
 
-#: ../purchasing/allocations/supplier_allocate.php:50
+#: ../purchasing/allocations/supplier_allocate.php:52
 msgid "Allocation of"
 msgstr ""
 
-#: ../purchasing/allocations/supplier_allocate.php:55
-#: ../sales/allocations/customer_allocate.php:54
+#: ../purchasing/allocations/supplier_allocate.php:58
+#: ../sales/allocations/customer_allocate.php:55
 msgid "Total:"
 msgstr ""
 
-#: ../purchasing/allocations/supplier_allocate.php:64
-#: ../sales/allocations/customer_allocate.php:63
+#: ../purchasing/allocations/supplier_allocate.php:62
+#: ../sales/allocations/customer_allocate.php:59
+msgid "Amount ot be settled:"
+msgstr ""
+
+#: ../purchasing/allocations/supplier_allocate.php:74
+#: ../sales/allocations/customer_allocate.php:72
 msgid "Start again allocation of selected amount"
 msgstr ""
 
-#: ../purchasing/allocations/supplier_allocate.php:65
-#: ../sales/allocations/customer_allocate.php:64
+#: ../purchasing/allocations/supplier_allocate.php:75
+#: ../sales/allocations/customer_allocate.php:73
 msgid "Process allocations"
 msgstr ""
 
-#: ../purchasing/allocations/supplier_allocate.php:66
-#: ../purchasing/allocations/supplier_allocate.php:72
-#: ../sales/allocations/customer_allocate.php:65
-#: ../sales/allocations/customer_allocate.php:71
+#: ../purchasing/allocations/supplier_allocate.php:76
+#: ../purchasing/allocations/supplier_allocate.php:82
+#: ../sales/allocations/customer_allocate.php:74
+#: ../sales/allocations/customer_allocate.php:80
 msgid "Back to Allocations"
 msgstr ""
 
-#: ../purchasing/allocations/supplier_allocate.php:67
-#: ../purchasing/allocations/supplier_allocate.php:73
-#: ../sales/allocations/customer_allocate.php:65
-#: ../sales/allocations/customer_allocate.php:72
+#: ../purchasing/allocations/supplier_allocate.php:77
+#: ../purchasing/allocations/supplier_allocate.php:83
+#: ../sales/allocations/customer_allocate.php:74
+#: ../sales/allocations/customer_allocate.php:81
 msgid "Abandon allocations and return to selection of allocatable amounts"
 msgstr ""
 
-#: ../purchasing/allocations/supplier_allocate.php:71
-#: ../sales/allocations/customer_allocate.php:69
+#: ../purchasing/allocations/supplier_allocate.php:81
+#: ../sales/allocations/customer_allocate.php:78
 msgid "There are no unsettled transactions to allocate."
 msgstr ""
 
@@ -10970,487 +11789,642 @@ msgstr ""
 msgid "Marked items are settled."
 msgstr ""
 
-#: ../reporting/rep101.php:120
-#: ../reporting/rep102.php:100
-#: ../reporting/rep202.php:102
-#: ../reporting/rep203.php:81
+#: ../reporting/rep101.php:108
+#: ../reporting/rep102.php:108
+#: ../reporting/rep114.php:108
+#: ../reporting/rep202.php:112
+#: ../reporting/rep203.php:83
 msgid "Balances in Home Currency"
 msgstr ""
 
-#: ../reporting/rep101.php:130
-#: ../reporting/rep201.php:118
-#: ../reporting/rep203.php:91
-#: ../reporting/rep709.php:107
-#: ../reporting/includes/doctext.inc:108
-#: ../reporting/includes/doctext.inc:116
+#: ../reporting/rep101.php:118
+#: ../reporting/rep201.php:110
+#: ../reporting/rep203.php:93
+#: ../reporting/rep709.php:116
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:208
+#: ../reporting/includes/doctext.inc:246
 msgid "Trans Type"
 msgstr ""
 
-#: ../reporting/rep101.php:130
-#: ../reporting/rep201.php:118
-#: ../reporting/includes/doctext.inc:116
+#: ../reporting/rep101.php:118
+#: ../reporting/rep201.php:110
+#: ../reporting/includes/doctext.inc:246
 msgid "Charges"
 msgstr ""
 
-#: ../reporting/rep101.php:130
-#: ../reporting/rep201.php:119
-#: ../reporting/includes/doctext.inc:117
+#: ../reporting/rep101.php:118
+#: ../reporting/rep201.php:111
+#: ../reporting/includes/doctext.inc:247
 msgid "Credits"
 msgstr ""
 
-#: ../reporting/rep101.php:139
-#: ../reporting/rep102.php:125
-#: ../reporting/rep201.php:127
-#: ../reporting/rep202.php:128
-#: ../reporting/rep203.php:100
-#: ../reporting/rep303.php:124
-#: ../reporting/reports_main.php:38
-#: ../reporting/reports_main.php:46
-#: ../reporting/reports_main.php:130
-#: ../reporting/reports_main.php:138
-#: ../reporting/reports_main.php:146
-#: ../reporting/reports_main.php:185
+#: ../reporting/rep101.php:129
+#: ../reporting/rep102.php:136
+#: ../reporting/rep201.php:121
+#: ../reporting/rep202.php:141
+#: ../reporting/rep203.php:102
+#: ../reporting/rep303.php:136
+#: ../reporting/reports_main.php:39
+#: ../reporting/reports_main.php:49
+#: ../reporting/reports_main.php:156
+#: ../reporting/reports_main.php:166
+#: ../reporting/reports_main.php:175
+#: ../reporting/reports_main.php:227
 msgid "Suppress Zeros"
 msgstr ""
 
-#: ../reporting/rep101.php:141
+#: ../reporting/rep101.php:131
 msgid "Customer Balances"
 msgstr ""
 
-#: ../reporting/rep101.php:244
-#: ../reporting/rep102.php:211
-#: ../reporting/rep106.php:177
-#: ../reporting/rep201.php:231
-#: ../reporting/rep202.php:216
-#: ../reporting/rep203.php:177
-#: ../reporting/rep204.php:144
-#: ../reporting/rep301.php:171
-#: ../reporting/rep304.php:193
-#: ../reporting/rep305.php:132
+#: ../reporting/rep101.php:241
+#: ../reporting/rep102.php:228
+#: ../reporting/rep106.php:171
+#: ../reporting/rep201.php:234
+#: ../reporting/rep202.php:235
+#: ../reporting/rep203.php:181
+#: ../reporting/rep204.php:148
+#: ../reporting/rep301.php:254
+#: ../reporting/rep304.php:195
+#: ../reporting/rep305.php:188
+#: ../reporting/rep306.php:293
+#: ../reporting/rep309.php:158
 msgid "Grand Total"
 msgstr ""
 
-#: ../reporting/rep102.php:94
-#: ../reporting/rep106.php:91
-#: ../reporting/rep202.php:96
-#: ../reporting/rep709.php:91
-#: ../reporting/reports_main.php:45
-#: ../reporting/reports_main.php:77
-#: ../reporting/reports_main.php:137
-#: ../reporting/reports_main.php:171
-#: ../reporting/reports_main.php:383
+#: ../reporting/rep102.php:102
+#: ../reporting/rep106.php:93
+#: ../reporting/rep202.php:106
+#: ../reporting/rep709.php:100
+#: ../reporting/reports_main.php:48
+#: ../reporting/reports_main.php:91
+#: ../reporting/reports_main.php:165
+#: ../reporting/reports_main.php:211
+#: ../reporting/reports_main.php:497
 msgid "Summary Only"
 msgstr ""
 
-#: ../reporting/rep102.php:96
-#: ../reporting/rep202.php:98
-#: ../reporting/rep709.php:93
+#: ../reporting/rep102.php:104
+#: ../reporting/rep202.php:108
+#: ../reporting/rep709.php:102
 msgid "Detailed Report"
 msgstr ""
 
-#: ../reporting/rep102.php:121
-#: ../reporting/rep202.php:124
-#: ../reporting/rep203.php:97
+#: ../reporting/rep102.php:131
+#: ../reporting/rep202.php:136
+#: ../reporting/rep203.php:99
+#: ../reporting/rep301.php:174
 #: ../reporting/reports_main.php:35
-#: ../reporting/reports_main.php:42
-#: ../reporting/reports_main.php:68
-#: ../reporting/reports_main.php:76
-#: ../reporting/reports_main.php:127
-#: ../reporting/reports_main.php:134
-#: ../reporting/reports_main.php:143
-#: ../reporting/reports_main.php:190
-#: ../reporting/reports_main.php:198
-#: ../reporting/reports_main.php:230
-#: ../reporting/reports_main.php:241
-#: ../reporting/reports_main.php:252
-#: ../reporting/reports_main.php:268
-#: ../reporting/reports_main.php:278
-#: ../reporting/reports_main.php:289
-#: ../reporting/reports_main.php:301
-#: ../reporting/reports_main.php:315
-#: ../reporting/reports_main.php:324
-#: ../reporting/reports_main.php:334
-#: ../reporting/reports_main.php:345
-#: ../reporting/reports_main.php:357
-#: ../reporting/reports_main.php:365
-#: ../reporting/reports_main.php:374
-#: ../reporting/reports_main.php:382
-#: ../reporting/reports_main.php:388
+#: ../reporting/reports_main.php:44
+#: ../reporting/reports_main.php:65
+#: ../reporting/reports_main.php:81
+#: ../reporting/reports_main.php:90
+#: ../reporting/reports_main.php:152
+#: ../reporting/reports_main.php:161
+#: ../reporting/reports_main.php:172
+#: ../reporting/reports_main.php:208
+#: ../reporting/reports_main.php:234
+#: ../reporting/reports_main.php:243
+#: ../reporting/reports_main.php:249
+#: ../reporting/reports_main.php:259
+#: ../reporting/reports_main.php:267
+#: ../reporting/reports_main.php:275
+#: ../reporting/reports_main.php:319
+#: ../reporting/reports_main.php:327
+#: ../reporting/reports_main.php:339
+#: ../reporting/reports_main.php:351
+#: ../reporting/reports_main.php:369
+#: ../reporting/reports_main.php:380
+#: ../reporting/reports_main.php:392
+#: ../reporting/reports_main.php:405
+#: ../reporting/reports_main.php:421
+#: ../reporting/reports_main.php:431
+#: ../reporting/reports_main.php:442
+#: ../reporting/reports_main.php:454
+#: ../reporting/reports_main.php:468
+#: ../reporting/reports_main.php:477
+#: ../reporting/reports_main.php:487
+#: ../reporting/reports_main.php:496
+#: ../reporting/reports_main.php:503
 msgid "End Date"
 msgstr ""
 
-#: ../reporting/rep102.php:129
+#: ../reporting/rep102.php:135
+#: ../reporting/rep202.php:140
+#: ../reporting/reports_main.php:47
+#: ../reporting/reports_main.php:123
+#: ../reporting/reports_main.php:164
+msgid "Show Also Allocated"
+msgstr ""
+
+#: ../reporting/rep102.php:140
 msgid "Aged Customer Analysis"
 msgstr ""
 
-#: ../reporting/rep103.php:115
+#: ../reporting/rep103.php:134
 msgid "All Areas"
 msgstr ""
 
-#: ../reporting/rep103.php:119
+#: ../reporting/rep103.php:138
 msgid "All Sales Folk"
 msgstr ""
 
-#: ../reporting/rep103.php:123
+#: ../reporting/rep103.php:142
+#: ../reporting/rep205.php:89
 msgid "Greater than "
 msgstr ""
 
-#: ../reporting/rep103.php:127
+#: ../reporting/rep103.php:146
+#: ../reporting/rep205.php:93
 msgid "Less than "
 msgstr ""
 
-#: ../reporting/rep103.php:136
+#: ../reporting/rep103.php:155
 msgid "Customer Postal Address"
 msgstr ""
 
-#: ../reporting/rep103.php:136
+#: ../reporting/rep103.php:155
 msgid "Price/Turnover"
 msgstr ""
 
-#: ../reporting/rep103.php:136
+#: ../reporting/rep103.php:155
 msgid "Branch Contact Information"
 msgstr ""
 
-#: ../reporting/rep103.php:137
+#: ../reporting/rep103.php:156
 msgid "Branch Delivery Address"
 msgstr ""
 
-#: ../reporting/rep103.php:142
-#: ../reporting/reports_main.php:51
+#: ../reporting/rep103.php:161
+#: ../reporting/rep205.php:108
+#: ../reporting/reports_main.php:55
+#: ../reporting/reports_main.php:185
 msgid "Activity Since"
 msgstr ""
 
-#: ../reporting/rep103.php:143
-#: ../reporting/reports_main.php:52
+#: ../reporting/rep103.php:162
+#: ../reporting/reports_main.php:56
 #: ../sales/manage/sales_areas.php:16
 msgid "Sales Areas"
 msgstr ""
 
-#: ../reporting/rep103.php:144
-#: ../reporting/reports_main.php:53
+#: ../reporting/rep103.php:163
+#: ../reporting/reports_main.php:57
 msgid "Sales Folk"
 msgstr ""
 
-#: ../reporting/rep103.php:145
+#: ../reporting/rep103.php:164
+#: ../reporting/rep205.php:109
 msgid "Activity"
 msgstr ""
 
-#: ../reporting/rep103.php:147
+#: ../reporting/rep103.php:166
 msgid "Customer Details Listing"
 msgstr ""
 
-#: ../reporting/rep103.php:175
+#: ../reporting/rep103.php:197
 msgid "Customers in"
 msgstr ""
 
-#: ../reporting/rep103.php:196
-#: ../sales/includes/ui/sales_order_ui.inc:413
+#: ../reporting/rep103.php:218
 msgid "Price List"
 msgstr ""
 
-#: ../reporting/rep103.php:207
-msgid "Turnover"
+#: ../reporting/rep103.php:246
+#: ../reporting/rep205.php:164
+msgid "Ph"
 msgstr ""
 
-#: ../reporting/rep103.php:216
-msgid "Ph"
+#: ../reporting/rep103.php:261
+#: ../reporting/rep205.php:179
+msgid "Gereral Notes:"
 msgstr ""
 
-#: ../reporting/rep104.php:109
+#: ../reporting/rep103.php:270
+#: ../reporting/rep205.php:102
+#: ../reporting/rep205.php:188
+msgid "Turnover"
+msgstr ""
+
+#: ../reporting/rep104.php:111
 msgid "Category/Items"
 msgstr ""
 
-#: ../reporting/rep104.php:109
-#: ../reporting/rep301.php:99
-#: ../reporting/rep303.php:109
-#: ../reporting/rep303.php:115
+#: ../reporting/rep104.php:111
+#: ../reporting/rep301.php:169
+#: ../reporting/rep303.php:121
+#: ../reporting/rep303.php:127
+#: ../reporting/rep307.php:117
+#: ../reporting/rep308.php:230
 msgid "UOM"
 msgstr ""
 
-#: ../reporting/rep104.php:109
+#: ../reporting/rep104.php:111
 msgid "GP %"
 msgstr ""
 
-#: ../reporting/rep104.php:117
-#: ../reporting/reports_main.php:63
+#: ../reporting/rep104.php:119
+#: ../reporting/reports_main.php:75
 msgid "Show GP %"
 msgstr ""
 
-#: ../reporting/rep104.php:124
+#: ../reporting/rep104.php:126
 msgid "Price Listing"
 msgstr ""
 
-#: ../reporting/rep104.php:191
+#: ../reporting/rep104.php:195
 msgid "Sales Kits"
 msgstr ""
 
-#: ../reporting/rep105.php:101
+#: ../reporting/rep105.php:103
 msgid "All Orders"
 msgstr ""
 
-#: ../reporting/rep105.php:103
-#: ../reporting/reports_main.php:71
+#: ../reporting/rep105.php:105
+#: ../reporting/reports_main.php:84
 msgid "Back Orders Only"
 msgstr ""
 
-#: ../reporting/rep105.php:107
-#: ../reporting/rep204.php:82
-#: ../sales/inquiry/customer_allocation_inquiry.php:144
-#: ../sales/inquiry/customer_inquiry.php:214
+#: ../reporting/rep105.php:109
+#: ../reporting/rep204.php:84
+#: ../sales/inquiry/customer_allocation_inquiry.php:147
+#: ../sales/inquiry/customer_inquiry.php:202
 msgid "Order"
 msgstr ""
 
-#: ../reporting/rep105.php:107
-#: ../reporting/rep106.php:81
-#: ../reporting/includes/doctext.inc:163
-#: ../sales/create_recurrent_invoices.php:98
+#: ../reporting/rep105.php:109
+#: ../reporting/rep106.php:83
+#: ../reporting/rep112.php:175
+#: ../sales/create_recurrent_invoices.php:134
 #: ../sales/customer_credit_invoice.php:236
-#: ../sales/customer_delivery.php:325
-#: ../sales/customer_invoice.php:373
-#: ../sales/manage/recurrent_invoices.php:85
+#: ../sales/customer_delivery.php:363
+#: ../sales/customer_invoice.php:456
+#: ../sales/manage/customers.php:255
+#: ../sales/manage/customers.php:294
+#: ../sales/manage/recurrent_invoices.php:102
 #: ../sales/view/view_credit.php:58
-#: ../sales/inquiry/customer_inquiry.php:219
-#: ../sales/inquiry/sales_deliveries_view.php:182
-#: ../sales/inquiry/sales_orders_view.php:256
-#: ../sales/inquiry/sales_orders_view.php:270
-#: ../themes/exclusive/renderer.php:289
+#: ../sales/inquiry/customer_inquiry.php:207
+#: ../sales/inquiry/sales_deliveries_view.php:184
+#: ../sales/inquiry/sales_orders_view.php:288
+#: ../sales/inquiry/sales_orders_view.php:302
 msgid "Branch"
 msgstr ""
 
-#: ../reporting/rep105.php:107
-#: ../reporting/rep106.php:81
+#: ../reporting/rep105.php:109
+#: ../reporting/rep106.php:83
 msgid "Customer Ref"
 msgstr ""
 
-#: ../reporting/rep105.php:108
+#: ../reporting/rep105.php:110
 msgid "Ord Date"
 msgstr ""
 
-#: ../reporting/rep105.php:108
+#: ../reporting/rep105.php:110
 msgid "Del Date"
 msgstr ""
 
-#: ../reporting/rep105.php:108
-#: ../reporting/rep401.php:69
+#: ../reporting/rep105.php:110
+#: ../reporting/rep401.php:71
 msgid "Loc"
 msgstr ""
 
-#: ../reporting/rep105.php:112
-#: ../sales/customer_delivery.php:418
-#: ../sales/customer_invoice.php:446
-msgid "Invoiced"
+#: ../reporting/rep105.php:114
+#: ../sales/customer_delivery.php:456
+#: ../sales/customer_invoice.php:553
+#: ../sales/includes/ui/sales_order_ui.inc:147
+msgid "Delivered"
 msgstr ""
 
-#: ../reporting/rep105.php:119
+#: ../reporting/rep105.php:121
 msgid "Selection"
 msgstr ""
 
-#: ../reporting/rep105.php:124
+#: ../reporting/rep105.php:125
 msgid "Order Status Listing"
 msgstr ""
 
-#: ../reporting/rep106.php:81
-#: ../sales/inquiry/sales_deliveries_view.php:166
-#: ../sales/inquiry/sales_orders_view.php:142
-msgid "Invoice"
-msgstr ""
-
-#: ../reporting/rep106.php:82
+#: ../reporting/rep106.php:84
 msgid "Inv Date"
 msgstr ""
 
-#: ../reporting/rep106.php:82
-#: ../reporting/rep106.php:86
-#: ../reporting/rep106.php:87
+#: ../reporting/rep106.php:84
+#: ../reporting/rep106.php:88
+#: ../reporting/rep106.php:89
 #: ../sales/manage/sales_people.php:99
 #: ../sales/manage/sales_people.php:159
 #: ../sales/manage/sales_people.php:161
 msgid "Provision"
 msgstr ""
 
-#: ../reporting/rep106.php:86
+#: ../reporting/rep106.php:88
 msgid "Salesman"
 msgstr ""
 
-#: ../reporting/rep106.php:86
-#: ../reporting/includes/header2.inc:98
-#: ../sales/manage/sales_people.php:99
-msgid "Email"
-msgstr ""
-
-#: ../reporting/rep106.php:87
+#: ../reporting/rep106.php:89
 #: ../sales/manage/sales_people.php:99
 msgid "Break Pt."
 msgstr ""
 
-#: ../reporting/rep106.php:96
+#: ../reporting/rep106.php:97
 msgid "Salesman Listing"
 msgstr ""
 
-#: ../reporting/rep107.php:66
-#: ../reporting/rep107.php:100
+#: ../reporting/rep107.php:88
 #: ../reporting/rep107.php:111
-#: ../reporting/includes/doctext.inc:92
+#: ../reporting/includes/doctext.inc:118
 msgid "INVOICE"
 msgstr ""
 
-#: ../reporting/rep107.php:105
-#: ../reporting/rep107.php:111
-#: ../reporting/includes/doctext.inc:100
-msgid "CREDIT NOTE"
+#: ../reporting/rep107.php:196
+msgid "Prepayments invoiced to this order up to day:"
+msgstr ""
+
+#: ../reporting/rep107.php:203
+msgid "Invoice reference"
+msgstr ""
+
+#: ../reporting/rep107.php:220
+msgid "Total payments:"
+msgstr ""
+
+#: ../reporting/rep107.php:234
+#: ../reporting/rep109.php:158
+#: ../reporting/rep110.php:162
+#: ../reporting/rep111.php:155
+#: ../reporting/rep113.php:147
+#: ../sales/view/view_credit.php:138
+#: ../sales/view/view_dispatch.php:155
+#: ../sales/view/view_invoice.php:159
+#: ../sales/view/view_sales_order.php:245
+#: ../sales/includes/ui/sales_credit_ui.inc:222
+msgid "Shipping"
+msgstr ""
+
+#: ../reporting/rep107.php:280
+#: ../reporting/rep109.php:210
+#: ../reporting/rep111.php:207
+msgid "TOTAL ORDER VAT INCL."
 msgstr ""
 
-#: ../reporting/rep108.php:84
-#: ../reporting/rep108.php:115
-#: ../reporting/includes/doctext.inc:115
+#: ../reporting/rep107.php:286
+msgid "THIS INVOICE"
+msgstr ""
+
+#: ../reporting/rep108.php:85
+#: ../reporting/rep108.php:110
+#: ../reporting/includes/doctext.inc:238
 msgid "STATEMENT"
 msgstr ""
 
-#: ../reporting/rep109.php:65
-#: ../reporting/rep109.php:93
+#: ../reporting/rep108.php:127
+msgid "Outstanding Transactions"
+msgstr ""
+
+#: ../reporting/rep108.php:170
+msgid "Statement"
+msgstr ""
+
+#: ../reporting/rep108.php:170
+msgid "as of"
+msgstr ""
+
+#: ../reporting/rep109.php:66
+#: ../reporting/rep109.php:94
 #: ../reporting/rep109.php:99
-#: ../reporting/includes/doctext.inc:90
+#: ../reporting/includes/doctext.inc:65
 msgid "SALES ORDER"
 msgstr ""
 
-#: ../reporting/rep109.php:67
-#: ../reporting/rep109.php:88
+#: ../reporting/rep109.php:68
+#: ../reporting/rep109.php:89
 #: ../reporting/rep109.php:99
-#: ../reporting/includes/doctext.inc:90
+#: ../reporting/includes/doctext.inc:65
 msgid "QUOTE"
 msgstr ""
 
-#: ../reporting/rep110.php:68
-msgid "DELIVERY"
+#: ../reporting/rep109.php:164
+#: ../reporting/rep111.php:161
+msgid "TOTAL ORDER EX VAT"
 msgstr ""
 
 #: ../reporting/rep110.php:70
-#: ../reporting/rep110.php:97
-#: ../reporting/includes/doctext.inc:88
+msgid "DELIVERY"
+msgstr ""
+
+#: ../reporting/rep110.php:72
+#: ../reporting/rep110.php:93
+#: ../reporting/includes/doctext.inc:82
 msgid "PACKING SLIP"
 msgstr ""
 
-#: ../reporting/rep110.php:92
-#: ../reporting/rep110.php:103
-#: ../reporting/includes/doctext.inc:88
+#: ../reporting/rep110.php:88
+#: ../reporting/includes/doctext.inc:82
 msgid "DELIVERY NOTE"
 msgstr ""
 
-#: ../reporting/rep111.php:60
-#: ../reporting/rep111.php:85
-#: ../reporting/includes/doctext.inc:84
+#: ../reporting/rep110.php:206
+msgid "TOTAL DELIVERY INCL. VAT"
+msgstr ""
+
+#: ../reporting/rep111.php:64
+#: ../reporting/includes/doctext.inc:50
 msgid "SALES QUOTATION"
 msgstr ""
 
-#: ../reporting/rep112.php:92
-#: ../reporting/rep112.php:112
-#: ../reporting/includes/doctext.inc:98
+#: ../reporting/rep112.php:83
+#: ../reporting/includes/doctext.inc:198
 msgid "RECEIPT"
 msgstr ""
 
-#: ../reporting/rep201.php:108
+#: ../reporting/rep112.php:114
+#: ../reporting/rep210.php:122
+msgid "As advance / full / part / payment towards:"
+msgstr ""
+
+#: ../reporting/rep112.php:155
+msgid "TOTAL RECEIPT"
+msgstr ""
+
+#: ../reporting/rep112.php:166
+msgid "Received / Sign"
+msgstr ""
+
+#: ../reporting/rep112.php:168
+msgid "By Cash / Cheque* / Draft No."
+msgstr ""
+
+#: ../reporting/rep112.php:170
+msgid "Dated"
+msgstr ""
+
+#: ../reporting/rep112.php:173
+msgid "Drawn on Bank"
+msgstr ""
+
+#: ../reporting/rep113.php:67
+#: ../reporting/rep113.php:86
+#: ../reporting/includes/doctext.inc:103
+msgid "CREDIT NOTE"
+msgstr ""
+
+#: ../reporting/rep113.php:191
+#: ../sales/view/view_credit.php:143
+msgid "TOTAL CREDIT"
+msgstr ""
+
+#: ../reporting/rep114.php:87
+msgid "Sales Summary Report"
+msgstr ""
+
+#: ../reporting/rep114.php:91
+#: ../reporting/reports_main.php:66
+msgid "Tax Id Only"
+msgstr ""
+
+#: ../reporting/rep114.php:95
+msgid "Tax Id"
+msgstr ""
+
+#: ../reporting/rep114.php:95
+msgid "Total ex. Tax"
+msgstr ""
+
+#: ../reporting/rep114.php:95
+#: ../reporting/rep709.php:117
+#: ../taxes/tax_groups.php:171
+msgid "Tax"
+msgstr ""
+
+#: ../reporting/rep201.php:100
 msgid "Balances in Home currency"
 msgstr ""
 
-#: ../reporting/rep201.php:129
+#: ../reporting/rep201.php:123
 msgid "Supplier Balances"
 msgstr ""
 
-#: ../reporting/rep202.php:131
+#: ../reporting/rep202.php:144
 msgid "currency"
 msgstr ""
 
-#: ../reporting/rep202.php:132
+#: ../reporting/rep202.php:145
 msgid "Aged Supplier Analysis"
 msgstr ""
 
-#: ../reporting/rep203.php:102
+#: ../reporting/rep203.php:104
 msgid "Payment Report"
 msgstr ""
 
-#: ../reporting/rep204.php:82
+#: ../reporting/rep204.php:84
 msgid "Qty Recd"
 msgstr ""
 
-#: ../reporting/rep204.php:82
+#: ../reporting/rep204.php:84
 msgid "qty Inv"
 msgstr ""
 
-#: ../reporting/rep204.php:83
+#: ../reporting/rep204.php:85
 msgid "Act Price"
 msgstr ""
 
-#: ../reporting/rep204.php:90
+#: ../reporting/rep204.php:92
 msgid "Outstanding GRNs Report"
 msgstr ""
 
-#: ../reporting/rep209.php:88
-#: ../reporting/rep209.php:107
-#: ../reporting/rep209.php:112
-#: ../reporting/includes/doctext.inc:86
+#: ../reporting/rep205.php:102
+msgid "Contact Information"
+msgstr ""
+
+#: ../reporting/rep205.php:103
+msgid "Physical Address"
+msgstr ""
+
+#: ../reporting/rep205.php:111
+msgid "Supplier Details Listing"
+msgstr ""
+
+#: ../reporting/rep205.php:139
+msgid "Tax_Id"
+msgstr ""
+
+#: ../reporting/rep209.php:87
+#: ../reporting/rep209.php:100
+#: ../reporting/includes/doctext.inc:171
 msgid "PURCHASE ORDER"
 msgstr ""
 
-#: ../reporting/rep210.php:94
-#: ../reporting/rep210.php:121
-#: ../reporting/rep210.php:126
-#: ../reporting/includes/doctext.inc:96
+#: ../reporting/rep209.php:209
+msgid "TOTAL PO"
+msgstr ""
+
+#: ../reporting/rep210.php:84
+#: ../reporting/rep210.php:106
+#: ../reporting/includes/doctext.inc:151
 msgid "REMITTANCE"
 msgstr ""
 
-#: ../reporting/rep301.php:107
+#: ../reporting/rep210.php:165
+msgid "TOTAL REMITTANCE"
+msgstr ""
+
+#: ../reporting/rep301.php:178
 msgid "Inventory Valuation Report"
 msgstr ""
 
-#: ../reporting/rep302.php:123
+#: ../reporting/rep302.php:125
 msgid "QOH"
 msgstr ""
 
-#: ../reporting/rep302.php:123
+#: ../reporting/rep302.php:125
 msgid "Cust Ord"
 msgstr ""
 
-#: ../reporting/rep302.php:123
+#: ../reporting/rep302.php:125
 msgid "Supp Ord"
 msgstr ""
 
-#: ../reporting/rep302.php:123
+#: ../reporting/rep302.php:125
 msgid "Sugg Ord"
 msgstr ""
 
-#: ../reporting/rep302.php:132
+#: ../reporting/rep302.php:134
 msgid "Inventory Planning Report"
 msgstr ""
 
-#: ../reporting/rep303.php:97
+#: ../reporting/rep303.php:109
 msgid "Shortage"
 msgstr ""
 
-#: ../reporting/rep303.php:109
-#: ../reporting/rep303.php:115
-#: ../reporting/rep305.php:72
+#: ../reporting/rep303.php:121
+#: ../reporting/rep303.php:127
+#: ../reporting/rep305.php:101
 msgid "Stock ID"
 msgstr ""
 
-#: ../reporting/rep303.php:109
+#: ../reporting/rep303.php:121
 msgid "Check"
 msgstr ""
 
-#: ../reporting/rep303.php:123
+#: ../reporting/rep303.php:135
 msgid "Only Shortage"
 msgstr ""
 
-#: ../reporting/rep303.php:131
+#: ../reporting/rep303.php:143
 msgid "Stock Check Sheets"
 msgstr ""
 
 #: ../reporting/rep304.php:114
+#: ../reporting/rep305.php:101
+#: ../reporting/rep306.php:141
+#: ../reporting/rep309.php:98
 msgid "Qty"
 msgstr ""
 
 #: ../reporting/rep304.php:114
-#: ../sales/manage/customer_branches.php:240
-#: ../sales/manage/customers.php:224
+#: ../reporting/rep309.php:98
+#: ../sales/manage/customer_branches.php:241
+#: ../sales/manage/customers.php:264
 msgid "Sales"
 msgstr ""
 
@@ -11466,185 +12440,248 @@ msgstr ""
 msgid "Inventory Sales Report"
 msgstr ""
 
-#: ../reporting/rep305.php:72
+#: ../reporting/rep305.php:101
 msgid "PO No"
 msgstr ""
 
-#: ../reporting/rep305.php:72
-msgid "Qty Received"
+#: ../reporting/rep305.php:101
+msgid "Inv"
 msgstr ""
 
-#: ../reporting/rep305.php:72
-msgid "Unit Price"
+#: ../reporting/rep305.php:101
+msgid "Inv Price"
 msgstr ""
 
-#: ../reporting/rep305.php:72
-msgid "Actual Price"
+#: ../reporting/rep305.php:101
+msgid "PO Price"
 msgstr ""
 
-#: ../reporting/rep305.php:79
+#: ../reporting/rep305.php:108
 msgid "GRN Valuation Report"
 msgstr ""
 
-#: ../reporting/rep401.php:69
+#: ../reporting/rep306.php:141
+#: ../reporting/rep309.php:98
+msgid "Unit Price"
+msgstr ""
+
+#: ../reporting/rep306.php:154
+msgid "Inventory Purchasing Report"
+msgstr ""
+
+#: ../reporting/rep307.php:117
+msgid "Opening"
+msgstr ""
+
+#: ../reporting/rep307.php:126
+msgid "Inventory Movements"
+msgstr ""
+
+#: ../reporting/rep308.php:230
+msgid "OpeningStock"
+msgstr ""
+
+#: ../reporting/rep308.php:230
+msgid "StockIn"
+msgstr ""
+
+#: ../reporting/rep308.php:230
+msgid "ClosingStock"
+msgstr ""
+
+#: ../reporting/rep308.php:231
+msgid "QTY"
+msgstr ""
+
+#: ../reporting/rep308.php:231
+#: ../reporting/rep709.php:117
+#: ../taxes/item_tax_types.php:185
+msgid "Rate"
+msgstr ""
+
+#: ../reporting/rep308.php:240
+msgid "Costed Inventory Movements"
+msgstr ""
+
+#: ../reporting/rep309.php:98
+msgid "Item/Category"
+msgstr ""
+
+#: ../reporting/rep309.php:98
+msgid "Remark"
+msgstr ""
+
+#: ../reporting/rep309.php:106
+msgid "Item Sales Summary Report"
+msgstr ""
+
+#: ../reporting/rep309.php:147
+msgid "Gift"
+msgstr ""
+
+#: ../reporting/rep401.php:71
 msgid "Wrk Ctr"
 msgstr ""
 
-#: ../reporting/rep401.php:76
+#: ../reporting/rep401.php:78
 msgid "Bill of Material Listing"
 msgstr ""
 
-#: ../reporting/rep409.php:60
-#: ../reporting/rep409.php:79
-#: ../reporting/rep409.php:84
-#: ../reporting/includes/doctext.inc:94
-msgid "WORK ORDER"
+#: ../reporting/rep402.php:110
+msgid "Open Only"
 msgstr ""
 
-#: ../reporting/rep409.php:134
-msgid "Insufficient stock"
+#: ../reporting/rep402.php:112
+msgid "Work Order Listing"
 msgstr ""
 
-#: ../reporting/rep409.php:147
-#: ../reporting/includes/doctext.inc:136
-msgid "Work Order No."
+#: ../reporting/rep409.php:59
+#: ../reporting/rep409.php:72
+#: ../reporting/includes/doctext.inc:214
+msgid "WORK ORDER"
+msgstr ""
+
+#: ../reporting/rep409.php:128
+msgid "Insufficient stock"
 msgstr ""
 
-#: ../reporting/rep501.php:85
+#: ../reporting/rep501.php:87
 msgid "YTD"
 msgstr ""
 
-#: ../reporting/rep501.php:92
+#: ../reporting/rep501.php:94
 msgid "Dimension Summary"
 msgstr ""
 
-#: ../reporting/rep601.php:83
-#: ../reporting/includes/doctext.inc:70
+#: ../reporting/rep601.php:86
+#: ../reporting/rep602.php:87
+#: ../reporting/includes/doctext.inc:260
 msgid "Bank Account"
 msgstr ""
 
-#: ../reporting/rep601.php:144
+#: ../reporting/rep601.php:151
+#: ../reporting/rep602.php:151
 msgid "Total Debit / Credit"
 msgstr ""
 
-#: ../reporting/rep601.php:161
+#: ../reporting/rep601.php:168
+#: ../reporting/rep602.php:167
 msgid "Net Change"
 msgstr ""
 
-#: ../reporting/rep702.php:51
+#: ../reporting/rep602.php:73
+msgid "Bank Statement w/Reconcile"
+msgstr ""
+
+#: ../reporting/rep602.php:81
+msgid "Reco Date"
+msgstr ""
+
+#: ../reporting/rep602.php:81
+msgid "Narration"
+msgstr ""
+
+#: ../reporting/rep602.php:195
+msgid "Bank Balance"
+msgstr ""
+
+#: ../reporting/rep702.php:53
 msgid "Type/Account"
 msgstr ""
 
-#: ../reporting/rep702.php:51
+#: ../reporting/rep702.php:53
 msgid "Date/Dim."
 msgstr ""
 
-#: ../reporting/rep702.php:52
+#: ../reporting/rep702.php:54
 msgid "Person/Item/Memo"
 msgstr ""
 
-#: ../reporting/rep702.php:62
+#: ../reporting/rep702.php:64
 msgid "List of Journal Entries"
 msgstr ""
 
-#: ../reporting/rep704.php:66
+#: ../reporting/rep704.php:71
 msgid "GL Account Transactions"
 msgstr ""
 
-#: ../reporting/rep705.php:243
-#: ../reporting/rep705.php:256
-#: ../reporting/rep705.php:267
-#: ../reporting/reports_main.php:260
-#: ../reporting/reports_main.php:308
-#: ../reporting/reports_main.php:351
+#: ../reporting/rep705.php:247
+#: ../reporting/rep705.php:260
+#: ../reporting/rep705.php:271
+#: ../reporting/reports_main.php:360
+#: ../reporting/reports_main.php:413
+#: ../reporting/reports_main.php:461
 msgid "Year"
 msgstr ""
 
-#: ../reporting/rep705.php:249
-#: ../reporting/rep705.php:260
-#: ../reporting/rep705.php:269
-#: ../reporting/rep706.php:194
-#: ../reporting/rep706.php:202
-#: ../reporting/rep706.php:208
-#: ../reporting/rep707.php:218
-#: ../reporting/rep707.php:226
-#: ../reporting/rep707.php:232
+#: ../reporting/rep705.php:253
+#: ../reporting/rep705.php:264
+#: ../reporting/rep705.php:273
+#: ../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"
 msgstr ""
 
-#: ../reporting/rep705.php:250
-#: ../reporting/rep705.php:261
-#: ../reporting/rep705.php:270
+#: ../reporting/rep705.php:254
+#: ../reporting/rep705.php:265
+#: ../reporting/rep705.php:274
 msgid "Amounts in thousands"
 msgstr ""
 
-#: ../reporting/rep705.php:274
+#: ../reporting/rep705.php:278
 msgid "Annual Expense Breakdown"
 msgstr ""
 
-#: ../reporting/rep706.php:182
+#: ../reporting/rep706.php:186
 msgid "Close Balance"
 msgstr ""
 
-#: ../reporting/rep706.php:302
-#: ../reporting/rep707.php:320
-#: ../sales/create_recurrent_invoices.php:98
-#: ../sales/manage/recurrent_invoices.php:85
-msgid "Group"
-msgstr ""
-
-#: ../reporting/rep707.php:254
+#: ../reporting/rep707.php:258
 msgid "Profit and Loss Statement"
 msgstr ""
 
-#: ../reporting/rep709.php:89
+#: ../reporting/rep709.php:98
 msgid "Tax Report"
 msgstr ""
 
-#: ../reporting/rep709.php:107
+#: ../reporting/rep709.php:116
 msgid "Branch Name"
 msgstr ""
 
-#: ../reporting/rep709.php:108
+#: ../reporting/rep709.php:117
 msgid "Net"
 msgstr ""
 
-#: ../reporting/rep709.php:108
-#: ../taxes/item_tax_types.php:180
-msgid "Rate"
-msgstr ""
-
-#: ../reporting/rep709.php:108
-#: ../taxes/tax_groups.php:214
-msgid "Tax"
-msgstr ""
-
-#: ../reporting/rep709.php:168
+#: ../reporting/rep709.php:188
 msgid "Tax Rate"
 msgstr ""
 
-#: ../reporting/rep709.php:168
+#: ../reporting/rep709.php:188
 msgid "Net Tax"
 msgstr ""
 
-#: ../reporting/rep710.php:75
+#: ../reporting/rep710.php:77
 msgid "Time"
 msgstr ""
 
-#: ../reporting/rep710.php:75
+#: ../reporting/rep710.php:77
 msgid "Trans Date"
 msgstr ""
 
-#: ../reporting/rep710.php:76
+#: ../reporting/rep710.php:78
 msgid "Action"
 msgstr ""
 
-#: ../reporting/rep710.php:87
-#: ../reporting/reports_main.php:386
+#: ../reporting/rep710.php:89
+#: ../reporting/reports_main.php:501
 msgid "Audit Trail"
 msgstr ""
 
-#: ../reporting/rep710.php:107
+#: ../reporting/rep710.php:111
 msgid "Changed"
 msgstr ""
 
@@ -11657,569 +12694,642 @@ msgid "Customer &Balances"
 msgstr ""
 
 #: ../reporting/reports_main.php:37
-#: ../reporting/reports_main.php:44
-#: ../reporting/reports_main.php:59
-#: ../reporting/reports_main.php:83
-#: ../reporting/reports_main.php:95
-#: ../reporting/reports_main.php:102
-#: ../reporting/reports_main.php:109
-#: ../reporting/reports_main.php:115
-#: ../reporting/reports_main.php:121
-#: ../reporting/reports_main.php:129
-#: ../reporting/reports_main.php:136
-#: ../reporting/reports_main.php:145
-#: ../reporting/reports_main.php:156
-#: ../reporting/reports_main.php:162
+#: ../reporting/reports_main.php:154
+#: ../reporting/reports_main.php:307
+msgid "Show Balance"
+msgstr ""
+
+#: ../reporting/reports_main.php:38
+#: ../reporting/reports_main.php:46
+#: ../reporting/reports_main.php:71
+#: ../reporting/reports_main.php:98
+#: ../reporting/reports_main.php:108
+#: ../reporting/reports_main.php:122
+#: ../reporting/reports_main.php:130
+#: ../reporting/reports_main.php:138
+#: ../reporting/reports_main.php:145
+#: ../reporting/reports_main.php:155
+#: ../reporting/reports_main.php:163
+#: ../reporting/reports_main.php:174
+#: ../reporting/reports_main.php:194
+#: ../reporting/reports_main.php:201
 msgid "Currency Filter"
 msgstr ""
 
-#: ../reporting/reports_main.php:40
-#: ../reporting/reports_main.php:49
-#: ../reporting/reports_main.php:57
-#: ../reporting/reports_main.php:65
-#: ../reporting/reports_main.php:73
-#: ../reporting/reports_main.php:79
-#: ../reporting/reports_main.php:132
+#: ../reporting/reports_main.php:41
+#: ../reporting/reports_main.php:52
+#: ../reporting/reports_main.php:61
+#: ../reporting/reports_main.php:68
+#: ../reporting/reports_main.php:77
+#: ../reporting/reports_main.php:86
+#: ../reporting/reports_main.php:93
+#: ../reporting/reports_main.php:103
+#: ../reporting/reports_main.php:112
+#: ../reporting/reports_main.php:119
+#: ../reporting/reports_main.php:126
+#: ../reporting/reports_main.php:134
 #: ../reporting/reports_main.php:141
-#: ../reporting/reports_main.php:148
-#: ../reporting/reports_main.php:152
-#: ../reporting/reports_main.php:173
-#: ../reporting/reports_main.php:178
-#: ../reporting/reports_main.php:187
-#: ../reporting/reports_main.php:195
-#: ../reporting/reports_main.php:200
-#: ../reporting/reports_main.php:207
-#: ../reporting/reports_main.php:221
-#: ../reporting/reports_main.php:232
-#: ../reporting/reports_main.php:238
-#: ../reporting/reports_main.php:244
-#: ../reporting/reports_main.php:258
-#: ../reporting/reports_main.php:265
-#: ../reporting/reports_main.php:275
+#: ../reporting/reports_main.php:147
+#: ../reporting/reports_main.php:158
+#: ../reporting/reports_main.php:169
+#: ../reporting/reports_main.php:177
+#: ../reporting/reports_main.php:182
+#: ../reporting/reports_main.php:189
+#: ../reporting/reports_main.php:197
+#: ../reporting/reports_main.php:204
+#: ../reporting/reports_main.php:213
+#: ../reporting/reports_main.php:219
+#: ../reporting/reports_main.php:230
+#: ../reporting/reports_main.php:239
+#: ../reporting/reports_main.php:245
+#: ../reporting/reports_main.php:255
+#: ../reporting/reports_main.php:263
+#: ../reporting/reports_main.php:271
+#: ../reporting/reports_main.php:278
 #: ../reporting/reports_main.php:286
-#: ../reporting/reports_main.php:295
-#: ../reporting/reports_main.php:306
-#: ../reporting/reports_main.php:312
-#: ../reporting/reports_main.php:321
-#: ../reporting/reports_main.php:331
-#: ../reporting/reports_main.php:339
-#: ../reporting/reports_main.php:349
-#: ../reporting/reports_main.php:354
-#: ../reporting/reports_main.php:362
-#: ../reporting/reports_main.php:371
-#: ../reporting/reports_main.php:378
-#: ../reporting/reports_main.php:385
-#: ../reporting/reports_main.php:392
+#: ../reporting/reports_main.php:293
+#: ../reporting/reports_main.php:300
+#: ../reporting/reports_main.php:309
+#: ../reporting/reports_main.php:322
+#: ../reporting/reports_main.php:335
+#: ../reporting/reports_main.php:342
+#: ../reporting/reports_main.php:357
+#: ../reporting/reports_main.php:365
+#: ../reporting/reports_main.php:376
+#: ../reporting/reports_main.php:388
+#: ../reporting/reports_main.php:398
+#: ../reporting/reports_main.php:410
+#: ../reporting/reports_main.php:417
+#: ../reporting/reports_main.php:427
+#: ../reporting/reports_main.php:438
+#: ../reporting/reports_main.php:447
+#: ../reporting/reports_main.php:458
+#: ../reporting/reports_main.php:464
+#: ../reporting/reports_main.php:473
+#: ../reporting/reports_main.php:483
+#: ../reporting/reports_main.php:491
+#: ../reporting/reports_main.php:499
+#: ../reporting/reports_main.php:507
+msgid "Orientation"
+msgstr ""
+
+#: ../reporting/reports_main.php:42
+#: ../reporting/reports_main.php:53
+#: ../reporting/reports_main.php:62
+#: ../reporting/reports_main.php:69
+#: ../reporting/reports_main.php:78
+#: ../reporting/reports_main.php:87
+#: ../reporting/reports_main.php:94
+#: ../reporting/reports_main.php:159
+#: ../reporting/reports_main.php:170
+#: ../reporting/reports_main.php:178
+#: ../reporting/reports_main.php:183
+#: ../reporting/reports_main.php:190
+#: ../reporting/reports_main.php:214
+#: ../reporting/reports_main.php:220
+#: ../reporting/reports_main.php:231
+#: ../reporting/reports_main.php:240
+#: ../reporting/reports_main.php:246
+#: ../reporting/reports_main.php:256
+#: ../reporting/reports_main.php:264
+#: ../reporting/reports_main.php:272
+#: ../reporting/reports_main.php:279
+#: ../reporting/reports_main.php:287
+#: ../reporting/reports_main.php:294
+#: ../reporting/reports_main.php:310
+#: ../reporting/reports_main.php:323
+#: ../reporting/reports_main.php:329
+#: ../reporting/reports_main.php:336
+#: ../reporting/reports_main.php:343
+#: ../reporting/reports_main.php:358
+#: ../reporting/reports_main.php:366
+#: ../reporting/reports_main.php:377
+#: ../reporting/reports_main.php:389
+#: ../reporting/reports_main.php:399
+#: ../reporting/reports_main.php:411
+#: ../reporting/reports_main.php:418
+#: ../reporting/reports_main.php:428
+#: ../reporting/reports_main.php:439
+#: ../reporting/reports_main.php:448
+#: ../reporting/reports_main.php:459
+#: ../reporting/reports_main.php:465
+#: ../reporting/reports_main.php:474
+#: ../reporting/reports_main.php:484
+#: ../reporting/reports_main.php:492
+#: ../reporting/reports_main.php:500
+#: ../reporting/reports_main.php:508
 msgid "Destination"
 msgstr ""
 
-#: ../reporting/reports_main.php:41
+#: ../reporting/reports_main.php:43
 msgid "&Aged Customer Analysis"
 msgstr ""
 
-#: ../reporting/reports_main.php:47
-#: ../reporting/reports_main.php:139
-#: ../reporting/reports_main.php:273
-#: ../reporting/reports_main.php:284
-#: ../reporting/reports_main.php:319
-#: ../reporting/reports_main.php:329
-#: ../reporting/reports_main.php:360
-#: ../reporting/reports_main.php:369
+#: ../reporting/reports_main.php:50
+#: ../reporting/reports_main.php:167
+#: ../reporting/reports_main.php:374
+#: ../reporting/reports_main.php:386
+#: ../reporting/reports_main.php:425
+#: ../reporting/reports_main.php:436
+#: ../reporting/reports_main.php:471
+#: ../reporting/reports_main.php:481
 msgid "Graphics"
 msgstr ""
 
-#: ../reporting/reports_main.php:50
+#: ../reporting/reports_main.php:54
 msgid "Customer &Detail Listing"
 msgstr ""
 
-#: ../reporting/reports_main.php:54
+#: ../reporting/reports_main.php:58
+#: ../reporting/reports_main.php:186
 msgid "Activity Greater Than"
 msgstr ""
 
-#: ../reporting/reports_main.php:55
+#: ../reporting/reports_main.php:59
+#: ../reporting/reports_main.php:187
 msgid "Activity Less Than"
 msgstr ""
 
-#: ../reporting/reports_main.php:58
+#: ../reporting/reports_main.php:63
+msgid "Sales &Summary Report"
+msgstr ""
+
+#: ../reporting/reports_main.php:70
 msgid "&Price Listing"
 msgstr ""
 
-#: ../reporting/reports_main.php:60
-#: ../reporting/reports_main.php:69
-#: ../reporting/reports_main.php:169
-#: ../reporting/reports_main.php:175
-#: ../reporting/reports_main.php:180
-#: ../reporting/reports_main.php:191
+#: ../reporting/reports_main.php:72
+#: ../reporting/reports_main.php:82
+#: ../reporting/reports_main.php:209
+#: ../reporting/reports_main.php:216
+#: ../reporting/reports_main.php:222
+#: ../reporting/reports_main.php:235
+#: ../reporting/reports_main.php:250
+#: ../reporting/reports_main.php:260
+#: ../reporting/reports_main.php:268
+#: ../reporting/reports_main.php:276
 msgid "Inventory Category"
 msgstr ""
 
-#: ../reporting/reports_main.php:61
+#: ../reporting/reports_main.php:73
 #: ../sales/manage/sales_types.php:16
 msgid "Sales Types"
 msgstr ""
 
-#: ../reporting/reports_main.php:62
-#: ../reporting/reports_main.php:182
+#: ../reporting/reports_main.php:74
+#: ../reporting/reports_main.php:224
 msgid "Show Pictures"
 msgstr ""
 
-#: ../reporting/reports_main.php:66
+#: ../reporting/reports_main.php:79
 msgid "&Order Status Listing"
 msgstr ""
 
-#: ../reporting/reports_main.php:70
+#: ../reporting/reports_main.php:83
 msgid "Stock Location"
 msgstr ""
 
-#: ../reporting/reports_main.php:74
+#: ../reporting/reports_main.php:88
 msgid "&Salesman Listing"
 msgstr ""
 
-#: ../reporting/reports_main.php:80
-msgid "Print &Invoices/Credit Notes"
+#: ../reporting/reports_main.php:95
+msgid "Print &Invoices"
 msgstr ""
 
-#: ../reporting/reports_main.php:84
-#: ../reporting/reports_main.php:90
+#: ../reporting/reports_main.php:99
+#: ../reporting/reports_main.php:109
+#: ../reporting/reports_main.php:116
 msgid "email Customers"
 msgstr ""
 
-#: ../reporting/reports_main.php:85
+#: ../reporting/reports_main.php:100
+#: ../reporting/reports_main.php:110
 msgid "Payment Link"
 msgstr ""
 
-#: ../reporting/reports_main.php:87
+#: ../reporting/reports_main.php:105
+msgid "Print &Credit Notes"
+msgstr ""
+
+#: ../reporting/reports_main.php:113
 msgid "Print &Deliveries"
 msgstr ""
 
-#: ../reporting/reports_main.php:91
+#: ../reporting/reports_main.php:117
 msgid "Print as Packing Slip"
 msgstr ""
 
-#: ../reporting/reports_main.php:93
+#: ../reporting/reports_main.php:120
 msgid "Print &Statements"
 msgstr ""
 
-#: ../reporting/reports_main.php:96
-msgid "Show Outstanding Only"
-msgstr ""
-
-#: ../reporting/reports_main.php:97
-#: ../reporting/reports_main.php:103
-#: ../reporting/reports_main.php:110
-#: ../reporting/reports_main.php:116
-#: ../reporting/reports_main.php:157
-#: ../reporting/reports_main.php:163
+#: ../reporting/reports_main.php:124
+#: ../reporting/reports_main.php:131
+#: ../reporting/reports_main.php:139
 msgid "Email Customers"
 msgstr ""
 
-#: ../reporting/reports_main.php:99
+#: ../reporting/reports_main.php:127
 msgid "&Print Sales Orders"
 msgstr ""
 
-#: ../reporting/reports_main.php:104
+#: ../reporting/reports_main.php:132
 msgid "Print as Quote"
 msgstr ""
 
-#: ../reporting/reports_main.php:106
-#: ../reporting/reports_main.php:112
+#: ../reporting/reports_main.php:135
 msgid "&Print Sales Quotations"
 msgstr ""
 
-#: ../reporting/reports_main.php:118
+#: ../reporting/reports_main.php:142
 msgid "Print Receipts"
 msgstr ""
 
-#: ../reporting/reports_main.php:125
+#: ../reporting/reports_main.php:150
 msgid "Supplier &Balances"
 msgstr ""
 
-#: ../reporting/reports_main.php:133
+#: ../reporting/reports_main.php:160
 msgid "&Aged Supplier Analyses"
 msgstr ""
 
-#: ../reporting/reports_main.php:142
+#: ../reporting/reports_main.php:171
 msgid "&Payment Report"
 msgstr ""
 
-#: ../reporting/reports_main.php:149
+#: ../reporting/reports_main.php:179
 msgid "Outstanding &GRNs Report"
 msgstr ""
 
-#: ../reporting/reports_main.php:153
+#: ../reporting/reports_main.php:184
+msgid "Supplier &Detail Listing"
+msgstr ""
+
+#: ../reporting/reports_main.php:191
 msgid "Print Purchase &Orders"
 msgstr ""
 
-#: ../reporting/reports_main.php:159
-msgid "Print Remittances"
+#: ../reporting/reports_main.php:195
+#: ../reporting/reports_main.php:202
+msgid "Email Suppliers"
 msgstr ""
 
-#: ../reporting/reports_main.php:168
+#: ../reporting/reports_main.php:198
+msgid "Print Remi&ttances"
+msgstr ""
+
+#: ../reporting/reports_main.php:207
 msgid "Inventory &Valuation Report"
 msgstr ""
 
-#: ../reporting/reports_main.php:174
+#: ../reporting/reports_main.php:215
 msgid "Inventory &Planning Report"
 msgstr ""
 
-#: ../reporting/reports_main.php:179
+#: ../reporting/reports_main.php:221
 msgid "Stock &Check Sheets"
 msgstr ""
 
-#: ../reporting/reports_main.php:183
+#: ../reporting/reports_main.php:225
 msgid "Inventory Column"
 msgstr ""
 
-#: ../reporting/reports_main.php:184
+#: ../reporting/reports_main.php:226
 msgid "Show Shortage"
 msgstr ""
 
-#: ../reporting/reports_main.php:188
+#: ../reporting/reports_main.php:228
+msgid "Item Like"
+msgstr ""
+
+#: ../reporting/reports_main.php:232
 msgid "Inventory &Sales Report"
 msgstr ""
 
-#: ../reporting/reports_main.php:196
+#: ../reporting/reports_main.php:241
 msgid "&GRN Valuation Report"
 msgstr ""
 
-#: ../reporting/reports_main.php:202
+#: ../reporting/reports_main.php:247
+msgid "Inventory P&urchasing Report"
+msgstr ""
+
+#: ../reporting/reports_main.php:257
+msgid "Inventory &Movement Report"
+msgstr ""
+
+#: ../reporting/reports_main.php:265
+msgid "C&osted Inventory Movement Report"
+msgstr ""
+
+#: ../reporting/reports_main.php:273
+msgid "Item &Sales Summary Report"
+msgstr ""
+
+#: ../reporting/reports_main.php:281
 msgid "Manufacturing"
 msgstr ""
 
-#: ../reporting/reports_main.php:203
+#: ../reporting/reports_main.php:282
 msgid "&Bill of Material Listing"
 msgstr ""
 
-#: ../reporting/reports_main.php:204
+#: ../reporting/reports_main.php:283
 msgid "From product"
 msgstr ""
 
-#: ../reporting/reports_main.php:205
+#: ../reporting/reports_main.php:284
 msgid "To product"
 msgstr ""
 
-#: ../reporting/reports_main.php:208
+#: ../reporting/reports_main.php:288
+msgid "Work Order &Listing"
+msgstr ""
+
+#: ../reporting/reports_main.php:291
+msgid "Outstanding Only"
+msgstr ""
+
+#: ../reporting/reports_main.php:295
 msgid "Print &Work Orders"
 msgstr ""
 
-#: ../reporting/reports_main.php:211
+#: ../reporting/reports_main.php:298
 msgid "Email Locations"
 msgstr ""
 
-#: ../reporting/reports_main.php:216
+#: ../reporting/reports_main.php:304
 msgid "Dimension &Summary"
 msgstr ""
 
-#: ../reporting/reports_main.php:217
+#: ../reporting/reports_main.php:305
 msgid "From Dimension"
 msgstr ""
 
-#: ../reporting/reports_main.php:218
+#: ../reporting/reports_main.php:306
 msgid "To Dimension"
 msgstr ""
 
-#: ../reporting/reports_main.php:219
-msgid "Show Balance"
-msgstr ""
-
-#: ../reporting/reports_main.php:226
+#: ../reporting/reports_main.php:315
 msgid "Banking"
 msgstr ""
 
-#: ../reporting/reports_main.php:227
+#: ../reporting/reports_main.php:316
 msgid "Bank &Statement"
 msgstr ""
 
-#: ../reporting/reports_main.php:234
+#: ../reporting/reports_main.php:320
+#: ../reporting/reports_main.php:393
+#: ../reporting/reports_main.php:443
+#: ../reporting/reports_main.php:488
+msgid "Zero values"
+msgstr ""
+
+#: ../reporting/reports_main.php:324
+msgid "Bank Statement w/ &Reconcile"
+msgstr ""
+
+#: ../reporting/reports_main.php:331
 msgid "General Ledger"
 msgstr ""
 
-#: ../reporting/reports_main.php:235
+#: ../reporting/reports_main.php:332
 msgid "Chart of &Accounts"
 msgstr ""
 
-#: ../reporting/reports_main.php:236
+#: ../reporting/reports_main.php:333
 msgid "Show Balances"
 msgstr ""
 
-#: ../reporting/reports_main.php:239
+#: ../reporting/reports_main.php:337
 msgid "List of &Journal Entries"
 msgstr ""
 
-#: ../reporting/reports_main.php:250
-#: ../reporting/reports_main.php:299
-#: ../reporting/reports_main.php:343
+#: ../reporting/reports_main.php:349
+#: ../reporting/reports_main.php:403
+#: ../reporting/reports_main.php:452
 msgid "GL Account &Transactions"
 msgstr ""
 
-#: ../reporting/reports_main.php:253
-#: ../reporting/reports_main.php:302
-#: ../reporting/reports_main.php:346
+#: ../reporting/reports_main.php:352
+#: ../reporting/reports_main.php:406
+#: ../reporting/reports_main.php:455
 msgid "From Account"
 msgstr ""
 
-#: ../reporting/reports_main.php:254
-#: ../reporting/reports_main.php:303
-#: ../reporting/reports_main.php:347
+#: ../reporting/reports_main.php:353
+#: ../reporting/reports_main.php:407
+#: ../reporting/reports_main.php:456
 msgid "To Account"
 msgstr ""
 
-#: ../reporting/reports_main.php:259
-#: ../reporting/reports_main.php:307
-#: ../reporting/reports_main.php:350
+#: ../reporting/reports_main.php:359
+#: ../reporting/reports_main.php:412
+#: ../reporting/reports_main.php:460
 msgid "Annual &Expense Breakdown"
 msgstr ""
 
-#: ../reporting/reports_main.php:266
-#: ../reporting/reports_main.php:313
-#: ../reporting/reports_main.php:355
+#: ../reporting/reports_main.php:367
+#: ../reporting/reports_main.php:419
+#: ../reporting/reports_main.php:466
 msgid "&Balance Sheet"
 msgstr ""
 
-#: ../reporting/reports_main.php:272
-#: ../reporting/reports_main.php:283
-#: ../reporting/reports_main.php:318
-#: ../reporting/reports_main.php:328
-#: ../reporting/reports_main.php:359
-#: ../reporting/reports_main.php:368
+#: ../reporting/reports_main.php:373
+#: ../reporting/reports_main.php:385
+#: ../reporting/reports_main.php:424
+#: ../reporting/reports_main.php:435
+#: ../reporting/reports_main.php:470
+#: ../reporting/reports_main.php:480
 msgid "Decimal values"
 msgstr ""
 
-#: ../reporting/reports_main.php:276
-#: ../reporting/reports_main.php:322
-#: ../reporting/reports_main.php:363
+#: ../reporting/reports_main.php:378
+#: ../reporting/reports_main.php:429
+#: ../reporting/reports_main.php:475
 msgid "&Profit and Loss Statement"
 msgstr ""
 
-#: ../reporting/reports_main.php:290
-#: ../reporting/reports_main.php:335
-#: ../reporting/reports_main.php:375
-msgid "Zero values"
-msgstr ""
-
-#: ../reporting/reports_main.php:380
+#: ../reporting/reports_main.php:494
 msgid "Ta&x Report"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:14
-msgid "Cust no"
-msgstr ""
-
 #: ../reporting/includes/doctext.inc:18
-msgid "Order To"
-msgstr ""
-
-#: ../reporting/includes/doctext.inc:20
-msgid "Deliver To"
-msgstr ""
-
-#: ../reporting/includes/doctext.inc:22
-#: ../reporting/includes/doctext.inc:29
+#: ../reporting/includes/doctext.inc:156
 #: ../sales/view/view_dispatch.php:51
-#: ../sales/view/view_invoice.php:51
+#: ../sales/view/view_invoice.php:53
 msgid "Charge To"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:27
-msgid "With thanks from"
-msgstr ""
-
-#: ../reporting/includes/doctext.inc:30
+#: ../reporting/includes/doctext.inc:23
 #: ../sales/view/view_dispatch.php:74
 msgid "Delivered To"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:34
-#: ../sales/view/view_sales_order.php:68
-#: ../sales/inquiry/sales_orders_view.php:273
-#: ../sales/includes/ui/sales_order_ui.inc:603
-msgid "Valid until"
-msgstr ""
-
-#: ../reporting/includes/doctext.inc:39
-msgid "Your Ref"
-msgstr ""
-
-#: ../reporting/includes/doctext.inc:54
-#: ../sales/manage/customer_branches.php:296
-msgid "Sales Person"
-msgstr ""
-
-#: ../reporting/includes/doctext.inc:55
-msgid "Your VAT no."
-msgstr ""
-
-#: ../reporting/includes/doctext.inc:57
-msgid "Customers Reference"
-msgstr ""
-
-#: ../reporting/includes/doctext.inc:58
-#: ../sales/view/view_dispatch.php:87
-#: ../sales/view/view_invoice.php:86
-msgid "Our Order No"
-msgstr ""
-
-#: ../reporting/includes/doctext.inc:60
-msgid "Our VAT No."
-msgstr ""
-
-#: ../reporting/includes/doctext.inc:61
-msgid "Domicile"
-msgstr ""
-
-#: ../reporting/includes/doctext.inc:66
-msgid "* Subject to Realisation of the Cheque."
+#: ../reporting/includes/doctext.inc:30
+#: ../sales/customer_credit_invoice.php:281
+#: ../sales/view/view_credit.php:91
+#: ../sales/view/view_dispatch.php:113
+#: ../sales/view/view_invoice.php:116
+#: ../sales/includes/ui/sales_credit_ui.inc:168
+#: ../sales/includes/ui/sales_order_ui.inc:148
+msgid "Discount %"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:68
+#: ../reporting/includes/doctext.inc:33
 msgid "All amounts stated in"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:72
-msgid "Please quote Invoice no. when paying. All amounts stated in"
+#: ../reporting/includes/doctext.inc:51
+msgid "Quotation No."
 msgstr ""
 
+#: ../reporting/includes/doctext.inc:56
 #: ../reporting/includes/doctext.inc:73
-msgid "Please quote Credit no. when paying. All amounts stated in"
+#: ../reporting/includes/doctext.inc:94
+#: ../reporting/includes/doctext.inc:108
+#: ../reporting/includes/doctext.inc:131
+#: ../reporting/includes/doctext.inc:161
+#: ../reporting/includes/doctext.inc:184
+#: ../reporting/includes/doctext.inc:202
+#: ../reporting/includes/doctext.inc:240
+msgid "Customer's Reference"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:76
-msgid "Phone/Fax/Email"
+#: ../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:185
+#: ../reporting/includes/doctext.inc:241
+#: ../sales/manage/customer_branches.php:298
+msgid "Sales Person"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:78
-#: ../reporting/includes/doctext.inc:125
-msgid "You can pay through"
+#: ../reporting/includes/doctext.inc:58
+#: ../reporting/includes/doctext.inc:75
+#: ../reporting/includes/doctext.inc:96
+#: ../reporting/includes/doctext.inc:110
+#: ../reporting/includes/doctext.inc:133
+#: ../reporting/includes/doctext.inc:163
+#: ../reporting/includes/doctext.inc:186
+#: ../reporting/includes/doctext.inc:204
+#: ../reporting/includes/doctext.inc:242
+msgid "Your VAT no."
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:111
-#: ../sales/customer_credit_invoice.php:281
-#: ../sales/view/view_credit.php:91
-#: ../sales/view/view_dispatch.php:113
-#: ../sales/view/view_invoice.php:114
-#: ../sales/includes/ui/sales_credit_ui.inc:168
-#: ../sales/includes/ui/sales_order_ui.inc:142
-msgid "Discount %"
+#: ../reporting/includes/doctext.inc:59
+msgid "Our Quotation No"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:116
-msgid "DueDate"
+#: ../reporting/includes/doctext.inc:60
+#: ../sales/view/view_sales_order.php:69
+#: ../sales/inquiry/sales_orders_view.php:305
+#: ../sales/includes/ui/sales_order_ui.inc:597
+msgid "Valid until"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:122
-msgid "Dear"
+#: ../reporting/includes/doctext.inc:65
+msgid "PREPAYMENT ORDER"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:123
-msgid "Attached you will find "
+#: ../reporting/includes/doctext.inc:66
+msgid "Order No."
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:124
-msgid "Kindest regards"
+#: ../reporting/includes/doctext.inc:76
+#: ../reporting/includes/doctext.inc:97
+#: ../reporting/includes/doctext.inc:111
+#: ../reporting/includes/doctext.inc:138
+#: ../reporting/includes/doctext.inc:205
+#: ../reporting/includes/doctext.inc:243
+#: ../sales/view/view_dispatch.php:87
+#: ../sales/view/view_invoice.php:87
+msgid "Our Order No"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:129
-#: ../reporting/includes/doctext.inc:138
+#: ../reporting/includes/doctext.inc:83
 msgid "Delivery Note No."
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:130
-msgid "Receipt No."
+#: ../reporting/includes/doctext.inc:98
+msgid "To Be Invoiced Before"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:131
-msgid "Remittance No."
+#: ../reporting/includes/doctext.inc:104
+msgid "Credit No."
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:132
-msgid "Purchase Order No."
+#: ../reporting/includes/doctext.inc:105
+msgid "Please quote Credit no. when paying. All amounts stated in"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:133
-#: ../reporting/includes/doctext.inc:139
-msgid "Order No."
+#: ../reporting/includes/doctext.inc:117
+msgid "PREPAYMENT INVOICE"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:134
-msgid "Quotation No."
+#: ../reporting/includes/doctext.inc:118
+msgid "FINAL INVOICE"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:135
+#: ../reporting/includes/doctext.inc:119
 msgid "Invoice No."
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:136
-msgid "Credit No."
+#: ../reporting/includes/doctext.inc:121
+msgid "Please quote Invoice no. when paying. All amounts stated in"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:148
-#: ../sales/view/view_credit.php:138
-#: ../sales/view/view_dispatch.php:155
-#: ../sales/view/view_invoice.php:157
-#: ../sales/view/view_sales_order.php:226
-#: ../sales/includes/ui/sales_credit_ui.inc:222
-msgid "Shipping"
+#: ../reporting/includes/doctext.inc:137
+msgid "Date of Payment"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:151
-#: ../sales/view/view_credit.php:143
-msgid "TOTAL CREDIT"
+#: ../reporting/includes/doctext.inc:143
+msgid "Date of Sale"
 msgstr ""
 
 #: ../reporting/includes/doctext.inc:152
-msgid "TOTAL ORDER EX VAT"
+msgid "Remittance No."
 msgstr ""
 
 #: ../reporting/includes/doctext.inc:153
-msgid "TOTAL ORDER VAT INCL."
-msgstr ""
-
-#: ../reporting/includes/doctext.inc:154
-msgid "TOTAL PO"
-msgstr ""
-
-#: ../reporting/includes/doctext.inc:155
-msgid "TOTAL DELIVERY INCL. VAT"
-msgstr ""
-
-#: ../reporting/includes/doctext.inc:159
-msgid "As advance / full / part / payment towards:"
-msgstr ""
-
-#: ../reporting/includes/doctext.inc:160
-msgid "By Cash / Cheque* / Draft No."
+#: ../reporting/includes/doctext.inc:173
+msgid "Order To"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:161
-msgid "Dated"
+#: ../reporting/includes/doctext.inc:172
+msgid "Purchase Order No."
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:162
-msgid "Drawn on Bank"
+#: ../reporting/includes/doctext.inc:176
+msgid "Deliver To"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:164
-msgid "Received / Sign"
+#: ../reporting/includes/doctext.inc:199
+msgid "Receipt No."
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:168
-msgid "TOTAL RECEIPT"
+#: ../reporting/includes/doctext.inc:200
+msgid "With thanks from"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:170
-msgid "TOTAL REMITTANCE"
+#: ../reporting/includes/doctext.inc:215
+msgid "Work Order No."
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:174
-msgid "Outstanding Transactions"
+#: ../reporting/includes/doctext.inc:246
+msgid "DueDate"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:177
-msgid "Statement"
+#: ../reporting/includes/doctext.inc:272
+#: ../reporting/includes/pdf_report.inc:1019
+msgid "You can pay through"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:178
-msgid "as of"
+#: ../reporting/includes/doctext.inc:276
+msgid "* Subject to Realisation of the Cheque."
 msgstr ""
 
 #: ../reporting/includes/excel_report.inc:67
@@ -12243,43 +13353,66 @@ msgid "Report Date"
 msgstr ""
 
 #: ../reporting/includes/excel_report.inc:413
-#: ../reporting/includes/pdf_report.inc:599
+#: ../reporting/includes/pdf_report.inc:600
 msgid "Generated At"
 msgstr ""
 
 #: ../reporting/includes/excel_report.inc:419
-#: ../reporting/includes/pdf_report.inc:608
+#: ../reporting/includes/pdf_report.inc:609
 msgid "Generated By"
 msgstr ""
 
-#: ../reporting/includes/header2.inc:150
+#: ../reporting/includes/header2.inc:125
+msgid "Our VAT No."
+msgstr ""
+
+#: ../reporting/includes/header2.inc:131
+msgid "Domicile"
+msgstr ""
+
+#: ../reporting/includes/header2.inc:146
 #: ../reporting/includes/pdf_report.inc:352
-#: ../reporting/includes/pdf_report.inc:499
-#: ../reporting/includes/pdf_report.inc:627
+#: ../reporting/includes/pdf_report.inc:501
+#: ../reporting/includes/pdf_report.inc:628
 msgid "Page"
 msgstr ""
 
-#: ../reporting/includes/pdf_report.inc:582
+#: ../reporting/includes/pdf_report.inc:583
 msgid "Report Period"
 msgstr ""
 
-#: ../reporting/includes/pdf_report.inc:980
-msgid "You have no email contact defined for this type of document"
+#: ../reporting/includes/pdf_report.inc:986
+#: ../reporting/includes/pdf_report.inc:1034
+#, php-format
+msgid "You have no email contact defined for this type of document for '%s'."
+msgstr ""
+
+#: ../reporting/includes/pdf_report.inc:1005
+msgid "Dear"
+msgstr ""
+
+#: ../reporting/includes/pdf_report.inc:1006
+msgid "Attached you will find "
 msgstr ""
 
 #: ../reporting/includes/pdf_report.inc:1022
-msgid "There is no contact email set for this document type."
+msgid "Kindest regards"
 msgstr ""
 
-#: ../reporting/includes/pdf_report.inc:1024
+#: ../reporting/includes/pdf_report.inc:1037
 msgid "Sending document by email failed"
 msgstr ""
 
-#: ../reporting/includes/pdf_report.inc:1027
+#: ../reporting/includes/pdf_report.inc:1037
+#: ../reporting/includes/pdf_report.inc:1040
+msgid "Email:"
+msgstr ""
+
+#: ../reporting/includes/pdf_report.inc:1040
 msgid "has been sent by email to destination."
 msgstr ""
 
-#: ../reporting/includes/pdf_report.inc:1057
+#: ../reporting/includes/pdf_report.inc:1070
 msgid "Report has been sent to network printer "
 msgstr ""
 
@@ -12311,134 +13444,163 @@ msgstr ""
 msgid "Cannot flush printing queue"
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:57
+#: ../reporting/includes/reports_classes.inc:61
 msgid "Report Classes:"
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:75
+#: ../reporting/includes/reports_classes.inc:81
 msgid "Reports For Class: "
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:96
+#: ../reporting/includes/reports_classes.inc:101
 msgid "Display: "
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:143
+#: ../reporting/includes/reports_classes.inc:152
 msgid "Unknown report parameter type:"
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:169
+#: ../reporting/includes/reports_classes.inc:178
 msgid "No Currency Filter"
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:218
-msgid "No payment Link"
+#: ../reporting/includes/reports_classes.inc:234
+msgid "PDF/Printer"
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:222
-msgid "PDF/Printer"
+#: ../reporting/includes/reports_classes.inc:241
+msgid "Portrait"
+msgstr ""
+
+#: ../reporting/includes/reports_classes.inc:241
+msgid "Landscape"
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:233
+#: ../reporting/includes/reports_classes.inc:252
 msgid "No Graphics"
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:233
+#: ../reporting/includes/reports_classes.inc:252
 msgid "Vertical bars"
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:233
+#: ../reporting/includes/reports_classes.inc:252
 msgid "Horizontal bars"
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:234
+#: ../reporting/includes/reports_classes.inc:253
 msgid "Dots"
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:234
+#: ../reporting/includes/reports_classes.inc:253
 msgid "Lines"
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:234
+#: ../reporting/includes/reports_classes.inc:253
 msgid "Pie"
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:234
+#: ../reporting/includes/reports_classes.inc:253
 msgid "Donut"
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:238
-#: ../reporting/includes/reports_classes.inc:241
+#: ../reporting/includes/reports_classes.inc:257
+#: ../reporting/includes/reports_classes.inc:260
 msgid "No Type Filter"
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:251
+#: ../reporting/includes/reports_classes.inc:270
 msgid "No Account Group Filter"
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:266
-#: ../reporting/includes/reports_classes.inc:272
-#: ../reporting/includes/reports_classes.inc:278
+#: ../reporting/includes/reports_classes.inc:285
+#: ../reporting/includes/reports_classes.inc:291
+#: ../reporting/includes/reports_classes.inc:297
 msgid "No Dimension Filter"
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:284
+#: ../reporting/includes/reports_classes.inc:303
 msgid "No Customer Filter"
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:295
+#: ../reporting/includes/reports_classes.inc:311
 msgid "No Supplier Filter"
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:374
+#: ../reporting/includes/reports_classes.inc:399
 msgid "No Location Filter"
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:377
+#: ../reporting/includes/reports_classes.inc:402
 msgid "No Category Filter"
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:386
+#: ../reporting/includes/reports_classes.inc:411
 msgid "No Sales Folk Filter"
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:393
+#: ../reporting/includes/reports_classes.inc:418
 msgid "No Users Filter"
 msgstr ""
 
-#: ../sales/create_recurrent_invoices.php:24
+#: ../sales/create_recurrent_invoices.php:26
 msgid "Create and Print Recurrent Invoices"
 msgstr ""
 
-#: ../sales/create_recurrent_invoices.php:98
-#: ../sales/manage/recurrent_invoices.php:85
+#: ../sales/create_recurrent_invoices.php:44
+#, php-format
+msgid "Recurrent Invoice covers period %s - %s."
+msgstr ""
+
+#: ../sales/create_recurrent_invoices.php:110
+#, php-format
+msgid "%s recurrent invoice(s) created, # %s - # %s."
+msgstr ""
+
+#: ../sales/create_recurrent_invoices.php:115
+#, php-format
+msgid "&Print Recurrent Invoices # %s - # %s"
+msgstr ""
+
+#: ../sales/create_recurrent_invoices.php:117
+#, php-format
+msgid "&Email Recurrent Invoices # %s - # %s"
+msgstr ""
+
+#: ../sales/create_recurrent_invoices.php:129
+msgid "Invoice date:"
+msgstr ""
+
+#: ../sales/create_recurrent_invoices.php:134
+#: ../sales/manage/recurrent_invoices.php:102
 msgid "Template No"
 msgstr ""
 
-#: ../sales/create_recurrent_invoices.php:98
-#: ../sales/manage/recurrent_invoices.php:85
+#: ../sales/create_recurrent_invoices.php:134
+#: ../sales/manage/recurrent_invoices.php:102
 msgid "Begin"
 msgstr ""
 
-#: ../sales/create_recurrent_invoices.php:98
-#: ../sales/manage/recurrent_invoices.php:85
+#: ../sales/create_recurrent_invoices.php:134
+#: ../sales/manage/recurrent_invoices.php:102
 msgid "End"
 msgstr ""
 
-#: ../sales/create_recurrent_invoices.php:98
-#: ../sales/manage/recurrent_invoices.php:85
+#: ../sales/create_recurrent_invoices.php:134
+#: ../sales/manage/recurrent_invoices.php:102
+#: ../sales/manage/recurrent_invoices.php:185
 msgid "Last Created"
 msgstr ""
 
-#: ../sales/create_recurrent_invoices.php:142
+#: ../sales/create_recurrent_invoices.php:175
 msgid "Create Invoices"
 msgstr ""
 
-#: ../sales/create_recurrent_invoices.php:149
+#: ../sales/create_recurrent_invoices.php:183
 msgid "Marked items are due."
 msgstr ""
 
-#: ../sales/create_recurrent_invoices.php:151
+#: ../sales/create_recurrent_invoices.php:185
 msgid "No recurrent invoices are due."
 msgstr ""
 
@@ -12448,7 +13610,7 @@ msgid "Modifying Customer Credit Note #%d"
 msgstr ""
 
 #: ../sales/credit_note_entry.php:51
-#: ../sales/sales_order_entry.php:638
+#: ../sales/sales_order_entry.php:705
 msgid ""
 "There are no customers, or there are no customers with branches. Please "
 "define customers and customer branches."
@@ -12473,7 +13635,7 @@ msgstr ""
 
 #: ../sales/credit_note_entry.php:73
 #: ../sales/customer_credit_invoice.php:60
-#: ../sales/customer_credit_invoice.php:75
+#: ../sales/customer_credit_invoice.php:77
 msgid "View the GL &Journal Entries for this Credit Note"
 msgstr ""
 
@@ -12481,39 +13643,39 @@ msgstr ""
 msgid "Enter Another &Credit Note"
 msgstr ""
 
-#: ../sales/credit_note_entry.php:155
+#: ../sales/credit_note_entry.php:153
 msgid "The entered date for the credit note is invalid."
 msgstr ""
 
-#: ../sales/credit_note_entry.php:172
+#: ../sales/credit_note_entry.php:170
 msgid ""
 "For credit notes created to write off the stock, a general ledger account is "
 "required to be selected."
 msgstr ""
 
-#: ../sales/credit_note_entry.php:173
+#: ../sales/credit_note_entry.php:171
 msgid ""
 "Please select an account to write the cost of the stock off to, then click "
 "on Process again."
 msgstr ""
 
-#: ../sales/credit_note_entry.php:193
+#: ../sales/credit_note_entry.php:197
 msgid "The quantity must be greater than zero."
 msgstr ""
 
-#: ../sales/credit_note_entry.php:198
+#: ../sales/credit_note_entry.php:202
 msgid "The entered price is negative or invalid."
 msgstr ""
 
-#: ../sales/credit_note_entry.php:203
+#: ../sales/credit_note_entry.php:207
 msgid "The entered discount percent is negative, greater than 100 or invalid."
 msgstr ""
 
-#: ../sales/credit_note_entry.php:271
+#: ../sales/credit_note_entry.php:275
 msgid "Credit Note Items"
 msgstr ""
 
-#: ../sales/credit_note_entry.php:281
+#: ../sales/credit_note_entry.php:285
 #: ../sales/customer_credit_invoice.php:382
 msgid "Process Credit Note"
 msgstr ""
@@ -12532,36 +13694,36 @@ msgid "Credit Note has been processed"
 msgstr ""
 
 #: ../sales/customer_credit_invoice.php:55
-#: ../sales/customer_credit_invoice.php:70
+#: ../sales/customer_credit_invoice.php:72
 msgid "&View This Credit Note"
 msgstr ""
 
 #: ../sales/customer_credit_invoice.php:57
-#: ../sales/customer_credit_invoice.php:72
+#: ../sales/customer_credit_invoice.php:74
 msgid "&Print This Credit Note"
 msgstr ""
 
 #: ../sales/customer_credit_invoice.php:58
-#: ../sales/customer_credit_invoice.php:73
+#: ../sales/customer_credit_invoice.php:75
 msgid "&Email This Credit Note"
 msgstr ""
 
-#: ../sales/customer_credit_invoice.php:68
+#: ../sales/customer_credit_invoice.php:70
 msgid "Credit Note has been updated"
 msgstr ""
 
-#: ../sales/customer_credit_invoice.php:112
+#: ../sales/customer_credit_invoice.php:109
 msgid "The entered shipping cost is invalid or less than zero."
 msgstr ""
 
-#: ../sales/customer_credit_invoice.php:117
-#: ../sales/customer_credit_invoice.php:139
+#: ../sales/customer_credit_invoice.php:114
+#: ../sales/customer_credit_invoice.php:136
 msgid ""
 "Selected quantity cannot be less than zero nor more than quantity not "
 "credited yet."
 msgstr ""
 
-#: ../sales/customer_credit_invoice.php:137
+#: ../sales/customer_credit_invoice.php:134
 msgid ""
 "This page can only be opened if an invoice has been selected for crediting."
 msgstr ""
@@ -12615,738 +13777,829 @@ msgid "Deliver Items for a Sales Order"
 msgstr ""
 
 #: ../sales/customer_delivery.php:50
-#: ../sales/sales_order_entry.php:175
+#: ../sales/sales_order_entry.php:189
 #, php-format
 msgid "Delivery # %d has been entered."
 msgstr ""
 
 #: ../sales/customer_delivery.php:52
-#: ../sales/sales_order_entry.php:177
+#: ../sales/sales_order_entry.php:191
 msgid "&View This Delivery"
 msgstr ""
 
 #: ../sales/customer_delivery.php:54
-#: ../sales/customer_delivery.php:75
-#: ../sales/sales_order_entry.php:179
+#: ../sales/customer_delivery.php:76
+#: ../sales/sales_order_entry.php:193
 msgid "&Print Delivery Note"
 msgstr ""
 
 #: ../sales/customer_delivery.php:55
-#: ../sales/customer_delivery.php:76
-#: ../sales/sales_order_entry.php:180
+#: ../sales/customer_delivery.php:77
+#: ../sales/sales_order_entry.php:194
 msgid "&Email Delivery Note"
 msgstr ""
 
 #: ../sales/customer_delivery.php:56
-#: ../sales/customer_delivery.php:77
-#: ../sales/sales_order_entry.php:181
+#: ../sales/customer_delivery.php:78
+#: ../sales/sales_order_entry.php:195
 msgid "P&rint as Packing Slip"
 msgstr ""
 
 #: ../sales/customer_delivery.php:57
-#: ../sales/customer_delivery.php:78
-#: ../sales/sales_order_entry.php:182
+#: ../sales/customer_delivery.php:79
+#: ../sales/sales_order_entry.php:196
 msgid "E&mail as Packing Slip"
 msgstr ""
 
 #: ../sales/customer_delivery.php:59
-#: ../sales/sales_order_entry.php:185
+#: ../sales/sales_order_entry.php:199
 msgid "View the GL Journal Entries for this Dispatch"
 msgstr ""
 
-#: ../sales/customer_delivery.php:61
+#: ../sales/customer_delivery.php:62
 msgid "Invoice This Delivery"
 msgstr ""
 
-#: ../sales/customer_delivery.php:63
+#: ../sales/customer_delivery.php:64
 msgid "Select Another Order For Dispatch"
 msgstr ""
 
-#: ../sales/customer_delivery.php:71
+#: ../sales/customer_delivery.php:72
 #, php-format
 msgid "Delivery Note # %d has been updated."
 msgstr ""
 
-#: ../sales/customer_delivery.php:73
+#: ../sales/customer_delivery.php:74
 msgid "View this delivery"
 msgstr ""
 
-#: ../sales/customer_delivery.php:80
+#: ../sales/customer_delivery.php:82
 msgid "Confirm Delivery and Invoice"
 msgstr ""
 
-#: ../sales/customer_delivery.php:82
+#: ../sales/customer_delivery.php:84
 msgid "Select A Different Delivery"
 msgstr ""
 
 #: ../sales/customer_delivery.php:94
+#: ../sales/customer_invoice.php:161
+msgid ""
+"You have to set Deferred Income Account in GL Setup to entry prepayment "
+"invoices."
+msgstr ""
+
+#: ../sales/customer_delivery.php:98
+#: ../sales/customer_delivery.php:103
 msgid "Select a different sales order to delivery"
 msgstr ""
 
-#: ../sales/customer_delivery.php:95
+#: ../sales/customer_delivery.php:99
 msgid "This order has no items. There is nothing to delivery."
 msgstr ""
 
-#: ../sales/customer_delivery.php:107
+#: ../sales/customer_delivery.php:105
+msgid ""
+"This prepayment order is not yet ready for delivery due to insufficient "
+"amount received."
+msgstr ""
+
+#: ../sales/customer_delivery.php:122
 msgid "Select a different delivery"
 msgstr ""
 
-#: ../sales/customer_delivery.php:108
+#: ../sales/customer_delivery.php:123
 msgid "This delivery has all items invoiced. There is nothing to modify."
 msgstr ""
 
-#: ../sales/customer_delivery.php:118
+#: ../sales/customer_delivery.php:133
 msgid ""
 "This page can only be opened if an order or delivery note has been selected. "
 "Please select it first."
 msgstr ""
 
-#: ../sales/customer_delivery.php:120
+#: ../sales/customer_delivery.php:135
 msgid "Select a Sales Order to Delivery"
 msgstr ""
 
-#: ../sales/customer_delivery.php:129
+#: ../sales/customer_delivery.php:144
 msgid ""
 "Selected quantity cannot be less than quantity invoiced nor more than "
 "quantity\tnot dispatched on sales order."
 msgstr ""
 
-#: ../sales/customer_delivery.php:132
+#: ../sales/customer_delivery.php:147
 msgid "Freight cost cannot be less than zero"
 msgstr ""
 
-#: ../sales/customer_delivery.php:144
+#: ../sales/customer_delivery.php:159
 msgid "The entered date of delivery is invalid."
 msgstr ""
 
-#: ../sales/customer_delivery.php:150
-msgid "The entered date of delivery is not in fiscal year."
-msgstr ""
-
-#: ../sales/customer_delivery.php:156
+#: ../sales/customer_delivery.php:171
 msgid "The entered dead-line for invoice is invalid."
 msgstr ""
 
-#: ../sales/customer_delivery.php:179
-#: ../sales/customer_invoice.php:291
+#: ../sales/customer_delivery.php:188
+#: ../sales/customer_invoice.php:354
 msgid "The entered shipping value is not numeric."
 msgstr ""
 
-#: ../sales/customer_delivery.php:185
+#: ../sales/customer_delivery.php:194
 msgid "There are no item quantities on this delivery note."
 msgstr ""
 
-#: ../sales/customer_delivery.php:278
-#: ../sales/sales_order_entry.php:483
-#: ../sales/includes/ui/sales_order_ui.inc:244
+#: ../sales/customer_delivery.php:206
+msgid ""
+"This document cannot be processed because there is insufficient quantity "
+"for: "
+msgstr ""
+
+#: ../sales/customer_delivery.php:305
 msgid ""
 "The delivery cannot be processed because there is an insufficient quantity "
 "for item:"
 msgstr ""
 
-#: ../sales/customer_delivery.php:339
+#: ../sales/customer_delivery.php:377
 msgid "For Sales Order"
 msgstr ""
 
-#: ../sales/customer_delivery.php:348
+#: ../sales/customer_delivery.php:386
 msgid "Delivery From"
 msgstr ""
 
-#: ../sales/customer_delivery.php:397
+#: ../sales/customer_delivery.php:435
 msgid "Invoice Dead-line"
 msgstr ""
 
-#: ../sales/customer_delivery.php:407
-#: ../sales/customer_invoice.php:436
-#: ../sales/includes/ui/sales_order_ui.inc:82
-#: ../sales/includes/ui/sales_order_ui.inc:368
+#: ../sales/customer_delivery.php:445
+#: ../sales/customer_invoice.php:539
+#: ../sales/includes/ui/sales_order_ui.inc:84
+#: ../sales/includes/ui/sales_order_ui.inc:360
 msgid ""
 "The selected customer account is currently on hold. Please contact the "
 "credit control personnel to discuss."
 msgstr ""
 
-#: ../sales/customer_delivery.php:412
+#: ../sales/customer_delivery.php:450
 msgid "Delivery Items"
 msgstr ""
 
-#: ../sales/customer_delivery.php:418
+#: ../sales/customer_delivery.php:456
 msgid "Max. delivery"
 msgstr ""
 
-#: ../sales/customer_delivery.php:418
-#: ../sales/customer_invoice.php:446
-#: ../sales/includes/ui/sales_order_ui.inc:141
-msgid "Delivered"
-msgstr ""
-
-#: ../sales/customer_delivery.php:419
-#: ../sales/customer_invoice.php:447
-#: ../sales/view/view_receipt.php:45
-#: ../sales/view/view_sales_order.php:201
-msgid "Discount"
+#: ../sales/customer_delivery.php:456
+#: ../sales/customer_invoice.php:553
+msgid "Invoiced"
 msgstr ""
 
-#: ../sales/customer_delivery.php:479
-#: ../sales/customer_invoice.php:531
+#: ../sales/customer_delivery.php:533
+#: ../sales/customer_invoice.php:642
 msgid "Shipping Cost"
 msgstr ""
 
-#: ../sales/customer_delivery.php:499
-#: ../sales/includes/ui/sales_order_ui.inc:242
+#: ../sales/customer_delivery.php:553
+#: ../sales/includes/ui/sales_order_ui.inc:237
 msgid ""
 "Marked items have insufficient quantities in stock as on day of delivery."
 msgstr ""
 
-#: ../sales/customer_delivery.php:503
+#: ../sales/customer_delivery.php:557
 msgid "Action For Balance"
 msgstr ""
 
-#: ../sales/customer_delivery.php:510
-#: ../sales/customer_invoice.php:560
+#: ../sales/customer_delivery.php:564
+#: ../sales/customer_delivery.php:566
+#: ../sales/customer_delivery.php:569
+#: ../sales/customer_invoice.php:694
 msgid "Refresh document page"
 msgstr ""
 
-#: ../sales/customer_delivery.php:511
+#: ../sales/customer_delivery.php:566
+msgid "Reset quantity"
+msgstr ""
+
+#: ../sales/customer_delivery.php:569
+msgid "Clear quantity"
+msgstr ""
+
+#: ../sales/customer_delivery.php:571
 msgid "Process Dispatch"
 msgstr ""
 
-#: ../sales/customer_delivery.php:512
-#: ../sales/customer_invoice.php:562
-#: ../sales/sales_order_entry.php:686
+#: ../sales/customer_delivery.php:572
+#: ../sales/customer_invoice.php:696
+#: ../sales/sales_order_entry.php:752
 msgid "Check entered data and save document"
 msgstr ""
 
-#: ../sales/customer_invoice.php:37
+#: ../sales/customer_invoice.php:38
 #, php-format
 msgid "Modifying Sales Invoice # %d."
 msgstr ""
 
-#: ../sales/customer_invoice.php:40
+#: ../sales/customer_invoice.php:41
 msgid "Issue an Invoice for Delivery Note"
 msgstr ""
 
-#: ../sales/customer_invoice.php:42
+#: ../sales/customer_invoice.php:43
 msgid "Issue Batch Invoice for Delivery Notes"
 msgstr ""
 
-#: ../sales/customer_invoice.php:55
+#: ../sales/customer_invoice.php:45
+msgid "Prepayment or Final Invoice Entry"
+msgstr ""
+
+#: ../sales/customer_invoice.php:58
 msgid "Selected deliveries has been processed"
 msgstr ""
 
-#: ../sales/customer_invoice.php:57
-#: ../sales/customer_invoice.php:75
-#: ../sales/sales_order_entry.php:204
+#: ../sales/customer_invoice.php:60
+#: ../sales/customer_invoice.php:89
+#: ../sales/sales_order_entry.php:218
 msgid "&View This Invoice"
 msgstr ""
 
-#: ../sales/customer_invoice.php:59
-#: ../sales/customer_invoice.php:77
+#: ../sales/customer_invoice.php:62
+#: ../sales/customer_invoice.php:91
 msgid "&Print This Invoice"
 msgstr ""
 
-#: ../sales/customer_invoice.php:60
-#: ../sales/customer_invoice.php:78
+#: ../sales/customer_invoice.php:63
+#: ../sales/customer_invoice.php:92
 msgid "&Email This Invoice"
 msgstr ""
 
-#: ../sales/customer_invoice.php:62
-#: ../sales/sales_order_entry.php:217
+#: ../sales/customer_invoice.php:65
+#: ../sales/sales_order_entry.php:231
 msgid "View the GL &Journal Entries for this Invoice"
 msgstr ""
 
-#: ../sales/customer_invoice.php:64
+#: ../sales/customer_invoice.php:67
 msgid "Select Another &Delivery For Invoicing"
 msgstr ""
 
-#: ../sales/customer_invoice.php:73
+#: ../sales/customer_invoice.php:75
+#: ../sales/sales_order_entry.php:241
+msgid "Entry &customer payment for this invoice"
+msgstr ""
+
+#: ../sales/customer_invoice.php:87
 #, php-format
 msgid "Sales Invoice # %d has been updated."
 msgstr ""
 
-#: ../sales/customer_invoice.php:80
+#: ../sales/customer_invoice.php:94
 msgid "Select Another &Invoice to Modify"
 msgstr ""
 
-#: ../sales/customer_invoice.php:119
+#: ../sales/customer_invoice.php:133
 msgid "Select a different delivery to invoice"
 msgstr ""
 
-#: ../sales/customer_invoice.php:120
+#: ../sales/customer_invoice.php:134
 msgid ""
 "There are no delivered items with a quantity left to invoice. There is "
 "nothing left to invoice."
 msgstr ""
 
-#: ../sales/customer_invoice.php:129
+#: ../sales/customer_invoice.php:155
 msgid ""
-"There are no delivery notes for this invoice.<br>\n"
-"\t\tMost likely this invoice was created in Front Accounting version prior "
-"to 2.0\n"
-"\t\tand therefore can not be modified."
+"All quantities on this invoice has been credited. There is nothing to modify "
+"on this invoice"
 msgstr ""
 
-#: ../sales/customer_invoice.php:138
+#: ../sales/customer_invoice.php:169
 msgid ""
-"All quantities on this invoice has been credited. There is nothing to modify "
-"on this invoice"
+"Please select correct Sales Order Prepayment to be invoiced and try again."
 msgstr ""
 
-#: ../sales/customer_invoice.php:144
+#: ../sales/customer_invoice.php:200
 msgid ""
 "This page can only be opened after delivery selection. Please select "
 "delivery to invoicing first."
 msgstr ""
 
-#: ../sales/customer_invoice.php:146
+#: ../sales/customer_invoice.php:202
 msgid "Select Delivery to Invoice"
 msgstr ""
 
-#: ../sales/customer_invoice.php:151
-#: ../sales/customer_invoice.php:302
+#: ../sales/customer_invoice.php:207
+#: ../sales/customer_invoice.php:365
 msgid ""
 "Selected quantity cannot be less than quantity credited nor more than "
 "quantity not invoiced yet."
 msgstr ""
 
-#: ../sales/customer_invoice.php:255
+#: ../sales/customer_invoice.php:321
 msgid "The entered invoice date is invalid."
 msgstr ""
 
-#: ../sales/customer_invoice.php:261
-msgid "The entered invoice date is not in fiscal year."
-msgstr ""
-
-#: ../sales/customer_invoice.php:267
+#: ../sales/customer_invoice.php:334
 msgid "The entered invoice due date is invalid."
 msgstr ""
 
-#: ../sales/customer_invoice.php:297
+#: ../sales/customer_invoice.php:360
 msgid "There are no item quantities on this invoice."
 msgstr ""
 
-#: ../sales/customer_invoice.php:377
+#: ../sales/customer_invoice.php:370
+msgid ""
+"There is no non-invoiced payments for this order. If you want to issue final "
+"invoice, select delayed or cash payment terms."
+msgstr ""
+
+#: ../sales/customer_invoice.php:460
 msgid "Payment terms:"
 msgstr ""
 
-#: ../sales/customer_invoice.php:380
-#: ../sales/includes/ui/sales_order_ui.inc:405
-#: ../sales/includes/ui/sales_order_ui.inc:409
-msgid "Payment:"
+#: ../sales/customer_invoice.php:545
+#: ../sales/sales_order_entry.php:728
+msgid "Sales Order Items"
 msgstr ""
 
-#: ../sales/customer_invoice.php:442
+#: ../sales/customer_invoice.php:545
 msgid "Invoice Items"
 msgstr ""
 
-#: ../sales/customer_invoice.php:447
+#: ../sales/customer_invoice.php:554
 msgid "This Invoice"
 msgstr ""
 
-#: ../sales/customer_invoice.php:455
+#: ../sales/customer_invoice.php:561
 msgid "Credited"
 msgstr ""
 
-#: ../sales/customer_invoice.php:549
+#: ../sales/customer_invoice.php:663
 msgid "Invoice Total"
 msgstr ""
 
-#: ../sales/customer_payments.php:33
+#: ../sales/customer_invoice.php:672
+msgid "Sales order:"
+msgstr ""
+
+#: ../sales/customer_invoice.php:684
+msgid "Payments received:"
+msgstr ""
+
+#: ../sales/customer_invoice.php:685
+msgid "Invoiced here:"
+msgstr ""
+
+#: ../sales/customer_invoice.php:686
+msgid "Left to be invoiced:"
+msgstr ""
+
+#: ../sales/customer_payments.php:32
 msgid "Customer Payment Entry"
 msgstr ""
 
-#: ../sales/customer_payments.php:37
+#: ../sales/customer_payments.php:36
 msgid "There are no customers defined in the system."
 msgstr ""
 
-#: ../sales/customer_payments.php:62
+#: ../sales/customer_payments.php:70
+msgid "Invalid sales invoice number."
+msgstr ""
+
+#: ../sales/customer_payments.php:97
 msgid "The customer payment has been successfully entered."
 msgstr ""
 
-#: ../sales/customer_payments.php:64
+#: ../sales/customer_payments.php:99
+#: ../sales/customer_payments.php:118
 msgid "&Print This Receipt"
 msgstr ""
 
-#: ../sales/customer_payments.php:66
-msgid "&View the GL Journal Entries for this Customer Payment"
+#: ../sales/customer_payments.php:101
+msgid "&View this Customer Payment"
 msgstr ""
 
-#: ../sales/customer_payments.php:70
+#: ../sales/customer_payments.php:103
+#: ../sales/customer_payments.php:126
 msgid "Enter Another &Customer Payment"
 msgstr ""
 
-#: ../sales/customer_payments.php:83
-#: ../sales/sales_order_entry.php:322
+#: ../sales/customer_payments.php:105
+msgid "Enter Payment to &Supplier"
+msgstr ""
+
+#: ../sales/customer_payments.php:109
+#: ../sales/customer_payments.php:120
+msgid "&View the GL Journal Entries for this Customer Payment"
+msgstr ""
+
+#: ../sales/customer_payments.php:116
+msgid "The customer payment has been successfully updated."
+msgstr ""
+
+#: ../sales/customer_payments.php:124
+msgid "Select Another Customer Payment for &Edition"
+msgstr ""
+
+#: ../sales/customer_payments.php:139
+#: ../sales/sales_order_entry.php:353
 msgid "There is no customer selected."
 msgstr ""
 
-#: ../sales/customer_payments.php:90
-#: ../sales/sales_order_entry.php:329
+#: ../sales/customer_payments.php:146
+#: ../sales/sales_order_entry.php:360
 msgid "This customer has no branch defined."
 msgstr ""
 
-#: ../sales/customer_payments.php:96
+#: ../sales/customer_payments.php:152
 msgid "The entered date is invalid. Please enter a valid date for the payment."
 msgstr ""
 
-#: ../sales/customer_payments.php:118
-#: ../sales/customer_payments.php:124
+#: ../sales/customer_payments.php:182
+#: ../sales/customer_payments.php:188
 msgid "The entered amount is invalid or negative and cannot be processed."
 msgstr ""
 
-#: ../sales/customer_payments.php:150
+#: ../sales/customer_payments.php:214
 msgid "The entered discount is not a valid number."
 msgstr ""
 
-#: ../sales/customer_payments.php:157
+#: ../sales/customer_payments.php:221
 msgid ""
-"The balance of the amount and discout is zero or negative. Please enter "
+"The balance of the amount and discount is zero or negative. Please enter "
 "valid amounts."
 msgstr ""
 
-#: ../sales/customer_payments.php:234
-msgid "From Customer:"
+#: ../sales/customer_payments.php:228
+msgid "The entered payment amount is zero or negative."
 msgstr ""
 
-#: ../sales/customer_payments.php:249
-msgid "This customer account is on hold."
+#: ../sales/customer_payments.php:332
+msgid "Into Bank Account:"
 msgstr ""
 
-#: ../sales/customer_payments.php:255
-msgid "Into Bank Account:"
+#: ../sales/customer_payments.php:335
+#: ../sales/customer_payments.php:337
+msgid "From Customer:"
 msgstr ""
 
-#: ../sales/customer_payments.php:262
+#: ../sales/customer_payments.php:369
 msgid "Date of Deposit:"
 msgstr ""
 
-#: ../sales/customer_payments.php:286
-msgid "Customer prompt payment discount :"
+#: ../sales/customer_payments.php:383
+msgid "Payment Amount:"
 msgstr ""
 
-#: ../sales/customer_payments.php:295
-msgid "Amount and discount are in customer's currency."
+#: ../sales/customer_payments.php:396
+msgid "Customer prompt payment discount :"
 msgstr ""
 
-#: ../sales/customer_payments.php:299
+#: ../sales/customer_payments.php:406
 msgid "Add Payment"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:56
+#: ../sales/customer_payments.php:408
+msgid "Update Payment"
+msgstr ""
+
+#: ../sales/sales_order_entry.php:64
 msgid "Direct Sales Delivery"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:61
+#: ../sales/sales_order_entry.php:69
 msgid "Direct Sales Invoice"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:67
+#: ../sales/sales_order_entry.php:75
 #, php-format
 msgid "Modifying Sales Order # %d"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:73
+#: ../sales/sales_order_entry.php:81
 #, php-format
 msgid "Modifying Sales Quotation # %d"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:78
+#: ../sales/sales_order_entry.php:86
 msgid "New Sales Order Entry"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:82
+#: ../sales/sales_order_entry.php:90
 msgid "New Sales Quotation Entry"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:85
+#: ../sales/sales_order_entry.php:93
 msgid "Sales Order Entry"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:101
+#: ../sales/sales_order_entry.php:115
 #, php-format
 msgid "Order # %d has been entered."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:103
-#: ../sales/sales_order_entry.php:123
+#: ../sales/sales_order_entry.php:117
+#: ../sales/sales_order_entry.php:137
 msgid "&View This Order"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:109
+#: ../sales/sales_order_entry.php:123
 msgid "Make &Delivery Against This Order"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:114
+#: ../sales/sales_order_entry.php:128
 msgid "Enter a &New Order"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:121
+#: ../sales/sales_order_entry.php:135
 #, php-format
 msgid "Order # %d has been updated."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:129
+#: ../sales/sales_order_entry.php:143
 msgid "Confirm Order Quantities and Make &Delivery"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:132
+#: ../sales/sales_order_entry.php:146
 msgid "Select A Different &Order"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:139
+#: ../sales/sales_order_entry.php:153
 #, php-format
 msgid "Quotation # %d has been entered."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:141
-#: ../sales/sales_order_entry.php:159
+#: ../sales/sales_order_entry.php:155
+#: ../sales/sales_order_entry.php:173
 msgid "&View This Quotation"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:143
-#: ../sales/sales_order_entry.php:161
+#: ../sales/sales_order_entry.php:157
+#: ../sales/sales_order_entry.php:175
 msgid "&Print This Quotation"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:144
-#: ../sales/sales_order_entry.php:162
+#: ../sales/sales_order_entry.php:158
+#: ../sales/sales_order_entry.php:176
 msgid "&Email This Quotation"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:147
-#: ../sales/sales_order_entry.php:165
+#: ../sales/sales_order_entry.php:161
+#: ../sales/sales_order_entry.php:179
 msgid "Make &Sales Order Against This Quotation"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:150
+#: ../sales/sales_order_entry.php:164
 msgid "Enter a New &Quotation"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:157
+#: ../sales/sales_order_entry.php:171
 #, php-format
 msgid "Quotation # %d has been updated."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:168
+#: ../sales/sales_order_entry.php:182
 msgid "Select A Different &Quotation"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:187
+#: ../sales/sales_order_entry.php:201
 msgid "Make &Invoice Against This Delivery"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:191
+#: ../sales/sales_order_entry.php:205
 msgid "Enter a New Template &Delivery"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:194
+#: ../sales/sales_order_entry.php:208
 msgid "Enter a &New Delivery"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:202
+#: ../sales/sales_order_entry.php:216
 #, php-format
 msgid "Invoice # %d has been entered."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:206
+#: ../sales/sales_order_entry.php:220
 msgid "&Print Sales Invoice"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:207
+#: ../sales/sales_order_entry.php:221
 msgid "&Email Sales Invoice"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:215
+#: ../sales/sales_order_entry.php:229
 msgid "Print &Receipt"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:220
+#: ../sales/sales_order_entry.php:234
 msgid "Enter a &New Template Invoice"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:223
+#: ../sales/sales_order_entry.php:237
 msgid "Enter a &New Direct Invoice"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:340
-msgid "The entered date is not in fiscal year"
+#: ../sales/sales_order_entry.php:383
+msgid "Pre-payment required have to be positive and less than total amount."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:351
+#: ../sales/sales_order_entry.php:388
+#: ../sales/sales_order_entry.php:402
 msgid ""
 "You must enter the person or company to whom delivery should be made to."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:358
+#: ../sales/sales_order_entry.php:395
+msgid ""
+"This document cannot be processed because there is insufficient quantity for "
+"items marked."
+msgstr ""
+
+#: ../sales/sales_order_entry.php:407
 msgid ""
 "You should enter the street address in the box provided. Orders cannot be "
 "accepted without a valid street address."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:367
+#: ../sales/sales_order_entry.php:416
 msgid "The shipping cost entered is expected to be numeric."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:373
+#: ../sales/sales_order_entry.php:422
 msgid "The Valid date is invalid."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:375
+#: ../sales/sales_order_entry.php:424
 msgid "The delivery date is invalid."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:382
+#: ../sales/sales_order_entry.php:430
 msgid "The requested valid date is before the date of the quotation."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:384
+#: ../sales/sales_order_entry.php:432
 msgid "The requested delivery date is before the date of the order."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:393
+#: ../sales/sales_order_entry.php:441
 msgid "You need to define a cash account for your Sales Point."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:462
+#: ../sales/sales_order_entry.php:479
+msgid ""
+"The reference number field has been increased. Please save the document "
+"again."
+msgstr ""
+
+#: ../sales/sales_order_entry.php:525
 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:466
+#: ../sales/sales_order_entry.php:529
 msgid "Price for inventory item must be entered and can not be less than 0"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:473
+#: ../sales/sales_order_entry.php:536
 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:513
+#: ../sales/sales_order_entry.php:554
+#, php-format
+msgid "Price %s is below Standard Cost %s"
+msgstr ""
+
+#: ../sales/sales_order_entry.php:579
 msgid ""
 "This item cannot be deleted because some of it has already been delivered."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:542
+#: ../sales/sales_order_entry.php:608
 msgid "Direct delivery entry has been cancelled as requested."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:543
+#: ../sales/sales_order_entry.php:609
 msgid "Enter a New Sales Delivery"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:546
+#: ../sales/sales_order_entry.php:611
 msgid "Direct invoice entry has been cancelled as requested."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:547
-msgid "Enter a New Sales Invoice"
-msgstr ""
-
-#: ../sales/sales_order_entry.php:552
-msgid ""
-"This order cannot be cancelled because some of it has already been invoiced "
-"or dispatched. However, the line item quantities may be modified."
+#: ../sales/sales_order_entry.php:612
+msgid "Enter a New Sales Invoice"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:557
+#: ../sales/sales_order_entry.php:617
 msgid "This sales quotation has been cancelled as requested."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:558
+#: ../sales/sales_order_entry.php:618
 msgid "Enter a New Sales Quotation"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:562
+#: ../sales/sales_order_entry.php:625
+msgid "Undelivered part of order has been cancelled as requested."
+msgstr ""
+
+#: ../sales/sales_order_entry.php:626
+msgid "Select Another Sales Order for Edition"
+msgstr ""
+
+#: ../sales/sales_order_entry.php:630
 msgid "This sales order has been cancelled as requested."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:563
+#: ../sales/sales_order_entry.php:631
 msgid "Enter a New Sales Order"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:642
+#: ../sales/sales_order_entry.php:709
 msgid "Sales Invoice Items"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:643
+#: ../sales/sales_order_entry.php:710
 msgid "Enter Delivery Details and Confirm Invoice"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:645
+#: ../sales/sales_order_entry.php:712
 msgid "Place Invoice"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:648
+#: ../sales/sales_order_entry.php:715
 msgid "Delivery Note Items"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:649
+#: ../sales/sales_order_entry.php:716
 msgid "Enter Delivery Details and Confirm Dispatch"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:650
+#: ../sales/sales_order_entry.php:717
 msgid "Cancel Delivery"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:651
+#: ../sales/sales_order_entry.php:718
 msgid "Place Delivery"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:653
+#: ../sales/sales_order_entry.php:720
 msgid "Quotation Date:"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:654
+#: ../sales/sales_order_entry.php:721
 msgid "Sales Quotation Items"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:655
+#: ../sales/sales_order_entry.php:722
 msgid "Enter Delivery Details and Confirm Quotation"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:656
+#: ../sales/sales_order_entry.php:723
 msgid "Cancel Quotation"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:657
+#: ../sales/sales_order_entry.php:724
 msgid "Place Quotation"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:658
+#: ../sales/sales_order_entry.php:725
 msgid "Commit Quotations Changes"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:661
-msgid "Sales Order Items"
-msgstr ""
-
-#: ../sales/sales_order_entry.php:662
+#: ../sales/sales_order_entry.php:729
 msgid "Enter Delivery Details and Confirm Order"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:665
+#: ../sales/sales_order_entry.php:732
 msgid "Commit Order Changes"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:687
+#: ../sales/sales_order_entry.php:754
+#: ../sales/sales_order_entry.php:760
+msgid ""
+"Cancels document entry or removes sales order when editing an old document"
+msgstr ""
+
+#: ../sales/sales_order_entry.php:755
+#: ../sales/sales_order_entry.php:764
 msgid "You are about to void this Document.\\nDo you want to continue?"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:690
+#: ../sales/sales_order_entry.php:758
 msgid "Validate changes and update document"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:694
+#: ../sales/sales_order_entry.php:762
 msgid ""
-"Cancels document entry or removes sales order when editing an old document"
+"You are about to cancel undelivered part of this order.\\nDo you want to "
+"continue?"
 msgstr ""
 
 #: ../sales/allocations/customer_allocate.php:28
 msgid "Allocate Customer Payment or Credit Note"
 msgstr ""
 
-#: ../sales/allocations/customer_allocate.php:48
+#: ../sales/allocations/customer_allocate.php:50
 #, php-format
 msgid "Allocation of %s # %d"
 msgstr ""
@@ -13356,10 +14609,12 @@ msgid "Customer Allocations"
 msgstr ""
 
 #: ../sales/allocations/customer_allocation_main.php:32
-#: ../sales/manage/customer_branches.php:280
-#: ../sales/manage/customers.php:280
+#: ../sales/manage/customer_branches.php:282
+#: ../sales/manage/customers.php:328
 #: ../sales/inquiry/customer_allocation_inquiry.php:42
 #: ../sales/inquiry/customer_inquiry.php:44
+#: ../sales/inquiry/sales_deliveries_view.php:116
+#: ../sales/inquiry/sales_orders_view.php:266
 msgid "Select a customer: "
 msgstr ""
 
@@ -13465,266 +14720,282 @@ msgstr ""
 msgid "Selected customer branch has been deleted"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:217
+#: ../sales/manage/customer_branches.php:218
 msgid "Main Branch"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:236
+#: ../sales/manage/customer_branches.php:237
 msgid "Name and Contact"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:237
+#: ../sales/manage/customer_branches.php:238
 msgid "Branch Name:"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:238
+#: ../sales/manage/customer_branches.php:239
 msgid "Branch Short Name:"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:241
+#: ../sales/manage/customer_branches.php:242
+#: ../sales/manage/customers.php:260
 msgid "Sales Person:"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:242
+#: ../sales/manage/customer_branches.php:243
+#: ../sales/manage/customers.php:297
 msgid "Sales Area:"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:243
-#: ../sales/manage/recurrent_invoices.php:156
+#: ../sales/manage/customer_branches.php:244
+#: ../sales/manage/recurrent_invoices.php:174
 msgid "Sales Group:"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:244
+#: ../sales/manage/customer_branches.php:245
+#: ../sales/manage/customers.php:295
 msgid "Default Inventory Location:"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:245
+#: ../sales/manage/customer_branches.php:246
+#: ../sales/manage/customers.php:296
 msgid "Default Shipping Company:"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:252
+#: ../sales/manage/customer_branches.php:253
 msgid "Accounts Receivable Account:"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:258
+#: ../sales/manage/customer_branches.php:260
 msgid "General contact data"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:268
+#: ../sales/manage/customer_branches.php:270
 msgid "Billing Address:"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:272
+#: ../sales/manage/customer_branches.php:274
 msgid "Disable this Branch:"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:295
-#: ../sales/inquiry/sales_deliveries_view.php:183
+#: ../sales/manage/customer_branches.php:297
+#: ../sales/inquiry/sales_deliveries_view.php:185
 msgid "Contact"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:297
+#: ../sales/manage/customer_branches.php:299
 msgid "Area"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:298
+#: ../sales/manage/customer_branches.php:300
 msgid "Phone No"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:299
+#: ../sales/manage/customer_branches.php:301
 msgid "Fax No"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:301
+#: ../sales/manage/customer_branches.php:303
 msgid "Tax Group"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:319
-#: ../sales/includes/ui/sales_order_ui.inc:299
+#: ../sales/manage/customer_branches.php:321
+#: ../sales/includes/ui/sales_order_ui.inc:291
 msgid ""
 "The selected customer does not have any branches. Please create at least one "
 "branch."
 msgstr ""
 
-#: ../sales/manage/customers.php:35
+#: ../sales/manage/customers.php:42
 msgid "The customer name cannot be empty."
 msgstr ""
 
-#: ../sales/manage/customers.php:42
+#: ../sales/manage/customers.php:49
 msgid "The customer short name cannot be empty."
 msgstr ""
 
-#: ../sales/manage/customers.php:49
+#: ../sales/manage/customers.php:56
 msgid "The credit limit must be numeric and not less than zero."
 msgstr ""
 
-#: ../sales/manage/customers.php:56
+#: ../sales/manage/customers.php:63
 msgid ""
 "The payment discount must be numeric and is expected to be less than 100% "
 "and greater than or equal to 0."
 msgstr ""
 
-#: ../sales/manage/customers.php:63
+#: ../sales/manage/customers.php:70
 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:91
+#: ../sales/manage/customers.php:98
 msgid "Customer has been updated."
 msgstr ""
 
-#: ../sales/manage/customers.php:105
+#: ../sales/manage/customers.php:130
 msgid "A new customer has been added."
 msgstr ""
 
-#: ../sales/manage/customers.php:127
+#: ../sales/manage/customers.php:133
+msgid ""
+"A default Branch has been automatically created, please check default Branch "
+"values by using link below."
+msgstr ""
+
+#: ../sales/manage/customers.php:156
 msgid ""
 "This customer cannot be deleted because there are transactions that refer to "
 "it."
 msgstr ""
 
-#: ../sales/manage/customers.php:134
+#: ../sales/manage/customers.php:163
 msgid ""
 "Cannot delete the customer record because orders have been created against "
 "it."
 msgstr ""
 
-#: ../sales/manage/customers.php:141
+#: ../sales/manage/customers.php:170
 msgid ""
 "Cannot delete this customer because there are branch records set up against "
 "it."
 msgstr ""
 
-#: ../sales/manage/customers.php:152
+#: ../sales/manage/customers.php:181
 msgid "Selected customer has been deleted."
 msgstr ""
 
-#: ../sales/manage/customers.php:199
+#: ../sales/manage/customers.php:230
 msgid "Name and Address"
 msgstr ""
 
-#: ../sales/manage/customers.php:201
+#: ../sales/manage/customers.php:232
 msgid "Customer Name:"
 msgstr ""
 
-#: ../sales/manage/customers.php:202
+#: ../sales/manage/customers.php:233
 msgid "Customer Short Name:"
 msgstr ""
 
-#: ../sales/manage/customers.php:210
-#: ../sales/manage/customers.php:214
+#: ../sales/manage/customers.php:242
+#: ../sales/manage/customers.php:246
 msgid "Customer's Currency:"
 msgstr ""
 
-#: ../sales/manage/customers.php:217
+#: ../sales/manage/customers.php:249
 msgid "Sales Type/Price List:"
 msgstr ""
 
-#: ../sales/manage/customers.php:220
+#: ../sales/manage/customers.php:252
 msgid "Customer status:"
 msgstr ""
 
-#: ../sales/manage/customers.php:226
+#: ../sales/manage/customers.php:266
 msgid "Discount Percent:"
 msgstr ""
 
-#: ../sales/manage/customers.php:227
+#: ../sales/manage/customers.php:267
 msgid "Prompt Payment Discount Percent:"
 msgstr ""
 
-#: ../sales/manage/customers.php:231
+#: ../sales/manage/customers.php:271
 msgid "Credit Status:"
 msgstr ""
 
-#: ../sales/manage/customers.php:244
+#: ../sales/manage/customers.php:284
 msgid "Customer branches"
 msgstr ""
 
-#: ../sales/manage/customers.php:246
+#: ../sales/manage/customers.php:286
 msgid "Select or &Add"
 msgstr ""
 
-#: ../sales/manage/customers.php:246
+#: ../sales/manage/customers.php:286
 msgid "&Add or Edit "
 msgstr ""
 
-#: ../sales/manage/customers.php:257
+#: ../sales/manage/customers.php:305
 msgid "Add New Customer"
 msgstr ""
 
-#: ../sales/manage/customers.php:261
+#: ../sales/manage/customers.php:309
 msgid "Update Customer"
 msgstr ""
 
-#: ../sales/manage/customers.php:262
+#: ../sales/manage/customers.php:310
 msgid "Update customer data"
 msgstr ""
 
-#: ../sales/manage/customers.php:263
+#: ../sales/manage/customers.php:311
 msgid "Select this customer and return to document entry."
 msgstr ""
 
-#: ../sales/manage/customers.php:264
+#: ../sales/manage/customers.php:312
 msgid "Delete Customer"
 msgstr ""
 
-#: ../sales/manage/customers.php:265
+#: ../sales/manage/customers.php:313
 msgid "Delete customer data if have been never used"
 msgstr ""
 
-#: ../sales/manage/customers.php:272
+#: ../sales/manage/customers.php:320
 msgid ""
 "There are no sales types defined. Please define at least one sales type "
 "before adding a customer."
 msgstr ""
 
-#: ../sales/manage/customers.php:281
+#: ../sales/manage/customers.php:329
 msgid "New customer"
 msgstr ""
 
+#: ../sales/manage/customers.php:351
+msgid "Sales &Orders"
+msgstr ""
+
 #: ../sales/manage/recurrent_invoices.php:24
 msgid "Recurrent Invoices"
 msgstr ""
 
 #: ../sales/manage/recurrent_invoices.php:36
-#: ../sales/manage/sales_areas.php:30
-#: ../sales/manage/sales_groups.php:30
-msgid "The area description cannot be empty."
+msgid "The invoice description cannot be empty."
 msgstr ""
 
-#: ../sales/manage/recurrent_invoices.php:46
+#: ../sales/manage/recurrent_invoices.php:63
 msgid "Selected recurrent invoice has been updated"
 msgstr ""
 
-#: ../sales/manage/recurrent_invoices.php:52
+#: ../sales/manage/recurrent_invoices.php:69
 msgid "New recurrent invoice has been added"
 msgstr ""
 
-#: ../sales/manage/recurrent_invoices.php:69
+#: ../sales/manage/recurrent_invoices.php:86
 msgid "Selected recurrent invoice has been deleted"
 msgstr ""
 
-#: ../sales/manage/recurrent_invoices.php:149
+#: ../sales/manage/recurrent_invoices.php:167
 msgid "Template:"
 msgstr ""
 
-#: ../sales/manage/recurrent_invoices.php:158
+#: ../sales/manage/recurrent_invoices.php:176
 msgid "Days:"
 msgstr ""
 
-#: ../sales/manage/recurrent_invoices.php:160
+#: ../sales/manage/recurrent_invoices.php:178
 msgid "Monthly:"
 msgstr ""
 
-#: ../sales/manage/recurrent_invoices.php:162
+#: ../sales/manage/recurrent_invoices.php:180
 msgid "Begin:"
 msgstr ""
 
-#: ../sales/manage/recurrent_invoices.php:164
+#: ../sales/manage/recurrent_invoices.php:182
 msgid "End:"
 msgstr ""
 
+#: ../sales/manage/sales_areas.php:30
+msgid "The area description cannot be empty."
+msgstr ""
+
 #: ../sales/manage/sales_areas.php:39
 msgid "Selected sales area has been updated"
 msgstr ""
@@ -13755,6 +15026,10 @@ msgstr ""
 msgid "Sales Groups"
 msgstr ""
 
+#: ../sales/manage/sales_groups.php:30
+msgid "The sales group description cannot be empty."
+msgstr ""
+
 #: ../sales/manage/sales_groups.php:39
 msgid "Selected sales group has been updated"
 msgstr ""
@@ -13806,6 +15081,12 @@ msgstr ""
 msgid "New sales person data have been added"
 msgstr ""
 
+#: ../sales/manage/sales_people.php:76
+msgid ""
+"Cannot delete this sales-person because branches are set up referring to "
+"this sales-person - first alter the branches concerned."
+msgstr ""
+
 #: ../sales/manage/sales_people.php:81
 msgid "Selected sales person data have been deleted"
 msgstr ""
@@ -13978,13 +15259,13 @@ msgid "DISPATCH NOTE #%d"
 msgstr ""
 
 #: ../sales/view/view_dispatch.php:65
-#: ../sales/view/view_invoice.php:65
+#: ../sales/view/view_invoice.php:67
 msgid "Charge Branch"
 msgstr ""
 
 #: ../sales/view/view_dispatch.php:91
-#: ../sales/view/view_invoice.php:90
-#: ../sales/view/view_sales_order.php:62
+#: ../sales/view/view_invoice.php:91
+#: ../sales/view/view_sales_order.php:63
 msgid "Customer Order Ref."
 msgstr ""
 
@@ -14008,12 +15289,22 @@ msgstr ""
 msgid "View Sales Invoice"
 msgstr ""
 
-#: ../sales/view/view_invoice.php:43
+#: ../sales/view/view_invoice.php:45
+#, php-format
+msgid "FINAL INVOICE #%d"
+msgstr ""
+
+#: ../sales/view/view_invoice.php:45
+#, php-format
+msgid "PREPAYMENT INVOICE #%d"
+msgstr ""
+
+#: ../sales/view/view_invoice.php:45
 #, php-format
 msgid "SALES INVOICE #%d"
 msgstr ""
 
-#: ../sales/view/view_invoice.php:152
+#: ../sales/view/view_invoice.php:154
 msgid "There are no line items on this invoice."
 msgstr ""
 
@@ -14030,12 +15321,20 @@ msgstr ""
 msgid "From Customer"
 msgstr ""
 
-#: ../sales/view/view_receipt.php:39
+#: ../sales/view/view_receipt.php:40
+msgid "Date of Deposit"
+msgstr ""
+
+#: ../sales/view/view_receipt.php:43
+msgid "Customer Currency"
+msgstr ""
+
+#: ../sales/view/view_receipt.php:48
 msgid "Into Bank Account"
 msgstr ""
 
-#: ../sales/view/view_receipt.php:40
-msgid "Date of Deposit"
+#: ../sales/view/view_receipt.php:49
+msgid "Bank Amount"
 msgstr ""
 
 #: ../sales/view/view_receipt.php:56
@@ -14060,35 +15359,43 @@ msgstr ""
 msgid "Sales Order #%d"
 msgstr ""
 
-#: ../sales/view/view_sales_order.php:46
+#: ../sales/view/view_sales_order.php:49
 msgid "Order Information"
 msgstr ""
 
-#: ../sales/view/view_sales_order.php:59
+#: ../sales/view/view_sales_order.php:60
 msgid "Customer Name"
 msgstr ""
 
-#: ../sales/view/view_sales_order.php:63
+#: ../sales/view/view_sales_order.php:64
 msgid "Deliver To Branch"
 msgstr ""
 
-#: ../sales/view/view_sales_order.php:70
+#: ../sales/view/view_sales_order.php:71
 msgid "Requested Delivery"
 msgstr ""
 
-#: ../sales/view/view_sales_order.php:74
+#: ../sales/view/view_sales_order.php:75
 msgid "Deliver From Location"
 msgstr ""
 
-#: ../sales/view/view_sales_order.php:81
+#: ../sales/view/view_sales_order.php:86
+msgid "Non-Invoiced Prepayments"
+msgstr ""
+
+#: ../sales/view/view_sales_order.php:87
+msgid "All Payments Allocated"
+msgstr ""
+
+#: ../sales/view/view_sales_order.php:95
 msgid "Telephone"
 msgstr ""
 
-#: ../sales/view/view_sales_order.php:196
+#: ../sales/view/view_sales_order.php:215
 msgid "This Sales Order is used as a Template."
 msgstr ""
 
-#: ../sales/view/view_sales_order.php:201
+#: ../sales/view/view_sales_order.php:220
 msgid "Quantity Delivered"
 msgstr ""
 
@@ -14100,6 +15407,10 @@ msgstr ""
 msgid "Allocation"
 msgstr ""
 
+#: ../sales/inquiry/customer_allocation_inquiry.php:116
+msgid "Payment"
+msgstr ""
+
 #: ../sales/inquiry/customer_inquiry.php:26
 msgid "Customer Transactions"
 msgstr ""
@@ -14108,12 +15419,12 @@ msgstr ""
 msgid "CUSTOMER ACCOUNT IS ON HOLD"
 msgstr ""
 
-#: ../sales/inquiry/customer_inquiry.php:193
+#: ../sales/inquiry/customer_inquiry.php:181
 msgid "Print Receipt"
 msgstr ""
 
-#: ../sales/inquiry/customer_inquiry.php:223
-#: ../sales/inquiry/customer_inquiry.php:236
+#: ../sales/inquiry/customer_inquiry.php:211
+#: ../sales/inquiry/customer_inquiry.php:224
 msgid "RB"
 msgstr ""
 
@@ -14132,93 +15443,105 @@ msgid ""
 "\t\t    the same customer branch."
 msgstr ""
 
-#: ../sales/inquiry/sales_deliveries_view.php:179
+#: ../sales/inquiry/sales_deliveries_view.php:181
 msgid "Delivery #"
 msgstr ""
 
-#: ../sales/inquiry/sales_deliveries_view.php:185
+#: ../sales/inquiry/sales_deliveries_view.php:187
 msgid "Cust Ref"
 msgstr ""
 
-#: ../sales/inquiry/sales_deliveries_view.php:187
+#: ../sales/inquiry/sales_deliveries_view.php:189
 msgid "Due By"
 msgstr ""
 
-#: ../sales/inquiry/sales_deliveries_view.php:188
+#: ../sales/inquiry/sales_deliveries_view.php:190
 msgid "Delivery Total"
 msgstr ""
 
-#: ../sales/inquiry/sales_deliveries_view.php:190
+#: ../sales/inquiry/sales_deliveries_view.php:192
 msgid "Batch"
 msgstr ""
 
-#: ../sales/inquiry/sales_deliveries_view.php:190
+#: ../sales/inquiry/sales_deliveries_view.php:192
 msgid "Batch Invoicing"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:46
+#: ../sales/inquiry/sales_orders_view.php:44
 msgid "Search Outstanding Sales Orders"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:51
+#: ../sales/inquiry/sales_orders_view.php:49
 msgid "Search Template for Invoicing"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:56
+#: ../sales/inquiry/sales_orders_view.php:54
 msgid "Select Template for Delivery"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:61
+#: ../sales/inquiry/sales_orders_view.php:59
+msgid "Invoicing Prepayment Orders"
+msgstr ""
+
+#: ../sales/inquiry/sales_orders_view.php:64
 msgid "Search All Sales Orders"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:67
+#: ../sales/inquiry/sales_orders_view.php:70
 msgid "Search All Sales Quotations"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:131
+#: ../sales/inquiry/sales_orders_view.php:148
 msgid "Dispatch"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:171
+#: ../sales/inquiry/sales_orders_view.php:191
 msgid "Set this order as a template for direct deliveries/invoices"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:236
+#: ../sales/inquiry/sales_orders_view.php:200
+msgid "Prepayment Invoice"
+msgstr ""
+
+#: ../sales/inquiry/sales_orders_view.php:200
+msgid "Final Invoice"
+msgstr ""
+
+#: ../sales/inquiry/sales_orders_view.php:268
 msgid "Show All:"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:253
+#: ../sales/inquiry/sales_orders_view.php:285
 msgid "Order #"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:257
-#: ../sales/inquiry/sales_orders_view.php:271
+#: ../sales/inquiry/sales_orders_view.php:289
+#: ../sales/inquiry/sales_orders_view.php:303
 msgid "Cust Order Ref"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:260
-#: ../sales/inquiry/sales_orders_view.php:274
+#: ../sales/inquiry/sales_orders_view.php:292
+#: ../sales/inquiry/sales_orders_view.php:306
 msgid "Delivery To"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:267
+#: ../sales/inquiry/sales_orders_view.php:299
 msgid "Quote #"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:272
+#: ../sales/inquiry/sales_orders_view.php:304
 msgid "Quote Date"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:275
+#: ../sales/inquiry/sales_orders_view.php:307
 msgid "Quote Total"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:300
+#: ../sales/inquiry/sales_orders_view.php:338
 msgid "Tmpl"
 msgstr ""
 
-#: ../sales/includes/cart_class.inc:346
+#: ../sales/includes/cart_class.inc:391
 msgid "You have to enter valid stock code or nonempty description"
 msgstr ""
 
@@ -14228,7 +15551,7 @@ msgid ""
 "browser tab. You cannot edit more than one sales document at once."
 msgstr ""
 
-#: ../sales/includes/db/custalloc_db.inc:265
+#: ../sales/includes/db/custalloc_db.inc:351
 msgid ""
 "Unsuspected overallocation happened due to sparse credit notes exists for "
 "this invoice.\n"
@@ -14236,41 +15559,27 @@ msgid ""
 "charges."
 msgstr ""
 
-#: ../sales/includes/db/sales_invoice_db.inc:173
-msgid "Cash invoice"
-msgstr ""
-
-#: ../sales/includes/db/sales_order_db.inc:107
-#: ../sales/includes/db/sales_order_db.inc:259
-msgid "Stocks below Re-Order Level at "
-msgstr ""
-
-#: ../sales/includes/db/sales_order_db.inc:110
-#: ../sales/includes/db/sales_order_db.inc:264
-msgid "Below"
-msgstr ""
-
-#: ../sales/includes/db/sales_order_db.inc:111
-#: ../sales/includes/db/sales_order_db.inc:265
-msgid "Please reorder"
+#: ../sales/includes/db/old.sales_order_db.inc:139
+#: ../sales/includes/db/sales_order_db.inc:103
+msgid "Deleted."
 msgstr ""
 
-#: ../sales/includes/db/sales_order_db.inc:139
-msgid "Deleted."
+#: ../sales/includes/db/sales_invoice_db.inc:198
+msgid "Cash invoice"
 msgstr ""
 
 #: ../sales/includes/ui/sales_credit_ui.inc:94
-#: ../sales/includes/ui/sales_order_ui.inc:379
+#: ../sales/includes/ui/sales_order_ui.inc:370
 msgid "Customer Currency:"
 msgstr ""
 
 #: ../sales/includes/ui/sales_credit_ui.inc:112
-#: ../sales/includes/ui/sales_order_ui.inc:636
+#: ../sales/includes/ui/sales_order_ui.inc:638
 msgid "Shipping Company:"
 msgstr ""
 
 #: ../sales/includes/ui/sales_credit_ui.inc:114
-#: ../sales/includes/ui/sales_order_ui.inc:386
+#: ../sales/includes/ui/sales_order_ui.inc:377
 msgid "Customer Discount:"
 msgstr ""
 
@@ -14278,103 +15587,104 @@ msgstr ""
 msgid "This item is already on this document. You have been warned."
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:104
+#: ../sales/includes/ui/sales_order_ui.inc:106
 msgid ""
 "The selected customer and branch are not valid, or the customer does not "
 "have any branches."
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:224
+#: ../sales/includes/ui/sales_order_ui.inc:219
 msgid "Shipping Charge"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:297
+#: ../sales/includes/ui/sales_order_ui.inc:289
 msgid "No customer found for entered text."
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:323
+#: ../sales/includes/ui/sales_order_ui.inc:315
 #, php-format
 msgid "Customer's payment terms '%s' cannot be selected on this POS"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:373
+#: ../sales/includes/ui/sales_order_ui.inc:364
 msgid "Reference number unique for this document type"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:415
+#: ../sales/includes/ui/sales_order_ui.inc:404
+#: ../sales/includes/ui/sales_order_ui.inc:406
 msgid "Price List:"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:432
+#: ../sales/includes/ui/sales_order_ui.inc:423
 msgid "Date of order receive"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:582
+#: ../sales/includes/ui/sales_order_ui.inc:573
 msgid "Cash payment"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:585
-#: ../sales/includes/ui/sales_order_ui.inc:614
+#: ../sales/includes/ui/sales_order_ui.inc:576
+#: ../sales/includes/ui/sales_order_ui.inc:608
 msgid "Deliver from Location:"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:586
+#: ../sales/includes/ui/sales_order_ui.inc:579
 msgid "Cash account:"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:592
+#: ../sales/includes/ui/sales_order_ui.inc:586
 msgid "Delivery Details"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:597
+#: ../sales/includes/ui/sales_order_ui.inc:591
 msgid "Invoice Delivery Details"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:598
+#: ../sales/includes/ui/sales_order_ui.inc:592
 msgid "Invoice before"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:602
+#: ../sales/includes/ui/sales_order_ui.inc:596
 msgid "Quotation Delivery Details"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:607
+#: ../sales/includes/ui/sales_order_ui.inc:601
 msgid "Order Delivery Details"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:620
+#: ../sales/includes/ui/sales_order_ui.inc:622
 msgid "Enter requested day of delivery"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:621
+#: ../sales/includes/ui/sales_order_ui.inc:623
 msgid "Enter Valid until Date"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:622
+#: ../sales/includes/ui/sales_order_ui.inc:624
 msgid "Deliver To:"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:623
+#: ../sales/includes/ui/sales_order_ui.inc:625
 msgid "Additional identifier for delivery e.g. name of receiving person"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:626
+#: ../sales/includes/ui/sales_order_ui.inc:628
 msgid "Delivery address. Default is address of customer branch"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:630
+#: ../sales/includes/ui/sales_order_ui.inc:632
 msgid "Contact Phone Number:"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:631
+#: ../sales/includes/ui/sales_order_ui.inc:633
 msgid "Phone number of ordering person. Defaults to branch phone number"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:632
+#: ../sales/includes/ui/sales_order_ui.inc:634
 msgid "Customer Reference:"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:633
+#: ../sales/includes/ui/sales_order_ui.inc:635
 msgid "Customer reference number for this order (if any)"
 msgstr ""
 
@@ -14400,224 +15710,229 @@ msgid ""
 "to it."
 msgstr ""
 
-#: ../taxes/item_tax_types.php:93
+#: ../taxes/item_tax_types.php:82
+msgid ""
+"Cannot delete this item tax type because item categories have been created "
+"referring to it."
+msgstr ""
+
+#: ../taxes/item_tax_types.php:98
 msgid "Selected item tax type has been deleted"
 msgstr ""
 
-#: ../taxes/item_tax_types.php:112
+#: ../taxes/item_tax_types.php:117
 msgid "Tax exempt"
 msgstr ""
 
-#: ../taxes/item_tax_types.php:170
+#: ../taxes/item_tax_types.php:175
 msgid "Is Fully Tax-exempt:"
 msgstr ""
 
-#: ../taxes/item_tax_types.php:177
+#: ../taxes/item_tax_types.php:182
 msgid "Select which taxes this item tax type is exempt from."
 msgstr ""
 
-#: ../taxes/item_tax_types.php:180
+#: ../taxes/item_tax_types.php:185
 msgid "Tax Name"
 msgstr ""
 
-#: ../taxes/item_tax_types.php:180
+#: ../taxes/item_tax_types.php:185
 msgid "Is exempt"
 msgstr ""
 
-#: ../taxes/tax_groups.php:17
-msgid "Tax Groups"
-msgstr ""
-
-#: ../taxes/tax_groups.php:27
-msgid ""
-"There are no tax types defined. Define tax types before defining tax groups."
-msgstr ""
-
-#: ../taxes/tax_groups.php:40
-msgid "The tax group name cannot be empty."
-msgstr ""
-
-#: ../taxes/tax_groups.php:84
-msgid "Selected tax group has been updated"
-msgstr ""
-
-#: ../taxes/tax_groups.php:89
-msgid "New tax group has been added"
-msgstr ""
-
-#: ../taxes/tax_groups.php:104
-msgid ""
-"Cannot delete this tax group because customer branches been created "
-"referring to it."
-msgstr ""
-
-#: ../taxes/tax_groups.php:110
-msgid ""
-"Cannot delete this tax group because suppliers been created referring to it."
-msgstr ""
-
-#: ../taxes/tax_groups.php:127
-msgid "Selected tax group has been deleted"
-msgstr ""
-
-#: ../taxes/tax_groups.php:146
-msgid "Shipping Tax"
-msgstr ""
-
-#: ../taxes/tax_groups.php:205
-msgid "Tax applied to Shipping:"
-msgstr ""
-
-#: ../taxes/tax_groups.php:209
-msgid "Select the taxes that are included in this group."
-msgstr ""
-
-#: ../taxes/tax_groups.php:214
-msgid "Rate (%)"
-msgstr ""
-
+#: ../taxes/sav.tax_types.php:21
 #: ../taxes/tax_types.php:16
 msgid "Tax Types"
 msgstr ""
 
+#: ../taxes/sav.tax_types.php:60
 #: ../taxes/tax_types.php:30
 msgid "The tax type name cannot be empty."
 msgstr ""
 
+#: ../taxes/sav.tax_types.php:66
 #: ../taxes/tax_types.php:36
 msgid "The default tax rate must be numeric and not less than zero."
 msgstr ""
 
+#: ../taxes/sav.tax_types.php:72
 #: ../taxes/tax_types.php:42
 msgid "Selected GL Accounts cannot be used by another tax type."
 msgstr ""
 
+#: ../taxes/sav.tax_types.php:86
 #: ../taxes/tax_types.php:56
 msgid "New tax type has been added"
 msgstr ""
 
+#: ../taxes/sav.tax_types.php:97
 #: ../taxes/tax_types.php:67
 msgid "Selected tax type has been updated"
 msgstr ""
 
+#: ../taxes/sav.tax_types.php:107
 #: ../taxes/tax_types.php:77
 msgid ""
 "Cannot delete this tax type because tax groups been created referring to it."
 msgstr ""
 
+#: ../taxes/sav.tax_types.php:141
 #: ../taxes/tax_types.php:94
 msgid "Selected tax type has been deleted"
 msgstr ""
 
+#: ../taxes/sav.tax_types.php:164
+msgid ""
+"Start new tax regulations span below, then select new span and edit tax "
+"rates as needed."
+msgstr ""
+
+#: ../taxes/sav.tax_types.php:167
+msgid "Tax span begin:"
+msgstr ""
+
+#: ../taxes/sav.tax_types.php:168
+msgid "Tax span end:"
+msgstr ""
+
+#: ../taxes/sav.tax_types.php:172
+msgid "Add new span"
+msgstr ""
+
+#: ../taxes/sav.tax_types.php:182
+msgid "Tax regulations span:"
+msgstr ""
+
+#: ../taxes/sav.tax_types.php:183
+msgid "Add new tax sub-period"
+msgstr ""
+
+#: ../taxes/sav.tax_types.php:187
 #: ../taxes/tax_types.php:112
 msgid ""
 "To avoid problems with manual journal entry all tax types should have unique "
 "Sales/Purchasing GL accounts."
 msgstr ""
 
-#: ../taxes/tax_types.php:115
-msgid "Default Rate (%)"
+#: ../taxes/sav.tax_types.php:190
+msgid "Rate (%)"
 msgstr ""
 
+#: ../taxes/sav.tax_types.php:190
 #: ../taxes/tax_types.php:116
 msgid "Sales GL Account"
 msgstr ""
 
+#: ../taxes/sav.tax_types.php:190
 #: ../taxes/tax_types.php:116
 msgid "Purchasing GL Account"
 msgstr ""
 
+#: ../taxes/sav.tax_types.php:205
+msgid "Exempt"
+msgstr ""
+
+#: ../taxes/sav.tax_types.php:242
 #: ../taxes/tax_types.php:159
 msgid "Default Rate:"
 msgstr ""
 
+#: ../taxes/sav.tax_types.php:244
 #: ../taxes/tax_types.php:161
 msgid "Sales GL Account:"
 msgstr ""
 
+#: ../taxes/sav.tax_types.php:245
 #: ../taxes/tax_types.php:162
 msgid "Purchasing GL Account:"
 msgstr ""
 
-#: ../themes/default/renderer.php:27
-#: ../themes/exclusive/renderer.php:19
-msgid "Main Menu"
+#: ../taxes/sav.tax_types.php:262
+msgid "Edit selected span"
 msgstr ""
 
-#: ../themes/default/renderer.php:53
-#: ../themes/default/renderer.php:76
-#: ../themes/exclusive/renderer.php:43
-#: ../themes/exclusive/renderer.php:50
-msgid "Help"
+#: ../taxes/tax_groups.php:17
+msgid "Tax Groups"
 msgstr ""
 
-#: ../themes/default/renderer.php:71
-#: ../themes/exclusive/renderer.php:46
-msgid "Preferences"
+#: ../taxes/tax_groups.php:27
+msgid ""
+"There are no tax types defined. Define tax types before defining tax groups."
+msgstr ""
+
+#: ../taxes/tax_groups.php:40
+msgid "The tax group name cannot be empty."
+msgstr ""
+
+#: ../taxes/tax_groups.php:60
+msgid "Selected tax group has been updated"
 msgstr ""
 
-#: ../themes/exclusive/renderer.php:232
-msgid "Top 10 customers in fiscal year"
+#: ../taxes/tax_groups.php:65
+msgid "New tax group has been added"
 msgstr ""
 
-#: ../themes/exclusive/renderer.php:285
-msgid " overdue Sales Invoices"
+#: ../taxes/tax_groups.php:80
+msgid ""
+"Cannot delete this tax group because customer branches been created "
+"referring to it."
 msgstr ""
 
-#: ../themes/exclusive/renderer.php:289
-#: ../themes/exclusive/renderer.php:383
-msgid "Ref."
+#: ../taxes/tax_groups.php:86
+msgid ""
+"Cannot delete this tax group because suppliers been created referring to it."
 msgstr ""
 
-#: ../themes/exclusive/renderer.php:329
-msgid "Top 10 suppliers in fiscal year"
+#: ../taxes/tax_groups.php:103
+msgid "Selected tax group has been deleted"
 msgstr ""
 
-#: ../themes/exclusive/renderer.php:379
-msgid " overdue Purchase Invoices"
+#: ../taxes/tax_groups.php:166
+msgid "Select the taxes that are included in this group."
 msgstr ""
 
-#: ../themes/exclusive/renderer.php:427
-msgid "Top 10 Manufactured Items in fiscal year"
+#: ../taxes/tax_groups.php:171
+msgid "Shipping Tax"
 msgstr ""
 
-#: ../themes/exclusive/renderer.php:429
-msgid "Top 10 Sold Items in fiscal year"
+#: ../taxes/tax_types.php:115
+msgid "Default Rate (%)"
 msgstr ""
 
-#: ../themes/exclusive/renderer.php:484
-msgid "Top 10 Dimensions in fiscal year"
+#: ../themes/default/renderer.php:28
+msgid "Main Menu"
 msgstr ""
 
-#: ../themes/exclusive/renderer.php:540
-msgid "Class Balances"
+#: ../themes/default/renderer.php:71
+#: ../themes/default/renderer.php:81
+msgid "Help"
 msgstr ""
 
-#: ../themes/exclusive/renderer.php:569
-msgid "Class"
+#: ../themes/default/renderer.php:76
+msgid "Preferences"
 msgstr ""
 
 #: ../sql/alter2.1.php:18
 msgid "Upgrade from version 2.0 to 2.1"
 msgstr ""
 
-#: ../sql/alter2.1.php:35
+#: ../sql/alter2.1.php:36
 msgid "Cannot retrieve bank accounts codes"
 msgstr ""
 
-#: ../sql/alter2.1.php:43
+#: ../sql/alter2.1.php:44
 msgid "Cannot update bank transactions"
 msgstr ""
 
-#: ../sql/alter2.1.php:52
+#: ../sql/alter2.1.php:53
 msgid "Cannot select stock identificators"
 msgstr ""
 
-#: ../sql/alter2.1.php:63
+#: ../sql/alter2.1.php:64
 msgid "Cannot insert stock id into item_codes"
 msgstr ""
 
-#: ../sql/alter2.1.php:139
+#: ../sql/alter2.1.php:140
 msgid ""
 "Seems that system upgrade to version 2.1 has \n"
 "\t\t\tbeen performed for this company already.<br> If something has gone \n"
@@ -14629,15 +15944,15 @@ msgstr ""
 msgid "Upgrade from version 2.1/2.2beta to 2.2"
 msgstr ""
 
-#: ../sql/alter2.2.php:84
+#: ../sql/alter2.2.php:85
 msgid "Cannot query max sales order number."
 msgstr ""
 
-#: ../sql/alter2.2.php:95
+#: ../sql/alter2.2.php:96
 msgid "Cannot store next sales order reference."
 msgstr ""
 
-#: ../sql/alter2.2.php:246
+#: ../sql/alter2.2.php:251
 msgid ""
 "Cannot upgrade extensions system: file /modules/installed_modules.php is not "
 "writeable"
@@ -14646,3 +15961,7 @@ msgstr ""
 #: ../sql/alter2.3.php:20
 msgid "Upgrade from version 2.2 to 2.3"
 msgstr ""
+
+#: ../sql/alter2.4.php:19
+msgid "Upgrade from version 2.3 to 2.4"
+msgstr ""