Updated gettext template.
[fa-stable.git] / lang / new_language_template / LC_MESSAGES / empty.po
index 0c07a25d6d8a26c76069a891fca838aa8ab289c5..5b57c1f8f12949aead2636fe653eed8fbcfe2fa7 100644 (file)
@@ -8,25 +8,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-09 15:26+0200\n"
+"POT-Creation-Date: 2017-11-09 22:44+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-2\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: frontaccounting.php:73 frontaccounting.php:74
+#: frontaccounting.php:72 frontaccounting.php:73
 msgid "Main  Menu"
 msgstr ""
 
-#: frontaccounting.php:75 access/logout.php:18 themes/default/renderer.php:52
-#: themes/default/renderer.php:78
+#: frontaccounting.php:74 access/logout.php:21 themes/default/renderer.php:73
+#: themes/default/renderer.php:87
 msgid "Logout"
 msgstr ""
 
-#: access/login.php:13
+#: access/login.php:13 access/password_reset.php:13
 msgid "Restricted access"
 msgstr ""
 
@@ -38,390 +38,461 @@ msgstr ""
 msgid "Please login here"
 msgstr ""
 
-#: access/login.php:39 access/login.php:69
+#: 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:53 access/login.php:84
 msgid "Authorization timeout"
 msgstr ""
 
-#: access/login.php:39 access/login.php:76
+#: access/login.php:53 access/login.php:90
 msgid "Login"
 msgstr ""
 
-#: access/login.php:76 admin/inst_upgrade.php:137
+#: access/login.php:90 access/password_reset.php:61
 msgid "Version"
 msgstr ""
 
-#: access/login.php:79
+#: access/login.php:93
 msgid "User name"
 msgstr ""
 
-#: access/login.php:83 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:92 admin/create_coy.php:249 admin/create_coy.php:331
+#: access/login.php:106 access/login.php:112 access/password_reset.php:69
+#: access/password_reset.php:75 admin/create_coy.php:247
+#: admin/create_coy.php:327 admin/inst_upgrade.php:63
+#: includes/sysnames.inc:208
 msgid "Company"
 msgstr ""
 
-#: access/login.php:101
+#: access/login.php:120
 msgid "Login -->"
 msgstr ""
 
-#: access/login.php:132 admin/display_prefs.php:111
-#: themes/default/renderer.php:123
+#: access/login.php:155 access/password_reset.php:106
+#: admin/display_prefs.php:123 themes/default/renderer.php:136
 msgid "Theme:"
 msgstr ""
 
-#: access/logout.php:29
+#: access/logout.php:32
 msgid "Thank you for using"
 msgstr ""
 
-#: access/logout.php:40
+#: access/logout.php:43
 msgid "Click here to Login Again."
 msgstr ""
 
-#: admin/attachments.php:72
-msgid "Attach Documents"
+#: access/password_reset.php:31 access/password_reset.php:61
+msgid "Password reset"
 msgstr ""
 
-#: admin/attachments.php:119
-msgid "Attachment has been inserted."
+#: access/password_reset.php:63 reporting/rep103.php:274
+#: reporting/rep106.php:94 reporting/rep205.php:186
+#: reporting/includes/header2.inc:112 sales/manage/sales_people.php:99
+msgid "Email"
 msgstr ""
 
-#: admin/attachments.php:125
-msgid "Attachment has been updated."
+#: access/password_reset.php:81
+msgid "Send password -->"
 msgstr ""
 
-#: admin/attachments.php:137
-msgid "Attachment has been deleted."
+#: admin/attachments.php:71
+msgid "Attach Documents"
 msgstr ""
 
-#: admin/attachments.php:155 admin/view_print_transaction.php:72
-#: admin/void_transaction.php:151 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:150
-#: manufacturing/work_order_entry.php:379
-#: manufacturing/work_order_entry.php:387
-#: manufacturing/includes/work_order_issue_ui.inc:161
-#: sales/inquiry/customer_allocation_inquiry.php:47
-msgid "Type:"
+#: admin/attachments.php:83 admin/db/voiding_db.inc:28
+#: admin/db/voiding_db.inc:40 admin/db/voiding_db.inc:53
+#: admin/db/voiding_db.inc:65 admin/db/voiding_db.inc:71
+#: admin/db/voiding_db.inc:90 admin/db/voiding_db.inc:97
+#: admin/db/voiding_db.inc:103 admin/db/voiding_db.inc:111
+msgid "Selected transaction does not exists."
 msgstr ""
 
-#: admin/attachments.php:167 admin/view_print_transaction.php:126
-#: admin/void_transaction.php:175 dimensions/inquiry/search_dimensions.php:127
-#: dimensions/view/view_dimension.php:54 gl/bank_account_reconcile.php:234
-#: gl/inquiry/bank_inquiry.php:70 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/inquiry/supplier_inquiry.php.orig: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:110 reporting/includes/doctext.inc:118
-#: sales/allocations/customer_allocation_main.php:94
-#: sales/view/view_sales_order.php:96 sales/view/view_sales_order.php:129
-#: sales/view/view_sales_order.php:161
-#: sales/inquiry/customer_allocation_inquiry.php:142
-#: sales/inquiry/customer_inquiry.php:213
-msgid "#"
+#: admin/attachments.php:85 admin/attachments.php:90
+msgid "Select attachment file."
 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: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: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:95
-#: reporting/rep401.php:69 sales/create_recurrent_invoices.php:115
-#: sales/manage/credit_status.php:97 sales/manage/recurrent_invoices.php:102
-#: sales/inquiry/sales_orders_view.php:286
-#: sales/inquiry/sales_orders_view.php:290 taxes/tax_groups.php:124
-#: taxes/tax_types.php:115
-msgid "Description"
+#: admin/attachments.php:88 admin/company_preferences.php:42
+#: inventory/manage/items.php:83
+msgid "The file size is over the maximum allowed."
 msgstr ""
 
-#: admin/attachments.php:167 admin/backups.php:60 admin/backups.php:142
-msgid "Filename"
+#: admin/attachments.php:131
+msgid "Attachment has been inserted."
 msgstr ""
 
-#: admin/attachments.php:167
-msgid "Size"
+#: admin/attachments.php:137
+msgid "Attachment has been updated."
 msgstr ""
 
-#: admin/attachments.php:167
-msgid "Filetype"
+#: admin/attachments.php:152
+msgid "Attachment has been deleted."
 msgstr ""
 
-#: admin/attachments.php:167
-msgid "Date Uploaded"
+#: admin/attachments.php:170 admin/view_print_transaction.php:72
+#: gl/inquiry/journal_inquiry.php:47
+#: manufacturing/work_order_add_finished.php:191
+#: manufacturing/work_order_costs.php:136
+#: manufacturing/work_order_entry.php:358
+#: manufacturing/work_order_entry.php:367
+#: manufacturing/includes/work_order_issue_ui.inc:166
+#: sales/inquiry/customer_allocation_inquiry.php:47
+msgid "Type:"
 msgstr ""
 
-#: admin/attachments.php:182 admin/create_coy.php:273
+#: admin/attachments.php:186 admin/create_coy.php:269
 #: admin/crm_categories.php:106 admin/fiscalyears.php:164
 #: admin/inst_lang.php:100 admin/payment_terms.php:142 admin/printers.php:96
-#: admin/shipping_companies.php:106 admin/tags.php:140 admin/users.php:144
-#: dimensions/inquiry/search_dimensions.php:120
-#: gl/inquiry/journal_inquiry.php:111 gl/manage/bank_accounts.php:126
-#: gl/manage/currencies.php:166 gl/manage/exchange_rates.php:94
-#: gl/manage/gl_account_classes.php:132 gl/manage/gl_account_types.php:155
-#: gl/manage/gl_quick_entries.php:196 gl/manage/gl_quick_entries.php:295
-#: gl/includes/ui/gl_bank_ui.inc:166 gl/includes/ui/gl_bank_ui.inc.orig:166
-#: gl/includes/ui/gl_journal_ui.inc:122 includes/ui/contacts_view.inc:64
-#: includes/ui/simple_crud_class.inc:52 inventory/prices.php:145
-#: inventory/purchasing_data.php:146
-#: inventory/includes/item_adjustments_ui.inc:87
-#: inventory/includes/stock_transfers_ui.inc:79
-#: inventory/manage/item_categories.php:121
-#: inventory/manage/item_codes.php:140 inventory/manage/item_units.php:110
-#: inventory/manage/locations.php:161 inventory/manage/movement_types.php:106
-#: inventory/manage/sales_kits.php:55 manufacturing/search_work_orders.php:109
-#: manufacturing/manage/bom_edit.php:86
+#: admin/shipping_companies.php:106 admin/tags.php:140 admin/users.php:153
+#: dimensions/inquiry/search_dimensions.php:116
+#: gl/manage/bank_accounts.php:133 gl/manage/currencies.php:164
+#: gl/manage/exchange_rates.php:94 gl/manage/gl_account_classes.php:131
+#: gl/manage/gl_account_types.php:153 gl/manage/gl_quick_entries.php:201
+#: gl/manage/gl_quick_entries.php:303 gl/includes/ui/gl_bank_ui.inc:179
+#: gl/includes/ui/gl_journal_ui.inc:150 includes/ui/class.crud_view.inc:281
+#: includes/ui/contacts_view.inc:61 includes/ui/simple_crud_class.inc:52
+#: includes/ui/ui_view.inc:1547 inventory/prices.php:163
+#: inventory/purchasing_data.php:167
+#: inventory/includes/item_adjustments_ui.inc:100
+#: inventory/includes/stock_transfers_ui.inc:83
+#: inventory/manage/item_categories.php:147
+#: inventory/manage/item_codes.php:142 inventory/manage/item_units.php:110
+#: inventory/manage/locations.php:170 inventory/manage/sales_kits.php:51
+#: manufacturing/manage/bom_edit.php:59
 #: manufacturing/manage/work_centres.php:114
-#: 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 sales/manage/credit_status.php:119
-#: sales/manage/customer_branches.php:159
-#: sales/manage/recurrent_invoices.php:130 sales/manage/sales_areas.php:103
+#: manufacturing/includes/work_order_issue_ui.inc:61
+#: purchasing/includes/ui/invoice_ui.inc:551
+#: purchasing/includes/ui/po_ui.inc:249 sales/manage/credit_status.php:119
+#: sales/manage/customer_branches.php:158
+#: sales/manage/recurrent_invoices.php:156 sales/manage/sales_areas.php:103
 #: sales/manage/sales_groups.php:99 sales/manage/sales_people.php:119
 #: sales/manage/sales_points.php:99 sales/manage/sales_types.php:121
-#: sales/inquiry/customer_inquiry.php:186
-#: sales/inquiry/sales_deliveries_view.php:154
-#: sales/inquiry/sales_orders_view.php:123
-#: sales/includes/ui/sales_credit_ui.inc:197
-#: sales/includes/ui/sales_order_ui.inc:202 taxes/item_tax_types.php:139
-#: taxes/tax_groups.php:142 taxes/tax_types.php:132
+#: sales/includes/ui/sales_credit_ui.inc:192
+#: sales/includes/ui/sales_order_ui.inc:196 taxes/item_tax_types.php:139
+#: taxes/tax_groups.php:140 taxes/tax_types.php:132
 msgid "Edit"
 msgstr ""
 
-#: admin/attachments.php:183 gl/inquiry/journal_inquiry.php:128
+#: admin/attachments.php:191 gl/inquiry/journal_inquiry.php:116
 msgid "View"
 msgstr ""
 
-#: admin/attachments.php:184
+#: admin/attachments.php:196
 msgid "Download"
 msgstr ""
 
-#: admin/attachments.php:185 admin/create_coy.php:274
+#: admin/attachments.php:201 admin/create_coy.php:272
 #: admin/crm_categories.php:110 admin/fiscalyears.php:166
-#: admin/inst_chart.php:80 admin/inst_lang.php:109 admin/inst_module.php:144
-#: 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
-#: gl/gl_budget.php:137 gl/manage/bank_accounts.php:127
-#: gl/manage/currencies.php:168 gl/manage/exchange_rates.php:99
-#: gl/manage/gl_account_classes.php:133 gl/manage/gl_account_types.php:156
-#: gl/manage/gl_quick_entries.php:197 gl/manage/gl_quick_entries.php:296
-#: gl/includes/ui/gl_bank_ui.inc:168 gl/includes/ui/gl_bank_ui.inc.orig:168
-#: gl/includes/ui/gl_journal_ui.inc:124 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:147
-#: inventory/includes/item_adjustments_ui.inc:89
-#: inventory/includes/stock_transfers_ui.inc:81
-#: inventory/manage/item_categories.php:122
-#: 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
+#: admin/inst_chart.php:83 admin/inst_lang.php:109 admin/inst_module.php:142
+#: admin/inst_theme.php:87 admin/payment_terms.php:143 admin/printers.php:97
+#: admin/shipping_companies.php:107 admin/tags.php:141 admin/users.php:155
+#: gl/gl_budget.php:136 gl/manage/bank_accounts.php:134
+#: gl/manage/currencies.php:166 gl/manage/exchange_rates.php:99
+#: gl/manage/gl_account_classes.php:132 gl/manage/gl_account_types.php:154
+#: gl/manage/gl_quick_entries.php:202 gl/manage/gl_quick_entries.php:304
+#: gl/includes/ui/gl_bank_ui.inc:181 gl/includes/ui/gl_journal_ui.inc:152
+#: includes/ui/class.crud_view.inc:285 includes/ui/contacts_view.inc:64
+#: includes/ui/simple_crud_class.inc:54 includes/ui/ui_input.inc:304
+#: inventory/prices.php:164 inventory/purchasing_data.php:168
+#: inventory/includes/item_adjustments_ui.inc:102
+#: inventory/includes/stock_transfers_ui.inc:84
+#: inventory/manage/item_categories.php:148
+#: inventory/manage/item_codes.php:143 inventory/manage/item_units.php:111
+#: inventory/manage/locations.php:171 inventory/manage/sales_kits.php:52
+#: manufacturing/manage/bom_edit.php:60
 #: 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 sales/manage/credit_status.php:120
-#: sales/manage/customer_branches.php:163
-#: sales/manage/recurrent_invoices.php:131 sales/manage/sales_areas.php:104
+#: manufacturing/includes/work_order_issue_ui.inc:63
+#: purchasing/includes/ui/invoice_ui.inc:317
+#: purchasing/includes/ui/po_ui.inc:251 sales/manage/credit_status.php:120
+#: sales/manage/customer_branches.php:162
+#: sales/manage/recurrent_invoices.php:157 sales/manage/sales_areas.php:104
 #: sales/manage/sales_groups.php:100 sales/manage/sales_people.php:120
 #: sales/manage/sales_points.php:100 sales/manage/sales_types.php:122
-#: sales/includes/ui/sales_credit_ui.inc:199
-#: sales/includes/ui/sales_order_ui.inc:204 taxes/item_tax_types.php:140
-#: taxes/tax_groups.php:143 taxes/tax_types.php:133
+#: sales/includes/ui/sales_credit_ui.inc:194
+#: sales/includes/ui/sales_order_ui.inc:198 taxes/item_tax_types.php:140
+#: taxes/tax_groups.php:141 taxes/tax_types.php:133
 msgid "Delete"
 msgstr ""
 
-#: admin/attachments.php:211 admin/attachments.php:216
+#: admin/attachments.php:208 admin/view_print_transaction.php:126
+#: admin/void_transaction.php:180 dimensions/inquiry/search_dimensions.php:124
+#: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:231
+#: gl/inquiry/bank_inquiry.php:71 gl/inquiry/gl_account_inquiry.php:126
+#: gl/inquiry/journal_inquiry.php:106 gl/inquiry/journal_inquiry.php:121
+#: includes/ui/allocation_cart.inc:290
+#: inventory/inquiry/stock_movements.php:104
+#: manufacturing/search_work_orders.php:157
+#: manufacturing/includes/manufacturing_ui.inc:174
+#: manufacturing/includes/manufacturing_ui.inc:217
+#: manufacturing/includes/manufacturing_ui.inc:253
+#: manufacturing/includes/manufacturing_ui.inc:291
+#: manufacturing/includes/manufacturing_ui.inc:295
+#: manufacturing/includes/manufacturing_ui.inc:346
+#: purchasing/view/view_po.php:115 purchasing/view/view_po.php:140
+#: purchasing/inquiry/po_search_completed.php:110
+#: purchasing/inquiry/po_search.php:117
+#: purchasing/inquiry/supplier_allocation_inquiry.php:137
+#: purchasing/inquiry/supplier_inquiry.php:174
+#: purchasing/allocations/supplier_allocation_main.php:95
+#: reporting/rep101.php:132 reporting/rep201.php:107 reporting/rep203.php:88
+#: reporting/rep306.php:141 reporting/rep601.php:79 reporting/rep602.php:80
+#: reporting/rep704.php:82 reporting/rep704.php:85 reporting/rep704.php:88
+#: reporting/rep710.php:78 reporting/includes/doctext.inc:166
+#: reporting/includes/doctext.inc:207 reporting/includes/doctext.inc:245
+#: sales/allocations/customer_allocation_main.php:93
+#: sales/view/view_sales_order.php:109 sales/view/view_sales_order.php:142
+#: sales/view/view_sales_order.php:179
+#: sales/inquiry/customer_allocation_inquiry.php:147
+#: sales/inquiry/customer_inquiry.php:194
+msgid "#"
+msgstr ""
+
+#: admin/attachments.php:209 admin/attachments.php:253
+#: admin/crm_categories.php:88 admin/payment_terms.php:127
+#: admin/printers.php:84 admin/print_profiles.php:147
+#: gl/inquiry/accounts_list.php:39 gl/inquiry/accounts_list.php:52
+#: gl/inquiry/tax_inquiry.php:80 gl/manage/gl_quick_entries.php:190
+#: gl/manage/gl_quick_entries.php:230 includes/dashboard.inc:526
+#: inventory/inquiry/stock_list.php:41 inventory/inquiry/stock_list.php:53
+#: inventory/manage/item_codes.php:127 inventory/manage/item_units.php:94
+#: inventory/manage/sales_kits.php:36 inventory/view/view_adjustment.php:54
+#: inventory/view/view_transfer.php:50 manufacturing/manage/bom_edit.php:43
+#: manufacturing/includes/manufacturing_ui.inc:28
+#: purchasing/includes/ui/invoice_ui.inc:501
+#: purchasing/includes/ui/invoice_ui.inc:513
+#: purchasing/po_receive_items.php:62 reporting/rep104.php:109
+#: reporting/rep105.php:114 reporting/rep204.php:84 reporting/rep303.php:120
+#: reporting/rep303.php:126 reporting/rep304.php:127 reporting/rep305.php:106
+#: reporting/rep306.php:141 reporting/rep307.php:114 reporting/rep308.php:223
+#: reporting/rep309.php:99 reporting/rep401.php:71
+#: sales/create_recurrent_invoices.php:203 sales/manage/credit_status.php:97
+#: sales/manage/recurrent_invoices.php:128
+#: sales/inquiry/sales_orders_view.php:284
+#: sales/inquiry/sales_orders_view.php:288 taxes/tax_groups.php:126
+#: taxes/tax_types.php:115
+msgid "Description"
+msgstr ""
+
+#: admin/attachments.php:210 admin/backups.php:67 admin/backups.php:153
+msgid "Filename"
+msgstr ""
+
+#: admin/attachments.php:211
+msgid "Size"
+msgstr ""
+
+#: admin/attachments.php:212
+msgid "Filetype"
+msgstr ""
+
+#: admin/attachments.php:213
+msgid "Date Uploaded"
+msgstr ""
+
+#: admin/attachments.php:247 admin/attachments.php:252
 msgid "Transaction #"
 msgstr ""
 
-#: admin/attachments.php:218
+#: admin/attachments.php:254
 msgid "Attached File"
 msgstr ""
 
-#: admin/backups.php:21 admin/backups.php:111
+#: admin/backups.php:21 admin/backups.php:40 admin/backups.php:118
+#: admin/backups.php:146 admin/backups.php:159 admin/backups.php:179
 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:52
 msgid "Backup paths have not been set correctly."
 msgstr ""
 
-#: admin/backups.php:48
+#: admin/backups.php:53
 msgid "Please contact System Administrator."
 msgstr ""
 
-#: admin/backups.php:49
+#: admin/backups.php:54
 msgid "cannot find backup directory"
 msgstr ""
 
-#: admin/backups.php:59
+#: admin/backups.php:66
 msgid "Backup successfully generated."
 msgstr ""
 
-#: admin/backups.php:62
+#: admin/backups.php:69
 msgid "Database backup failed."
 msgstr ""
 
-#: admin/backups.php:95 admin/create_coy.php:261 admin/fiscalyears.php:155
+#: admin/backups.php:102 admin/create_coy.php:268 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/gl_account_classes.php:127 gl/manage/gl_quick_entries.php:230
+#: dimensions/inquiry/search_dimensions.php:106
+#: gl/manage/bank_accounts.php:130 gl/manage/currencies.php:162
+#: gl/manage/gl_account_classes.php:126 gl/manage/gl_quick_entries.php:237
 #: includes/system_tests.inc:38 includes/system_tests.inc:113
-#: includes/system_tests.inc:126 includes/ui/ui_lists.inc:1638
-#: purchasing/manage/suppliers.php:123 reporting/rep101.php:126
-#: reporting/rep102.php:114 reporting/rep102.php:116 reporting/rep104.php:103
-#: reporting/rep106.php:73 reporting/rep114.php:73 reporting/rep201.php:114
-#: reporting/rep202.php:116 reporting/rep202.php:118 reporting/rep203.php:87
-#: reporting/rep303.php:101 reporting/rep303.php:105 reporting/rep501.php:109
+#: includes/system_tests.inc:126 includes/ui/class.reflines_crud.inc:56
+#: includes/ui/ui_lists.inc:1870 includes/ui/ui_lists.inc.orig:1867
+#: purchasing/manage/suppliers.php:122 reporting/rep101.php:128
+#: reporting/rep102.php:110 reporting/rep102.php:112 reporting/rep104.php:103
+#: reporting/rep106.php:81 reporting/rep114.php:74 reporting/rep201.php:103
+#: reporting/rep202.php:116 reporting/rep202.php:118 reporting/rep203.php:84
+#: reporting/rep303.php:112 reporting/rep303.php:116 reporting/rep304.php:123
+#: reporting/rep402.php:99 reporting/rep402.php:134 reporting/rep501.php:113
 #: sales/manage/sales_points.php:94 sales/manage/sales_points.php:95
 #: sales/manage/sales_types.php:119 taxes/item_tax_types.php:129
-#: taxes/tax_groups.php:139
 msgid "No"
 msgstr ""
 
-#: admin/backups.php:135
+#: admin/backups.php:143
 msgid "Restore backup completed."
 msgstr ""
 
-#: admin/backups.php:141
+#: admin/backups.php:152
 msgid "File successfully deleted."
 msgstr ""
 
-#: admin/backups.php:146
+#: admin/backups.php:157
 msgid "Can't delete backup file."
 msgstr ""
 
-#: admin/backups.php:155
+#: admin/backups.php:169
 msgid "You can only upload *.sql backup files"
 msgstr ""
 
-#: admin/backups.php:161
+#: admin/backups.php:171
+msgid "Filename contains forbidden chars. Please rename file and try again."
+msgstr ""
+
+#: admin/backups.php:174
+msgid "File uploaded to backup directory"
+msgstr ""
+
+#: admin/backups.php:177
 msgid "File was not uploaded into the system."
 msgstr ""
 
-#: admin/backups.php:167
+#: admin/backups.php:186
 msgid "Create backup"
 msgstr ""
 
-#: admin/backups.php:168 sales/includes/ui/sales_order_ui.inc:589
-#: sales/includes/ui/sales_order_ui.inc:636
+#: admin/backups.php:187 sales/includes/ui/sales_order_ui.inc:581
+#: sales/includes/ui/sales_order_ui.inc:637
 msgid "Comments:"
 msgstr ""
 
-#: admin/backups.php:169
+#: admin/backups.php:188
 msgid "Compression:"
 msgstr ""
 
-#: admin/backups.php:171
+#: admin/backups.php:190
 msgid "Create Backup"
 msgstr ""
 
-#: admin/backups.php:173
+#: admin/backups.php:192
 msgid "Backup scripts maintenance"
 msgstr ""
 
-#: admin/backups.php:179
+#: admin/backups.php:198
 msgid "View Backup"
 msgstr ""
 
-#: admin/backups.php:180
+#: admin/backups.php:199
 msgid "Download Backup"
 msgstr ""
 
-#: admin/backups.php:181
+#: admin/backups.php:200
 msgid "Restore Backup"
 msgstr ""
 
-#: admin/backups.php:182
+#: admin/backups.php:201
 msgid ""
 "You are about to restore database from backup file.\n"
 "Do you want to continue?"
 msgstr ""
 
-#: admin/backups.php:184
+#: admin/backups.php:203
 msgid "Delete Backup"
 msgstr ""
 
-#: admin/backups.php:186
+#: admin/backups.php:205
 #, 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:211
+msgid "Update security settings"
+msgstr ""
+
+#: admin/backups.php:212
+msgid "Protect security settings"
+msgstr ""
+
+#: admin/backups.php:216
 msgid "Upload file"
 msgstr ""
 
 #: admin/change_current_user_password.php:16
-#: admin/change_current_user_password.php:85 themes/default/renderer.php:72
+#: admin/change_current_user_password.php:99 themes/default/renderer.php:81
 msgid "Change password"
 msgstr ""
 
-#: admin/change_current_user_password.php:28 admin/users.php:40
+#: 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/users.php:47
+#: 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 ""
 
@@ -429,189 +500,245 @@ msgstr ""
 msgid "Company Setup"
 msgstr ""
 
-#: admin/company_preferences.php:31
+#: admin/company_preferences.php:29
 msgid "Login timeout must be positive number not less than 10."
 msgstr ""
 
-#: admin/company_preferences.php:38
+#: admin/company_preferences.php:36
 msgid "The company name must be entered."
 msgstr ""
 
-#: admin/company_preferences.php:54
+#: admin/company_preferences.php:46
+msgid "Error uploading logo file."
+msgstr ""
+
+#: admin/company_preferences.php:60
 msgid ""
 "Only jpg and png files are supported - a file extension of .jpg or .png is "
 "expected"
 msgstr ""
 
-#: admin/company_preferences.php:59 inventory/manage/items.php:74
+#: admin/company_preferences.php:65 inventory/manage/items.php:109
 msgid ""
 "The file size is over the maximum allowed. The maximum size allowed in KB is"
 msgstr ""
 
-#: admin/company_preferences.php:64 inventory/manage/items.php:79
+#: admin/company_preferences.php:70 inventory/manage/items.php:99
+#: inventory/manage/items.php:114
 msgid "Only graphics files can be uploaded"
 msgstr ""
 
-#: admin/company_preferences.php:72 admin/company_preferences.php:93
-#: inventory/manage/items.php:87
+#: admin/company_preferences.php:78 admin/company_preferences.php:99
+#: inventory/manage/items.php:122
 msgid "The existing image could not be removed"
 msgstr ""
 
-#: admin/company_preferences.php:82
+#: admin/company_preferences.php:88
 msgid "Error uploading logo file"
 msgstr ""
 
-#: admin/company_preferences.php:116
+#: admin/company_preferences.php:123
 msgid "Company setup has been updated."
 msgstr ""
 
-#: admin/company_preferences.php:160
+#: admin/company_preferences.php:181
+msgid "General settings"
+msgstr ""
+
+#: admin/company_preferences.php:183
 msgid "Name (to appear on reports):"
 msgstr ""
 
-#: admin/company_preferences.php:161 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:627
+#: admin/company_preferences.php:184 admin/shipping_companies.php:142
+#: includes/ui/contacts_view.inc:106 inventory/manage/locations.php:212
+#: sales/manage/customers.php:234 sales/includes/ui/sales_order_ui.inc:628
 msgid "Address:"
 msgstr ""
 
-#: admin/company_preferences.php:162
+#: admin/company_preferences.php:185
 msgid "Domicile:"
 msgstr ""
 
-#: admin/company_preferences.php:164 admin/shipping_companies.php:138
-#: purchasing/manage/suppliers.php:105 sales/manage/customer_branches.php:260
+#: admin/company_preferences.php:187 admin/shipping_companies.php:138
+#: purchasing/manage/suppliers.php:135 sales/manage/customer_branches.php:253
 msgid "Phone Number:"
 msgstr ""
 
-#: admin/company_preferences.php:165 includes/ui/contacts_view.inc:104
-#: purchasing/manage/suppliers.php:107 sales/manage/customer_branches.php:262
+#: admin/company_preferences.php:188 includes/ui/contacts_view.inc:101
+#: purchasing/manage/suppliers.php:138 sales/manage/customer_branches.php:255
+#: sales/manage/customers.php:258
 msgid "Fax Number:"
 msgstr ""
 
-#: admin/company_preferences.php:166 admin/users.php:202
+#: admin/company_preferences.php:189 admin/users.php:211
 msgid "Email Address:"
 msgstr ""
 
-#: admin/company_preferences.php:168
+#: admin/company_preferences.php:191
+msgid "BCC Address for all outgoing mails:"
+msgstr ""
+
+#: admin/company_preferences.php:193
 msgid "Official Company Number:"
 msgstr ""
 
-#: admin/company_preferences.php:169 purchasing/manage/suppliers.php:88
-#: sales/manage/customers.php:205
+#: admin/company_preferences.php:194 purchasing/manage/suppliers.php:95
+#: sales/manage/customers.php:236
 msgid "GSTNo:"
 msgstr ""
 
-#: admin/company_preferences.php:171
+#: admin/company_preferences.php:195
 msgid "Home Currency:"
 msgstr ""
 
-#: admin/company_preferences.php:172 gl/gl_budget.php:63
+#: admin/company_preferences.php:197
+msgid "Company Logo:"
+msgstr ""
+
+#: admin/company_preferences.php:198
+msgid "New Company Logo (.jpg)"
+msgstr ""
+
+#: admin/company_preferences.php:199
+msgid "Delete Company Logo:"
+msgstr ""
+
+#: admin/company_preferences.php:201
+msgid "Automatic Revaluation Currency Accounts"
+msgstr ""
+
+#: admin/company_preferences.php:202
+msgid "Time Zone on Reports"
+msgstr ""
+
+#: admin/company_preferences.php:203
+msgid "Company Logo on Reports"
+msgstr ""
+
+#: admin/company_preferences.php:204
+msgid "Database Scheme Version"
+msgstr ""
+
+#: admin/company_preferences.php:208
+msgid "General Ledger Settings"
+msgstr ""
+
+#: admin/company_preferences.php:209 gl/gl_budget.php:62
 msgid "Fiscal Year:"
 msgstr ""
 
-#: admin/company_preferences.php:173
+#: admin/company_preferences.php:210
 msgid "Tax Periods:"
 msgstr ""
 
-#: admin/company_preferences.php:173
+#: admin/company_preferences.php:210
 msgid "Months."
 msgstr ""
 
-#: admin/company_preferences.php:174
+#: admin/company_preferences.php:211
 msgid "Tax Last Period:"
 msgstr ""
 
-#: admin/company_preferences.php:174
+#: admin/company_preferences.php:211
 msgid "Months back."
 msgstr ""
 
-#: admin/company_preferences.php:178
-msgid "Company Logo:"
-msgstr ""
-
-#: admin/company_preferences.php:179
-msgid "New Company Logo (.jpg)"
+#: admin/company_preferences.php:212
+msgid "Put alternative Tax Include on Docs"
 msgstr ""
 
-#: admin/company_preferences.php:180
-msgid "Delete Company Logo:"
+#: admin/company_preferences.php:213
+msgid "Suppress Tax Rates on Docs"
 msgstr ""
 
-#: admin/company_preferences.php:182
-msgid "Use Dimensions:"
+#: admin/company_preferences.php:215
+msgid "Sales Pricing"
 msgstr ""
 
-#: admin/company_preferences.php:183
+#: admin/company_preferences.php:216
 msgid "Base for auto price calculations:"
 msgstr ""
 
-#: admin/company_preferences.php:184
+#: admin/company_preferences.php:217
 msgid "No base price list"
 msgstr ""
 
-#: admin/company_preferences.php:185
+#: admin/company_preferences.php:219
 msgid "Add Price from Std Cost:"
 msgstr ""
 
-#: admin/company_preferences.php:187
-msgid "Round to nearest:"
+#: admin/company_preferences.php:221
+msgid "Round calculated prices to nearest:"
 msgstr ""
 
-#: admin/company_preferences.php:190
-msgid "Search Item List"
+#: admin/company_preferences.php:225
+msgid "Optional Modules"
 msgstr ""
 
-#: admin/company_preferences.php:191
-msgid "Search Customer List"
+#: admin/company_preferences.php:226 includes/dashboard.inc:118
+#: reporting/reports_main.php:285
+msgid "Manufacturing"
 msgstr ""
 
-#: admin/company_preferences.php:192
-msgid "Search Supplier List"
+#: admin/company_preferences.php:227 includes/dashboard.inc:116
+#: inventory/manage/items.php:24 reporting/reports_main.php:308
+msgid "Fixed Assets"
 msgstr ""
 
-#: admin/company_preferences.php:194
-msgid "Automatic Revaluation Currency Accounts"
+#: admin/company_preferences.php:228
+msgid "Use Dimensions:"
 msgstr ""
 
-#: admin/company_preferences.php:195
-msgid "Time Zone on Reports"
+#: admin/company_preferences.php:230
+msgid "User Interface Options"
+msgstr ""
+
+#: admin/company_preferences.php:232
+msgid "Short Name and Name in List"
+msgstr ""
+
+#: admin/company_preferences.php:233
+msgid "Search Item List"
+msgstr ""
+
+#: admin/company_preferences.php:234
+msgid "Search Customer List"
+msgstr ""
+
+#: admin/company_preferences.php:235
+msgid "Search Supplier List"
 msgstr ""
 
-#: admin/company_preferences.php:196
+#: admin/company_preferences.php:236
 msgid "Login Timeout:"
 msgstr ""
 
-#: admin/company_preferences.php:196
+#: admin/company_preferences.php:236
 msgid "seconds"
 msgstr ""
 
-#: admin/company_preferences.php:197
-msgid "Version Id"
-msgstr ""
-
-#: admin/company_preferences.php:202 admin/display_prefs.php:142
-#: admin/forms_setup.php:61 admin/gl_setup.php:221 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_theme.php:96
-#: dimensions/dimension_entry.php:293 gl/gl_bank.php:400 gl/gl_budget.php:135
-#: gl/manage/gl_quick_entries.php:60 gl/includes/ui/gl_bank_ui.inc:257
-#: gl/includes/ui/gl_bank_ui.inc.orig:257 gl/includes/ui/gl_journal_ui.inc:221
-#: 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:235
-#: inventory/cost_update.php:119 inventory/reorder_level.php:97
-#: inventory/transfers.php:236 inventory/includes/item_adjustments_ui.inc:157
-#: inventory/includes/stock_transfers_ui.inc:137
-#: inventory/manage/sales_kits.php:208 manufacturing/work_order_entry.php:459
-#: manufacturing/includes/work_order_issue_ui.inc:131
-#: purchasing/includes/ui/po_ui.inc:299 purchasing/includes/ui/po_ui.inc:442
-#: purchasing/po_receive_items.php:333 sales/credit_note_entry.php:282
-#: sales/customer_credit_invoice.php:382 sales/customer_delivery.php:520
-#: sales/customer_invoice.php:561 sales/inquiry/sales_orders_view.php:314
-#: sales/includes/ui/sales_credit_ui.inc:293
-#: sales/includes/ui/sales_order_ui.inc:237
-#: sales/includes/ui/sales_order_ui.inc:555
+#: admin/company_preferences.php:241 admin/display_prefs.php:160
+#: admin/gl_setup.php:274 admin/inst_chart.php:77 admin/inst_lang.php:103
+#: admin/inst_module.php:136 admin/inst_module.php:154
+#: admin/inst_module.php:197 admin/inst_theme.php:81
+#: dimensions/dimension_entry.php:283 gl/gl_bank.php:409 gl/gl_budget.php:134
+#: gl/manage/gl_quick_entries.php:60 gl/includes/ui/gl_bank_ui.inc:267
+#: gl/includes/ui/gl_journal_ui.inc:267 includes/ui/class.crud_view.inc:289
+#: includes/ui/db_pager_view.inc:180 includes/ui/simple_crud_class.inc:56
+#: includes/ui/simple_crud_class.inc:225 includes/ui/ui_input.inc:226
+#: includes/ui/ui_input.inc:959 inventory/adjustments.php:255
+#: inventory/cost_update.php:150 inventory/reorder_level.php:111
+#: inventory/transfers.php:237 inventory/includes/item_adjustments_ui.inc:190
+#: inventory/includes/stock_transfers_ui.inc:150
+#: inventory/manage/sales_kits.php:208 manufacturing/work_order_entry.php:437
+#: manufacturing/includes/work_order_issue_ui.inc:132
+#: purchasing/includes/ui/po_ui.inc:283 purchasing/includes/ui/po_ui.inc:436
+#: purchasing/po_receive_items.php:325 sales/credit_note_entry.php:284
+#: sales/customer_credit_invoice.php:376 sales/customer_delivery.php:527
+#: sales/customer_invoice.php:662 sales/inquiry/sales_orders_view.php:316
+#: sales/includes/ui/sales_credit_ui.inc:288
+#: sales/includes/ui/sales_order_ui.inc:231
+#: sales/includes/ui/sales_order_ui.inc:547
 msgid "Update"
 msgstr ""
 
@@ -619,163 +746,198 @@ msgstr ""
 msgid "Create/Update Company"
 msgstr ""
 
-#: admin/create_coy.php:46 admin/create_coy.php:52
+#: admin/create_coy.php:37 admin/create_coy.php:43
 msgid "Database settings are not specified."
 msgstr ""
 
-#: admin/create_coy.php:62
+#: admin/create_coy.php:48
+msgid "Database port has to be numeric or empty."
+msgstr ""
+
+#: admin/create_coy.php:59
 msgid "This database settings are already used by another company."
 msgstr ""
 
-#: admin/create_coy.php:67
+#: admin/create_coy.php:64
 msgid ""
 "You cannot have table set without prefix together with prefixed sets in the "
 "same database."
 msgstr ""
 
-#: admin/create_coy.php:127
+#: admin/create_coy.php:124
 msgid "Error creating Database: "
 msgstr ""
 
-#: admin/create_coy.php:127
+#: admin/create_coy.php:124
 msgid ", Please create it manually"
 msgstr ""
 
-#: admin/create_coy.php:131
+#: admin/create_coy.php:130
 msgid "Cannot create new company due to bugs in sql file."
 msgstr ""
 
-#: admin/create_coy.php:145 admin/create_coy.php:212
+#: admin/create_coy.php:148 admin/create_coy.php:216
 msgid "Cannot open the configuration file - "
 msgstr ""
 
-#: admin/create_coy.php:147 admin/create_coy.php:214
+#: admin/create_coy.php:150 admin/create_coy.php:218
 msgid "Cannot write to the configuration file - "
 msgstr ""
 
-#: admin/create_coy.php:149 admin/create_coy.php:185 admin/create_coy.php:216
+#: admin/create_coy.php:152 admin/create_coy.php:188 admin/create_coy.php:220
 msgid "The configuration file "
 msgstr ""
 
-#: admin/create_coy.php:149 admin/create_coy.php:185 admin/create_coy.php:216
-#: admin/db/maintenance_db.inc:248
+#: admin/create_coy.php:152 admin/create_coy.php:188 admin/create_coy.php:220
+#: admin/db/maintenance_db.inc:253
 msgid ""
 " is not writable. Change its permissions so it is, then re-run the operation."
 msgstr ""
 
-#: admin/create_coy.php:161
+#: admin/create_coy.php:164
 msgid "New company has been created."
 msgstr ""
 
-#: admin/create_coy.php:161
+#: admin/create_coy.php:164
 msgid "Company has been updated."
 msgstr ""
 
-#: admin/create_coy.php:178
+#: admin/create_coy.php:181
 msgid ""
 "Broken company subdirectories system. You have to remove this company "
 "manually."
 msgstr ""
 
-#: admin/create_coy.php:194
+#: admin/create_coy.php:197
 msgid "Cannot rename subdirectory to temporary name."
 msgstr ""
 
-#: admin/create_coy.php:200
+#: admin/create_coy.php:203
 msgid "Cannot rename company subdirectory"
 msgstr ""
 
-#: admin/create_coy.php:206
+#: admin/create_coy.php:209
 msgid "Error removing Database: "
 msgstr ""
 
-#: admin/create_coy.php:206
+#: admin/create_coy.php:209
 msgid ", please remove it manually"
 msgstr ""
 
-#: admin/create_coy.php:225
+#: admin/create_coy.php:229
 msgid "Cannot remove temporary renamed company data directory "
 msgstr ""
 
-#: admin/create_coy.php:228
+#: admin/create_coy.php:232
 msgid "Selected company has been deleted"
 msgstr ""
 
-#: admin/create_coy.php:242
-msgid "Are you sure you want to delete company no. "
+#: admin/create_coy.php:247
+msgid "Database Host"
 msgstr ""
 
-#: admin/create_coy.php:249
-msgid "Database Host"
+#: admin/create_coy.php:247
+msgid "Database Port"
 msgstr ""
 
-#: admin/create_coy.php:249 admin/create_coy.php:336 admin/create_coy.php:342
+#: admin/create_coy.php:247 admin/create_coy.php:333 admin/create_coy.php:344
 msgid "Database User"
 msgstr ""
 
-#: admin/create_coy.php:250 admin/create_coy.php:338 admin/create_coy.php:343
+#: admin/create_coy.php:248 admin/create_coy.php:335 admin/create_coy.php:345
 msgid "Database Name"
 msgstr ""
 
-#: admin/create_coy.php:250 admin/create_coy.php:339 admin/create_coy.php:344
+#: admin/create_coy.php:248 admin/create_coy.php:337 admin/create_coy.php:347
 msgid "Table Pref"
 msgstr ""
 
-#: admin/create_coy.php:250 admin/create_coy.php:346 admin/inst_lang.php:36
-#: admin/print_profiles.php:162
+#: admin/create_coy.php:248
+msgid "Charset"
+msgstr ""
+
+#: admin/create_coy.php:248 admin/inst_lang.php:36
+#: admin/print_profiles.php:161 includes/ui/class.reflines_crud.inc:38
+#: purchasing/includes/ui/invoice_ui.inc:140
+#: purchasing/includes/ui/invoice_ui.inc:143
+#: purchasing/includes/ui/po_ui.inc:172 purchasing/includes/ui/po_ui.inc:174
 msgid "Default"
 msgstr ""
 
-#: admin/create_coy.php:259 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/gl_account_classes.php:127 gl/manage/gl_quick_entries.php:230
+#: admin/create_coy.php:268 admin/create_coy.php:351 admin/fiscalyears.php:159
+#: admin/inst_lang.php:85 admin/inst_lang.php:97
+#: dimensions/inquiry/search_dimensions.php:106
+#: gl/manage/bank_accounts.php:128 gl/manage/currencies.php:162
+#: gl/manage/gl_account_classes.php:126 gl/manage/gl_quick_entries.php:237
 #: includes/system_tests.inc:38 includes/system_tests.inc:113
-#: includes/system_tests.inc:126 includes/ui/ui_lists.inc:1639
-#: purchasing/manage/suppliers.php:123 reporting/rep101.php:125
-#: reporting/rep102.php:113 reporting/rep102.php:115 reporting/rep104.php:105
-#: reporting/rep106.php:75 reporting/rep114.php:75 reporting/rep201.php:113
-#: reporting/rep202.php:115 reporting/rep202.php:117 reporting/rep203.php:86
-#: reporting/rep303.php:96 reporting/rep303.php:104 reporting/rep501.php:107
+#: includes/system_tests.inc:126 includes/ui/class.reflines_crud.inc:56
+#: includes/ui/class.reflines_crud.inc:101 includes/ui/ui_lists.inc:1871
+#: includes/ui/ui_lists.inc.orig:1868 purchasing/manage/suppliers.php:122
+#: reporting/rep101.php:127 reporting/rep102.php:109 reporting/rep102.php:111
+#: reporting/rep104.php:105 reporting/rep106.php:83 reporting/rep114.php:76
+#: reporting/rep201.php:102 reporting/rep202.php:115 reporting/rep202.php:117
+#: reporting/rep203.php:83 reporting/rep303.php:107 reporting/rep303.php:115
+#: reporting/rep304.php:122 reporting/rep402.php:99 reporting/rep501.php:111
 #: sales/manage/sales_points.php:94 sales/manage/sales_points.php:95
 #: sales/manage/sales_types.php:119 taxes/item_tax_types.php:133
-#: taxes/tax_groups.php:137
 msgid "Yes"
 msgstr ""
 
-#: admin/create_coy.php:288
+#: admin/create_coy.php:274
+#, php-format
+msgid ""
+"You are about to remove company \\'%s\\'.\n"
+"Do you want to continue ?"
+msgstr ""
+
+#: admin/create_coy.php:282
 msgid "The marked company is the current company which cannot be deleted."
 msgstr ""
 
-#: admin/create_coy.php:335 admin/create_coy.php:341 admin/printers.php:84
+#: admin/create_coy.php:283
+msgid ""
+"If no Admin Password is entered, the new Admin Password will be "
+"'<b>password</b>' by default "
+msgstr ""
+
+#: admin/create_coy.php:284
+msgid "Set Only Port value if you cannot use the default port 3306."
+msgstr ""
+
+#: admin/create_coy.php:331 admin/create_coy.php:342 admin/printers.php:84
 msgid "Host"
 msgstr ""
 
-#: admin/create_coy.php:337
+#: admin/create_coy.php:332 admin/create_coy.php:343 admin/printers.php:135
+msgid "Port"
+msgstr ""
+
+#: admin/create_coy.php:334
 msgid "Database Password"
 msgstr ""
 
-#: admin/create_coy.php:339 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_theme.php:91 admin/inst_theme.php:93 admin/inst_upgrade.php:149
-#: gl/manage/gl_account_types.php:191 includes/ui/allocation_cart.inc:286
-msgid "None"
+#: admin/create_coy.php:336 admin/create_coy.php:346
+msgid "Database Collation:"
 msgstr ""
 
-#: admin/create_coy.php:350
-msgid "Database Script"
+#: admin/create_coy.php:337 admin/inst_chart.php:71 admin/inst_chart.php:73
+#: admin/inst_lang.php:87 admin/inst_lang.php:90 admin/inst_module.php:125
+#: admin/inst_theme.php:76 admin/inst_theme.php:78
+#: gl/manage/gl_account_types.php:189 includes/db/audit_trail_db.inc:127
+#: includes/ui/allocation_cart.inc:316 inventory/manage/items.php:447
+msgid "None"
 msgstr ""
 
-#: admin/create_coy.php:351
-msgid "New script Admin Password"
+#: admin/create_coy.php:338 admin/create_coy.php:349 admin/create_coy.php:351
+msgid "Default Company"
 msgstr ""
 
-#: admin/create_coy.php:355 gl/gl_budget.php:136
-msgid "Save"
+#: admin/create_coy.php:339
+msgid "Database Script"
 msgstr ""
 
-#: admin/create_coy.php:377
-msgid "Create a new company"
+#: admin/create_coy.php:340
+msgid "New script Admin Password"
 msgstr ""
 
 #: admin/crm_categories.php:17
@@ -803,14 +965,15 @@ msgid "Category has been deleted"
 msgstr ""
 
 #: admin/crm_categories.php:88
-msgid "Type id"
+msgid "Category Type"
 msgstr ""
 
 #: admin/crm_categories.php:88
-msgid "Action id"
+msgid "Category Subtype"
 msgstr ""
 
-#: admin/crm_categories.php:88 sales/manage/customer_branches.php:293
+#: admin/crm_categories.php:88 purchasing/inquiry/suppliers_list.php:53
+#: sales/manage/customer_branches.php:283 sales/inquiry/customers_list.php:54
 msgid "Short Name"
 msgstr ""
 
@@ -830,6 +993,11 @@ msgstr ""
 msgid "Category Description:"
 msgstr ""
 
+#: admin/dashboard.php:27 themes/default/renderer.php:70
+#: themes/default/renderer.php:78
+msgid "Dashboard"
+msgstr ""
+
 #: admin/display_prefs.php:16
 msgid "Display Setup"
 msgstr ""
@@ -838,127 +1006,167 @@ msgstr ""
 msgid "Query size must be integer and greater than zero."
 msgstr ""
 
-#: admin/display_prefs.php:59
+#: admin/display_prefs.php:61
 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:63
 msgid "Display settings have been updated."
 msgstr ""
 
-#: admin/display_prefs.php:70
+#: admin/display_prefs.php:72
 msgid "Decimal Places"
 msgstr ""
 
-#: admin/display_prefs.php:72
+#: admin/display_prefs.php:74
 msgid "Prices/Amounts:"
 msgstr ""
 
-#: admin/display_prefs.php:73
+#: admin/display_prefs.php:75
 msgid "Quantities:"
 msgstr ""
 
-#: admin/display_prefs.php:74
+#: admin/display_prefs.php:76
 msgid "Exchange Rates:"
 msgstr ""
 
-#: admin/display_prefs.php:75
-msgid "Percentages:"
-msgstr ""
-
 #: admin/display_prefs.php:77
-msgid "Dateformat and Separators"
+msgid "Percentages:"
 msgstr ""
 
 #: admin/display_prefs.php:79
-msgid "Dateformat:"
+msgid "Date Format and Separators"
 msgstr ""
 
 #: admin/display_prefs.php:81
+msgid "Date Format:"
+msgstr ""
+
+#: admin/display_prefs.php:83
 msgid "Date Separator:"
 msgstr ""
 
-#: admin/display_prefs.php:86
+#: admin/display_prefs.php:88
 msgid "Thousand Separator:"
 msgstr ""
 
-#: admin/display_prefs.php:91
+#: admin/display_prefs.php:93
 msgid "Decimal Separator:"
 msgstr ""
 
-#: admin/display_prefs.php:98 admin/inst_lang.php:35
-msgid "Language"
+#: admin/display_prefs.php:98
+msgid "Use Date Picker"
 msgstr ""
 
-#: admin/display_prefs.php:100 admin/users.php:206
-msgid "Language:"
+#: admin/display_prefs.php:103
+msgid "Reports"
+msgstr ""
+
+#: admin/display_prefs.php:105
+msgid "Save Report Selection Days:"
+msgstr ""
+
+#: admin/display_prefs.php:107
+msgid "Default Report Destination:"
 msgstr ""
 
-#: admin/display_prefs.php:103 applications/setup.php:42
-#: includes/sysnames.inc:94
+#: admin/display_prefs.php:108
+msgid "Excel"
+msgstr ""
+
+#: admin/display_prefs.php:108 reporting/includes/reports_classes.inc:235
+msgid "PDF/Printer"
+msgstr ""
+
+#: admin/display_prefs.php:110
+msgid "Default Report Orientation:"
+msgstr ""
+
+#: admin/display_prefs.php:111 reporting/includes/reports_classes.inc:242
+msgid "Landscape"
+msgstr ""
+
+#: admin/display_prefs.php:111 reporting/includes/reports_classes.inc:242
+msgid "Portrait"
+msgstr ""
+
+#: admin/display_prefs.php:115 applications/setup.php:42
+#: includes/sysnames.inc:99
 msgid "Miscellaneous"
 msgstr ""
 
-#: admin/display_prefs.php:105
+#: admin/display_prefs.php:117
 msgid "Show hints for new users:"
 msgstr ""
 
-#: admin/display_prefs.php:107
+#: admin/display_prefs.php:119
 msgid "Show GL Information:"
 msgstr ""
 
-#: admin/display_prefs.php:109
+#: admin/display_prefs.php:121
 msgid "Show Item Codes:"
 msgstr ""
 
-#: admin/display_prefs.php:116
+#: admin/display_prefs.php:128
 msgid "Page Size:"
 msgstr ""
 
-#: admin/display_prefs.php:118
+#: admin/display_prefs.php:130
 msgid "Start-up Tab"
 msgstr ""
 
-#: admin/display_prefs.php:126 admin/users.php:210
+#: admin/display_prefs.php:138 admin/users.php:219
 msgid "Printing profile"
 msgstr ""
 
-#: admin/display_prefs.php:127 admin/users.php:211
+#: admin/display_prefs.php:139 admin/users.php:220
 msgid "Browser printing support"
 msgstr ""
 
-#: admin/display_prefs.php:129
+#: admin/display_prefs.php:141
 msgid "Use popup window to display reports:"
 msgstr ""
 
-#: admin/display_prefs.php:130 admin/users.php:214
+#: admin/display_prefs.php:142 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:144
 msgid "Use icons instead of text links:"
 msgstr ""
 
-#: admin/display_prefs.php:133
+#: admin/display_prefs.php:145
 msgid "Set this option to on for using icons instead of text links"
 msgstr ""
 
-#: admin/display_prefs.php:135
-msgid "Query page size:"
-msgstr ""
-
-#: admin/display_prefs.php:137
+#: admin/display_prefs.php:147
 msgid "Remember last document date:"
 msgstr ""
 
-#: admin/display_prefs.php:138
+#: admin/display_prefs.php:148
 msgid ""
 "If set document date is remembered on subsequent documents, otherwise "
 "default is current date"
 msgstr ""
 
+#: admin/display_prefs.php:150
+msgid "Query page size:"
+msgstr ""
+
+#: admin/display_prefs.php:152
+msgid "Transaction days:"
+msgstr ""
+
+#: admin/display_prefs.php:154 admin/inst_lang.php:35
+msgid "Language"
+msgstr ""
+
+#: admin/display_prefs.php:156 admin/users.php:215
+msgid "Language:"
+msgstr ""
+
 #: admin/fiscalyears.php:25
 msgid "Fiscal Years"
 msgstr ""
@@ -992,7 +1200,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
@@ -1018,11 +1226,13 @@ msgstr ""
 msgid "Fiscal Year End"
 msgstr ""
 
-#: admin/fiscalyears.php:138 dimensions/inquiry/search_dimensions.php:133
-#: dimensions/inquiry/search_dimensions.php:139 includes/ui/ui_lists.inc:648
-#: manufacturing/search_work_orders.php:108 reporting/rep501.php:85
-#: reporting/rep710.php:109 reporting/includes/excel_report.inc:234
-#: reporting/includes/pdf_report.inc:266
+#: admin/fiscalyears.php:138 dimensions/inquiry/search_dimensions.php:130
+#: dimensions/inquiry/search_dimensions.php:136 includes/ui/ui_lists.inc:758
+#: includes/ui/ui_lists.inc.orig:758 includes/ui/ui_view.inc:1546
+#: manufacturing/search_work_orders.php:114 reporting/rep402.php:103
+#: reporting/rep501.php:87 reporting/rep710.php:113
+#: reporting/includes/excel_report.inc:231
+#: reporting/includes/pdf_report.inc:267
 msgid "Closed"
 msgstr ""
 
@@ -1050,203 +1260,318 @@ msgstr ""
 msgid "Is Closed:"
 msgstr ""
 
-#: admin/forms_setup.php:16
-msgid "Forms Setup"
-msgstr ""
-
-#: admin/forms_setup.php:36
-msgid "Forms settings have been updated."
-msgstr ""
-
-#: admin/forms_setup.php:46
-msgid "Form"
-msgstr ""
-
-#: admin/forms_setup.php:46
-msgid "Next Reference"
+#: admin/forms_setup.php:20
+msgid "Transaction References"
 msgstr ""
 
-#: admin/gl_setup.php:16
+#: admin/gl_setup.php:20
 msgid "System and General GL Setup"
 msgstr ""
 
-#: admin/gl_setup.php:30
+#: admin/gl_setup.php:34
 msgid "The delivery over-receive allowance must be between 0 and 100."
 msgstr ""
 
-#: admin/gl_setup.php:37
+#: admin/gl_setup.php:41
 msgid "The invoice over-charge allowance must be between 0 and 100."
 msgstr ""
 
-#: admin/gl_setup.php:44
+#: admin/gl_setup.php:48
 msgid "The past due days interval allowance must be between 0 and 100."
 msgstr ""
 
-#: admin/gl_setup.php:52
+#: admin/gl_setup.php:59
 msgid "Before GRN Clearing Account can be changed all GRNs have to be invoiced"
 msgstr ""
 
-#: admin/gl_setup.php:75
+#: admin/gl_setup.php:66 admin/db/fiscalyears_db.inc:142
+msgid ""
+"The Retained Earnings Account should be a Balance Account or the Profit and "
+"Loss Year Account should be an Expense Account (preferred the last one in "
+"the Expense Class)"
+msgstr ""
+
+#: admin/gl_setup.php:89
 msgid "The general GL setup has been updated."
 msgstr ""
 
-#: admin/gl_setup.php:132
+#: admin/gl_setup.php:154
 msgid "General GL"
 msgstr ""
 
-#: admin/gl_setup.php:134
+#: admin/gl_setup.php:156
 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/payment_terms.php:140
+#: admin/gl_setup.php:156 admin/gl_setup.php:174 admin/gl_setup.php:208
+#: admin/gl_setup.php:210 admin/gl_setup.php:230 admin/gl_setup.php:268
+#: admin/payment_terms.php:140
 msgid "days"
 msgstr ""
 
-#: admin/gl_setup.php:136
+#: admin/gl_setup.php:158
+msgid "Accounts Type:"
+msgstr ""
+
+#: admin/gl_setup.php:160
 msgid "Retained Earnings:"
 msgstr ""
 
-#: admin/gl_setup.php:138
+#: admin/gl_setup.php:162
 msgid "Profit/Loss Year:"
 msgstr ""
 
-#: admin/gl_setup.php:140
+#: admin/gl_setup.php:164
 msgid "Exchange Variances Account:"
 msgstr ""
 
-#: admin/gl_setup.php:142
+#: admin/gl_setup.php:166 gl/manage/bank_accounts.php:194
 msgid "Bank Charges Account:"
 msgstr ""
 
-#: admin/gl_setup.php:146
-msgid "Customers and Sales"
+#: admin/gl_setup.php:168
+msgid "Tax Algorithm:"
 msgstr ""
 
-#: admin/gl_setup.php:148
-msgid "Default Credit Limit:"
+#: admin/gl_setup.php:172
+msgid "Dimension Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:150
+#: admin/gl_setup.php:174
+msgid "Dimension Required By After:"
+msgstr ""
+
+#: admin/gl_setup.php:178
+msgid "Customers and Sales"
+msgstr ""
+
+#: admin/gl_setup.php:180
+msgid "Default Credit Limit:"
+msgstr ""
+
+#: admin/gl_setup.php:182
+msgid "Invoice Identification:"
+msgstr ""
+
+#: admin/gl_setup.php:182 gl/manage/bank_accounts.php:110
+#: includes/ui/ui_view.inc:546
+msgid "Number"
+msgstr ""
+
+#: admin/gl_setup.php:182 admin/view_print_transaction.php:127
+#: admin/void_transaction.php:181 dimensions/inquiry/search_dimensions.php:125
+#: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:232
+#: gl/inquiry/bank_inquiry.php:71 gl/inquiry/journal_inquiry.php:112
+#: gl/view/bank_transfer_view.php:86 gl/view/gl_deposit_view.php:80
+#: gl/view/gl_payment_view.php:78 gl/view/gl_trans_view.php:38
+#: includes/ui/contacts_view.inc:40 inventory/inquiry/stock_movements.php:104
+#: inventory/view/view_adjustment.php:43 inventory/view/view_transfer.php:36
+#: manufacturing/search_work_orders.php:158
+#: manufacturing/view/wo_issue_view.php:42
+#: manufacturing/view/wo_production_view.php:43
+#: manufacturing/includes/manufacturing_ui.inc:174
+#: manufacturing/includes/manufacturing_ui.inc:217
+#: manufacturing/includes/manufacturing_ui.inc:291
+#: manufacturing/includes/manufacturing_ui.inc:295
+#: manufacturing/includes/manufacturing_ui.inc:346
+#: purchasing/includes/ui/grn_ui.inc:32 purchasing/includes/ui/grn_ui.inc:64
+#: purchasing/includes/ui/po_ui.inc:298 purchasing/view/view_po.php:115
+#: purchasing/view/view_supp_credit.php:43
+#: purchasing/view/view_supp_invoice.php:47
+#: purchasing/view/view_supp_payment.php:73
+#: purchasing/inquiry/po_search_completed.php:111
+#: purchasing/inquiry/po_search.php:118
+#: purchasing/inquiry/supplier_allocation_inquiry.php:138
+#: purchasing/inquiry/supplier_inquiry.php:175
+#: purchasing/allocations/supplier_allocation_main.php:96
+#: reporting/rep501.php:87 reporting/rep601.php:79 reporting/rep602.php:80
+#: reporting/rep702.php:53 reporting/includes/doctext.inc:220
+#: sales/customer_credit_invoice.php:241 sales/customer_credit_invoice.php:246
+#: sales/customer_delivery.php:333 sales/customer_delivery.php:338
+#: sales/customer_invoice.php:445 sales/customer_invoice.php:450
+#: sales/allocations/customer_allocation_main.php:94
+#: sales/view/view_dispatch.php:85 sales/view/view_invoice.php:85
+#: sales/view/view_receipt.php:39 sales/view/view_sales_order.php:94
+#: sales/inquiry/customer_allocation_inquiry.php:148
+#: sales/inquiry/customer_inquiry.php:196
+#: sales/inquiry/sales_deliveries_view.php:173
+#: sales/includes/ui/sales_credit_ui.inc:81
+#: sales/includes/ui/sales_credit_ui.inc:83
+#: sales/includes/ui/sales_order_ui.inc:361
+msgid "Reference"
+msgstr ""
+
+#: admin/gl_setup.php:184
 msgid "Accumulate batch shipping:"
 msgstr ""
 
-#: admin/gl_setup.php:152
+#: admin/gl_setup.php:186
+msgid "Print Item Image on Quote:"
+msgstr ""
+
+#: admin/gl_setup.php:188
 msgid "Legal Text on Invoice:"
 msgstr ""
 
-#: admin/gl_setup.php:154
+#: admin/gl_setup.php:190
 msgid "Shipping Charged Account:"
 msgstr ""
 
-#: admin/gl_setup.php:158
+#: admin/gl_setup.php:192
+msgid "Deferred Income Account:"
+msgstr ""
+
+#: admin/gl_setup.php:193
+msgid "Not used"
+msgstr ""
+
+#: admin/gl_setup.php:197
 msgid "Customers and Sales Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:160
+#: admin/gl_setup.php:199
 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:201 admin/gl_setup.php:246
+#: inventory/manage/item_categories.php:228 inventory/manage/items.php:469
+#: sales/manage/customer_branches.php:242
 msgid "Sales Account:"
 msgstr ""
 
-#: admin/gl_setup.php:165 sales/manage/customer_branches.php:251
+#: admin/gl_setup.php:204 sales/manage/customer_branches.php:243
 msgid "Sales Discount Account:"
 msgstr ""
 
-#: admin/gl_setup.php:167 sales/manage/customer_branches.php:253
+#: admin/gl_setup.php:206 sales/manage/customer_branches.php:245
 msgid "Prompt Payment Discount Account:"
 msgstr ""
 
-#: admin/gl_setup.php:169
-msgid "Delivery Required By:"
-msgstr ""
-
-#: admin/gl_setup.php:175
-msgid "Dimension Defaults"
+#: admin/gl_setup.php:208
+msgid "Quote Valid Days:"
 msgstr ""
 
-#: admin/gl_setup.php:177
-msgid "Dimension Required By After:"
+#: admin/gl_setup.php:210
+msgid "Delivery Required By:"
 msgstr ""
 
-#: admin/gl_setup.php:180
+#: admin/gl_setup.php:216
 msgid "Suppliers and Purchasing"
 msgstr ""
 
-#: admin/gl_setup.php:182
+#: admin/gl_setup.php:218
 msgid "Delivery Over-Receive Allowance:"
 msgstr ""
 
-#: admin/gl_setup.php:184
+#: admin/gl_setup.php:220
 msgid "Invoice Over-Charge Allowance:"
 msgstr ""
 
-#: admin/gl_setup.php:186
+#: admin/gl_setup.php:222
 msgid "Suppliers and Purchasing Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:188
+#: admin/gl_setup.php:224
 msgid "Payable Account:"
 msgstr ""
 
-#: admin/gl_setup.php:190 purchasing/manage/suppliers.php:129
+#: admin/gl_setup.php:226 purchasing/manage/suppliers.php:131
 msgid "Purchase Discount Account:"
 msgstr ""
 
-#: admin/gl_setup.php:192
+#: admin/gl_setup.php:228
 msgid "GRN Clearing Account:"
 msgstr ""
 
-#: admin/gl_setup.php:192
+#: admin/gl_setup.php:228
 msgid "No postings on GRN"
 msgstr ""
 
-#: admin/gl_setup.php:194 reporting/reports_main.php:175
+#: admin/gl_setup.php:230
+msgid "Receival Required By:"
+msgstr ""
+
+#: admin/gl_setup.php:232
+msgid "Show PO item codes:"
+msgstr ""
+
+#: admin/gl_setup.php:234 reporting/reports_main.php:208
 msgid "Inventory"
 msgstr ""
 
-#: admin/gl_setup.php:196
+#: admin/gl_setup.php:236
 msgid "Allow Negative Inventory:"
 msgstr ""
 
-#: admin/gl_setup.php:197
+#: admin/gl_setup.php:237
 msgid "Warning:  This may cause a delay in GL postings"
 msgstr ""
 
-#: admin/gl_setup.php:199
+#: admin/gl_setup.php:239
+msgid "No zero-amounts (Service):"
+msgstr ""
+
+#: admin/gl_setup.php:241
+msgid "Location Notifications:"
+msgstr ""
+
+#: admin/gl_setup.php:243
+msgid "Allow Negative Prices:"
+msgstr ""
+
+#: admin/gl_setup.php:245
 msgid "Items Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:202 inventory/manage/item_categories.php:202
-#: inventory/manage/items.php:368
+#: admin/gl_setup.php:248 inventory/manage/item_categories.php:244
+#: inventory/manage/items.php:478
 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:250 inventory/manage/item_categories.php:232
+#: inventory/manage/item_categories.php:246 inventory/manage/items.php:479
+#: inventory/manage/items.php:484
 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:252 inventory/manage/item_categories.php:247
+#: inventory/manage/items.php:480
 msgid "Inventory Adjustments Account:"
 msgstr ""
 
-#: admin/gl_setup.php:208 inventory/manage/item_categories.php:209
-#: inventory/manage/items.php:381
-msgid "Item Assembly Costs Account:"
+#: admin/gl_setup.php:254 inventory/manage/items.php:491
+msgid "WIP Account:"
+msgstr ""
+
+#: admin/gl_setup.php:258 sql/alter2.4rc1.php:34
+msgid "Fixed Assets Defaults"
+msgstr ""
+
+#: admin/gl_setup.php:260 sql/alter2.4rc1.php:35
+msgid "Loss On Asset Disposal Account:"
+msgstr ""
+
+#: admin/gl_setup.php:262
+msgid "Depreciation Period:"
 msgstr ""
 
-#: admin/gl_setup.php:212
+#: admin/gl_setup.php:262 gl/accruals.php:198
+#: gl/manage/gl_quick_entries.php:247 gl/includes/ui/gl_journal_ui.inc:69
+#: sales/create_recurrent_invoices.php:203
+#: sales/manage/recurrent_invoices.php:128
+msgid "Monthly"
+msgstr ""
+
+#: admin/gl_setup.php:262 gl/manage/gl_quick_entries.php:247
+#: gl/includes/ui/gl_journal_ui.inc:69
+msgid "Yearly"
+msgstr ""
+
+#: admin/gl_setup.php:266
 msgid "Manufacturing Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:214
+#: admin/gl_setup.php:268
 msgid "Work Order Required By After:"
 msgstr ""
 
@@ -1258,41 +1583,45 @@ msgstr ""
 msgid "Selected chart has been successfully deleted"
 msgstr ""
 
-#: admin/inst_chart.php:50
+#: admin/inst_chart.php:52
+msgid "No optional chart of accounts is currently available."
+msgstr ""
+
+#: admin/inst_chart.php:55
 msgid "Chart"
 msgstr ""
 
-#: admin/inst_chart.php:50 admin/inst_lang.php:36 admin/inst_module.php:105
-#: admin/inst_theme.php:74 admin/inst_upgrade.php:155
+#: admin/inst_chart.php:55 admin/inst_lang.php:36 admin/inst_module.php:105
+#: admin/inst_theme.php:55
 msgid "Installed"
 msgstr ""
 
-#: admin/inst_chart.php:50 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
+#: admin/inst_chart.php:55 admin/inst_lang.php:36 admin/inst_module.php:105
+#: admin/inst_theme.php:55 inventory/inquiry/stock_status.php:75
+#: reporting/rep303.php:113
 msgid "Available"
 msgstr ""
 
-#: admin/inst_chart.php:50 admin/inst_lang.php:35 admin/inst_lang.php:218
+#: admin/inst_chart.php:55 admin/inst_lang.php:35 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:128 admin/inst_module.php:129 admin/inst_theme.php:92
+#: admin/inst_chart.php:72 admin/inst_chart.php:74 admin/inst_lang.php:88
+#: admin/inst_module.php:126 admin/inst_module.php:127 admin/inst_theme.php:77
+#: includes/sysnames.inc:207
 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_theme.php:96
-#: admin/inst_upgrade.php:137
+#: admin/inst_chart.php:77 admin/inst_lang.php:103 admin/inst_module.php:131
+#: admin/inst_module.php:136 admin/inst_theme.php:81
 msgid "Install"
 msgstr ""
 
-#: admin/inst_chart.php:75 admin/inst_module.php:139 admin/inst_theme.php:97
+#: admin/inst_chart.php:78 admin/inst_module.php:137 admin/inst_theme.php:82
 msgid "Upload and install latest extension package"
 msgstr ""
 
-#: admin/inst_chart.php:82 admin/inst_module.php:146 admin/inst_theme.php:104
+#: admin/inst_chart.php:85 admin/inst_module.php:144 admin/inst_theme.php:89
 #, php-format
 msgid ""
 "You are about to remove package \\'%s\\'.\n"
@@ -1304,21 +1633,22 @@ msgid "Install/Update Languages"
 msgstr ""
 
 #: admin/inst_lang.php:35 admin/printers.php:84
-#: admin/shipping_companies.php:91 dimensions/dimension_entry.php:271
-#: dimensions/inquiry/search_dimensions.php:129
-#: dimensions/view/view_dimension.php:54
-#: inventory/manage/item_categories.php:98
+#: admin/shipping_companies.php:91 dimensions/dimension_entry.php:261
+#: dimensions/inquiry/search_dimensions.php:126
+#: dimensions/view/view_dimension.php:55 gl/gl_journal.php:548
+#: inventory/manage/item_categories.php:117
+#: inventory/manage/item_categories.php:121
 #: 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:109 reporting/rep709.php:110
-#: sales/manage/customer_branches.php:294 sales/manage/sales_people.php:99
+#: purchasing/includes/ui/invoice_ui.inc:278
+#: purchasing/includes/ui/invoice_ui.inc:280
+#: purchasing/includes/ui/invoice_ui.inc:282 reporting/rep501.php:87
+#: reporting/rep709.php:116 reporting/rep709.php:117
+#: sales/manage/customer_branches.php:284 sales/manage/sales_people.php:99
 #: taxes/item_tax_types.php:117
 msgid "Name"
 msgstr ""
 
-#: admin/inst_lang.php:35 admin/inst_lang.php:220
+#: admin/inst_lang.php:35 admin/inst_lang.php:222
 msgid "Right To Left"
 msgstr ""
 
@@ -1367,23 +1697,23 @@ 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 ""
 
@@ -1395,119 +1725,136 @@ msgstr ""
 msgid "Selected extension has been successfully deleted"
 msgstr ""
 
-#: admin/inst_module.php:104 admin/inst_module.php:169
+#: admin/inst_module.php:104 admin/inst_module.php:167
 msgid "Extension"
 msgstr ""
 
-#: admin/inst_module.php:104 admin/inst_module.php:169
+#: admin/inst_module.php:104 admin/inst_module.php:167
 msgid "Modules provided"
 msgstr ""
 
-#: admin/inst_module.php:104 admin/inst_module.php:169
+#: admin/inst_module.php:104 admin/inst_module.php:167
 msgid "Options provided"
 msgstr ""
 
-#: admin/inst_module.php:133
+#: admin/inst_module.php:131
 msgid "Install third-party extension."
 msgstr ""
 
-#: admin/inst_module.php:169 includes/ui/ui_lists.inc:648
-#: includes/ui/ui_lists.inc:2120 reporting/includes/excel_report.inc:232
-#: reporting/includes/pdf_report.inc:264
+#: admin/inst_module.php:167 includes/ui/ui_lists.inc:758
+#: includes/ui/ui_lists.inc:2348 includes/ui/ui_lists.inc.orig:758
+#: includes/ui/ui_lists.inc.orig:2345 reporting/includes/excel_report.inc:229
+#: reporting/includes/pdf_report.inc:265
 msgid "Active"
 msgstr ""
 
-#: admin/inst_module.php:232
+#: admin/inst_module.php:217
+#, php-format
+msgid ""
+"Package '%s' is incompatible with current application version and cannot be "
+"activated.\n"
+msgstr ""
+
+#: admin/inst_module.php:218
+#, php-format
+msgid "Check Install/Activate page for newer package version."
+msgstr ""
+
+#: admin/inst_module.php:234
 msgid "Status change for some extensions failed."
 msgstr ""
 
-#: admin/inst_module.php:235
+#: admin/inst_module.php:237
 msgid "Current active extensions set has been saved."
 msgstr ""
 
-#: admin/inst_module.php:257
+#: admin/inst_module.php:259
 msgid "Extensions:"
 msgstr ""
 
-#: admin/inst_theme.php:20
+#: admin/inst_module.php:267
+msgid "No optional extension module is currently available."
+msgstr ""
+
+#: admin/inst_theme.php:23
 msgid "Install Themes"
 msgstr ""
 
-#: admin/inst_theme.php:59
+#: admin/inst_theme.php:40
 msgid "Selected theme has been successfully deleted"
 msgstr ""
 
-#: admin/inst_theme.php:74
+#: admin/inst_theme.php:55
 msgid "Theme"
 msgstr ""
 
-#: admin/inst_upgrade.php:16
+#: admin/inst_theme.php:61
+msgid "No optional theme is currently available."
+msgstr ""
+
+#: admin/inst_upgrade.php:19
 msgid "Software Upgrade"
 msgstr ""
 
-#: admin/inst_upgrade.php:72
-#, php-format
-msgid "Database upgrade for company '%s' (%s:%s*) started..."
+#: admin/inst_upgrade.php:35
+msgid "Select company to be upgraded."
 msgstr ""
 
-#: admin/inst_upgrade.php:80
-msgid "Database upgrade finished."
+#: admin/inst_upgrade.php:43
+msgid "Company upgraded successfully."
 msgstr ""
 
-#: admin/inst_upgrade.php:84
-msgid ""
-"Upgrade cannot be done because database has been already partially upgraded. "
-"Please downgrade database to clean previous version or try forced upgrade."
+#: admin/inst_upgrade.php:63
+msgid "Table set"
 msgstr ""
 
-#: admin/inst_upgrade.php:102
-msgid "Cannot connect to database for company"
+#: admin/inst_upgrade.php:63
+msgid "Current version"
 msgstr ""
 
-#: admin/inst_upgrade.php:114
-#, php-format
-msgid "Database upgrade to version %s failed for company '%s'."
+#: admin/inst_upgrade.php:63
+msgid "Last log"
 msgstr ""
 
-#: admin/inst_upgrade.php:117
-msgid "You should restore company database from latest backup file"
+#: admin/inst_upgrade.php:63 admin/inst_upgrade.php:116
+msgid "Upgrade"
 msgstr ""
 
-#: admin/inst_upgrade.php:129
-msgid "All companies data has been successfully updated"
+#: admin/inst_upgrade.php:83
+msgid "View log"
 msgstr ""
 
-#: admin/inst_upgrade.php:137
-msgid "Sql file"
+#: admin/inst_upgrade.php:84
+msgid "Clear"
 msgstr ""
 
-#: admin/inst_upgrade.php:138
-msgid "Force upgrade"
+#: admin/inst_upgrade.php:84
+msgid "Clear log"
 msgstr ""
 
-#: admin/inst_upgrade.php:161
-#, php-format
-msgid "Partially installed (%s)"
+#: admin/inst_upgrade.php:85
+msgid "Do you really want to clear this upgrade log?"
 msgstr ""
 
-#: admin/inst_upgrade.php:170
-msgid ""
-"Database upgrades marked as partially installed cannot be installed "
-"automatically.\n"
-"You have to clean database manually to enable them, or try to perform forced "
-"upgrade."
+#: admin/inst_upgrade.php:95
+msgid "Up to date"
+msgstr ""
+
+#: admin/inst_upgrade.php:112
+msgid "All company database schemes are up to date."
 msgstr ""
 
-#: admin/inst_upgrade.php:174
-msgid "Upgrade system"
+#: admin/inst_upgrade.php:115
+msgid "Select company for incremental upgrade."
 msgstr ""
 
-#: admin/inst_upgrade.php:174
+#: admin/inst_upgrade.php:116
 msgid "Save database and perform upgrade"
 msgstr ""
 
-#: admin/payment_terms.php:16 reporting/includes/doctext.inc:58
-#: sales/view/view_invoice.php:74 sales/view/view_sales_order.php:78
+#: admin/payment_terms.php:16 reporting/includes/doctext.inc:40
+#: sales/view/view_invoice.php:76 sales/view/view_sales_order.php:82
+#: sales/view/view_sales_order.php:90
 msgid "Payment Terms"
 msgstr ""
 
@@ -1543,33 +1890,32 @@ msgstr ""
 msgid "Selected payment terms have been deleted"
 msgstr ""
 
-#: admin/payment_terms.php:127 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:70 gl/inquiry/gl_account_inquiry.php:125
-#: gl/inquiry/journal_inquiry.php:122 gl/inquiry/tax_inquiry.php:82
-#: gl/manage/bank_accounts.php:102 gl/manage/gl_quick_entries.php:186
-#: gl/view/accrual_trans.php:52 gl/includes/ui/gl_bank_ui.inc:80
-#: gl/includes/ui/gl_bank_ui.inc.orig:80 includes/ui/ui_view.inc:488
-#: inventory/inquiry/stock_movements.php:76
-#: inventory/manage/item_categories.php:98
-#: manufacturing/search_work_orders.php:161
-#: 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
-#: purchasing/inquiry/supplier_inquiry.php.orig:162 reporting/rep102.php:134
-#: reporting/rep202.php:137 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:105 reporting/rep710.php:76
-#: reporting/rep710.php:84 reporting/reports_main.php:251
-#: reporting/reports_main.php:398 reporting/includes/doctext.inc:44
-#: reporting/includes/doctext.inc:54
-#: sales/inquiry/customer_allocation_inquiry.php:141
-#: sales/inquiry/customer_inquiry.php:212
+#: admin/payment_terms.php:127 dimensions/dimension_entry.php:265
+#: dimensions/inquiry/search_dimensions.php:74
+#: dimensions/inquiry/search_dimensions.php:127
+#: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:230
+#: gl/inquiry/bank_inquiry.php:71 gl/inquiry/gl_account_inquiry.php:126
+#: gl/inquiry/journal_inquiry.php:108 gl/inquiry/tax_inquiry.php:80
+#: gl/manage/bank_accounts.php:109 gl/manage/gl_quick_entries.php:190
+#: gl/view/accrual_trans.php:52 gl/includes/ui/gl_bank_ui.inc:90
+#: includes/ui/ui_view.inc:546 inventory/inquiry/stock_movements.php:104
+#: inventory/manage/item_categories.php:121
+#: manufacturing/search_work_orders.php:159
+#: manufacturing/includes/manufacturing_ui.inc:253
+#: manufacturing/includes/manufacturing_ui.inc:291
+#: manufacturing/includes/manufacturing_ui.inc:295
+#: manufacturing/includes/manufacturing_ui.inc:346
+#: purchasing/inquiry/supplier_allocation_inquiry.php:136
+#: purchasing/inquiry/supplier_inquiry.php:173 reporting/rep102.php:130
+#: reporting/rep202.php:137 reporting/rep402.php:103 reporting/rep501.php:87
+#: reporting/rep601.php:79 reporting/rep602.php:80 reporting/rep702.php:60
+#: reporting/rep704.php:82 reporting/rep704.php:85 reporting/rep704.php:88
+#: reporting/rep709.php:112 reporting/rep710.php:78 reporting/rep710.php:86
+#: reporting/reports_main.php:354 reporting/reports_main.php:516
+#: reporting/includes/doctext.inc:161 reporting/includes/doctext.inc:202
+#: reporting/includes/doctext.inc:221
+#: sales/inquiry/customer_allocation_inquiry.php:146
+#: sales/inquiry/customer_inquiry.php:193
 msgid "Type"
 msgstr ""
 
@@ -1577,7 +1923,7 @@ msgstr ""
 msgid "Due After/Days"
 msgstr ""
 
-#: admin/payment_terms.php:140
+#: admin/payment_terms.php:140 admin/void_transaction.php:124
 msgid "N/A"
 msgstr ""
 
@@ -1643,10 +1989,6 @@ msgstr ""
 msgid "Host name or IP"
 msgstr ""
 
-#: admin/printers.php:135
-msgid "Port"
-msgstr ""
-
 #: admin/printers.php:137
 msgid "Timeout"
 msgstr ""
@@ -1659,67 +2001,67 @@ msgstr ""
 msgid "Default printing destination"
 msgstr ""
 
-#: admin/print_profiles.php:91
+#: admin/print_profiles.php:90
 msgid "Printing profile name cannot be empty."
 msgstr ""
 
-#: admin/print_profiles.php:107
+#: admin/print_profiles.php:106
 msgid "New printing profile has been created"
 msgstr ""
 
-#: admin/print_profiles.php:110
+#: admin/print_profiles.php:109
 msgid "Printing profile has been updated"
 msgstr ""
 
-#: admin/print_profiles.php:119
+#: admin/print_profiles.php:118
 msgid "Selected printing profile has been deleted"
 msgstr ""
 
-#: admin/print_profiles.php:130
+#: admin/print_profiles.php:129
 msgid "Select printing profile"
 msgstr ""
 
-#: admin/print_profiles.php:131
+#: admin/print_profiles.php:130
 msgid "New printing profile"
 msgstr ""
 
-#: admin/print_profiles.php:136 admin/print_profiles.php:138
+#: admin/print_profiles.php:135 admin/print_profiles.php:137
 msgid "Printing Profile Name"
 msgstr ""
 
-#: admin/print_profiles.php:148
+#: admin/print_profiles.php:147
 msgid "Report Id"
 msgstr ""
 
-#: admin/print_profiles.php:148
+#: admin/print_profiles.php:147
 msgid "Printer"
 msgstr ""
 
-#: admin/print_profiles.php:162
+#: admin/print_profiles.php:161
 msgid "Browser support"
 msgstr ""
 
-#: admin/print_profiles.php:169
+#: admin/print_profiles.php:168
 msgid "no title was found in this report definition file."
 msgstr ""
 
-#: admin/print_profiles.php:175
+#: admin/print_profiles.php:174
 msgid "Add New Profile"
 msgstr ""
 
-#: admin/print_profiles.php:177
+#: admin/print_profiles.php:176
 msgid "Update Profile"
 msgstr ""
 
-#: admin/print_profiles.php:178
+#: admin/print_profiles.php:177
 msgid "Update printer profile"
 msgstr ""
 
-#: admin/print_profiles.php:179
+#: admin/print_profiles.php:178
 msgid "Delete Profile"
 msgstr ""
 
-#: admin/print_profiles.php:180
+#: admin/print_profiles.php:179
 msgid "Delete printer profile (only if not used by any user)"
 msgstr ""
 
@@ -1757,75 +2099,76 @@ msgstr ""
 msgid "Security role has been sucessfully deleted."
 msgstr ""
 
-#: admin/security_roles.php:178
+#: admin/security_roles.php:175
 msgid "Role:"
 msgstr ""
 
-#: admin/security_roles.php:180 gl/manage/gl_accounts.php:199
-#: inventory/manage/items.php:253 purchasing/manage/suppliers.php:281
-#: sales/manage/customers.php:282
+#: admin/security_roles.php:177 gl/manage/gl_accounts.php:202
+#: inventory/inquiry/stock_movements.php:67 inventory/manage/items.php:564
+#: purchasing/manage/suppliers.php:294 sales/manage/customers.php:332
 msgid "Show inactive:"
 msgstr ""
 
-#: admin/security_roles.php:195
+#: admin/security_roles.php:192
 msgid "Role name:"
 msgstr ""
 
-#: admin/security_roles.php:196
+#: admin/security_roles.php:193
 msgid "Role description:"
 msgstr ""
 
-#: admin/security_roles.php:197
+#: admin/security_roles.php:194
 msgid "Current status:"
 msgstr ""
 
-#: admin/security_roles.php:221
+#: admin/security_roles.php:216
 msgid "On/off set of features"
 msgstr ""
 
-#: admin/security_roles.php:240 admin/security_roles.php:246
+#: admin/security_roles.php:235 admin/security_roles.php:241
 msgid "Update view"
 msgstr ""
 
-#: admin/security_roles.php:241
+#: admin/security_roles.php:236
 msgid "Insert New Role"
 msgstr ""
 
-#: admin/security_roles.php:245
+#: admin/security_roles.php:240
 msgid "Save Role"
 msgstr ""
 
-#: admin/security_roles.php:247
+#: admin/security_roles.php:242
 msgid "Clone This Role"
 msgstr ""
 
-#: admin/security_roles.php:248
+#: admin/security_roles.php:243
 msgid "Delete This Role"
 msgstr ""
 
-#: admin/security_roles.php:249 admin/void_transaction.php:223
-#: gl/manage/gl_quick_entries.php:61 gl/includes/ui/gl_bank_ui.inc:259
-#: gl/includes/ui/gl_bank_ui.inc.orig:259 gl/includes/ui/gl_journal_ui.inc:223
-#: includes/ui/simple_crud_class.inc:58 includes/ui/simple_crud_class.inc:231
-#: includes/ui/ui_controls.inc:587 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:133
-#: purchasing/includes/ui/po_ui.inc:444
-#: sales/includes/ui/sales_credit_ui.inc:295
-#: sales/includes/ui/sales_order_ui.inc:557
+#: admin/security_roles.php:244 admin/void_transaction.php:228
+#: gl/manage/gl_quick_entries.php:61 gl/includes/ui/gl_bank_ui.inc:269
+#: gl/includes/ui/gl_journal_ui.inc:269 includes/ui/class.crud_view.inc:292
+#: includes/ui/simple_crud_class.inc:58 includes/ui/simple_crud_class.inc:229
+#: includes/ui/ui_controls.inc:645 includes/ui/ui_input.inc:229
+#: inventory/includes/item_adjustments_ui.inc:192
+#: inventory/includes/stock_transfers_ui.inc:152
+#: inventory/manage/items.php:547
+#: manufacturing/includes/work_order_issue_ui.inc:134
+#: purchasing/includes/ui/po_ui.inc:438
+#: sales/create_recurrent_invoices.php:190
+#: sales/includes/ui/sales_credit_ui.inc:290
+#: sales/includes/ui/sales_order_ui.inc:549
 msgid "Cancel"
 msgstr ""
 
-#: admin/security_roles.php:249 inventory/manage/items.php:426
+#: admin/security_roles.php:244 inventory/manage/items.php:547
 msgid "Cancel Edition"
 msgstr ""
 
-#: admin/shipping_companies.php:15 reporting/includes/doctext.inc:32
-#: sales/customer_credit_invoice.php:256 sales/customer_delivery.php:365
-#: sales/customer_invoice.php:409 sales/view/view_credit.php:74
-#: sales/view/view_dispatch.php:92 sales/view/view_invoice.php:91
+#: admin/shipping_companies.php:15 sales/customer_credit_invoice.php:253
+#: sales/customer_delivery.php:356 sales/customer_invoice.php:470
+#: sales/view/view_credit.php:74 sales/view/view_dispatch.php:92
+#: sales/view/view_invoice.php:92
 msgid "Shipping Company"
 msgstr ""
 
@@ -1865,29 +2208,30 @@ msgstr ""
 msgid "Phone Number"
 msgstr ""
 
-#: admin/shipping_companies.php:91 inventory/manage/locations.php:146
+#: admin/shipping_companies.php:91 inventory/manage/locations.php:155
 msgid "Secondary Phone"
 msgstr ""
 
-#: admin/shipping_companies.php:91 inventory/manage/locations.php:146
-#: reporting/includes/doctext.inc:77
+#: admin/shipping_companies.php:91 inventory/manage/locations.php:155
+#: purchasing/inquiry/suppliers_list.php:53
+#: sales/inquiry/customers_list.php:54
 msgid "Address"
 msgstr ""
 
-#: admin/shipping_companies.php:134 gl/manage/gl_account_types.php:189
-#: gl/includes/ui/gl_bank_ui.inc:55 gl/includes/ui/gl_bank_ui.inc.orig:55
-#: inventory/manage/items.php:309 manufacturing/manage/work_centres.php:137
+#: admin/shipping_companies.php:134 gl/manage/gl_account_types.php:187
+#: gl/includes/ui/gl_bank_ui.inc:57 inventory/manage/items.php:366
+#: 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
+#: admin/shipping_companies.php:136 purchasing/manage/suppliers.php:134
+#: sales/manage/customer_branches.php:252
 msgid "Contact Person:"
 msgstr ""
 
-#: admin/shipping_companies.php:140 includes/ui/contacts_view.inc:103
-#: inventory/manage/locations.php:205 purchasing/manage/suppliers.php:106
-#: sales/manage/customer_branches.php:261
+#: admin/shipping_companies.php:140 includes/ui/contacts_view.inc:100
+#: inventory/manage/locations.php:215 purchasing/manage/suppliers.php:136
+#: sales/manage/customer_branches.php:254 sales/manage/customers.php:257
 msgid "Secondary Phone Number:"
 msgstr ""
 
@@ -1899,11 +2243,11 @@ msgstr ""
 msgid "Unspecified tag type"
 msgstr ""
 
-#: admin/tags.php:40 reporting/reports_main.php:272
-#: reporting/reports_main.php:280 reporting/reports_main.php:291
-#: reporting/reports_main.php:319 reporting/reports_main.php:326
-#: reporting/reports_main.php:336 reporting/reports_main.php:361
-#: reporting/reports_main.php:367 reporting/reports_main.php:376
+#: admin/tags.php:40 reporting/reports_main.php:375
+#: reporting/reports_main.php:384 reporting/reports_main.php:396
+#: reporting/reports_main.php:427 reporting/reports_main.php:435
+#: reporting/reports_main.php:446 reporting/reports_main.php:474
+#: reporting/reports_main.php:481 reporting/reports_main.php:491
 msgid "Account Tags"
 msgstr ""
 
@@ -1964,58 +2308,63 @@ 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 includes/ui/contacts_view.inc:41
+#: admin/users.php:123 admin/users.php:207 includes/ui/contacts_view.inc:40
 msgid "Full Name"
 msgstr ""
 
-#: admin/users.php:114 includes/ui/contacts_view.inc:41
-#: inventory/manage/locations.php:146 reporting/rep106.php:86
-#: reporting/includes/header2.inc:86 sales/manage/sales_people.php:99
+#: admin/users.php:123 includes/ui/contacts_view.inc:40
+#: inventory/manage/locations.php:155 reporting/rep106.php:94
+#: reporting/includes/header2.inc:100 sales/manage/sales_people.php:99
+#: sales/inquiry/customer_branches_list.php:49
 msgid "Phone"
 msgstr ""
 
-#: admin/users.php:115 sales/manage/customer_branches.php:300
-#: sales/view/view_sales_order.php:83
+#: admin/users.php:124 sales/manage/customer_branches.php:290
+#: 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 ""
 
@@ -2024,11 +2373,11 @@ msgid "View or Print Transactions"
 msgstr ""
 
 #: admin/view_print_transaction.php:43 admin/view_print_transaction.php:45
-#: admin/view_print_transaction.php:129 includes/ui/ui_controls.inc:188
-#: 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
+#: admin/view_print_transaction.php:129 includes/ui/ui_controls.inc:213
+#: purchasing/inquiry/po_search_completed.php:43
+#: purchasing/inquiry/po_search.php:94 sales/inquiry/customer_inquiry.php:97
+#: sales/inquiry/sales_deliveries_view.php:148
+#: sales/inquiry/sales_orders_view.php:102
 msgid "Print"
 msgstr ""
 
@@ -2036,27 +2385,29 @@ msgstr ""
 msgid "Only documents can be printed."
 msgstr ""
 
-#: admin/view_print_transaction.php:79 admin/void_transaction.php:160
+#: admin/view_print_transaction.php:79 admin/void_transaction.php:165
 msgid "from #:"
 msgstr ""
 
-#: admin/view_print_transaction.php:81 admin/void_transaction.php:162
+#: admin/view_print_transaction.php:81 admin/void_transaction.php:167
 msgid "to #:"
 msgstr ""
 
-#: admin/view_print_transaction.php:83 admin/void_transaction.php:164
-#: 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
+#: admin/view_print_transaction.php:83 admin/void_transaction.php:169
+#: dimensions/inquiry/search_dimensions.php:87 gl/inquiry/accounts_list.php:40
+#: gl/inquiry/journal_inquiry.php:58 inventory/inquiry/stock_list.php:42
+#: manufacturing/search_work_orders.php:84
+#: purchasing/includes/ui/invoice_ui.inc:483
+#: purchasing/inquiry/po_search_completed.php:99
+#: purchasing/inquiry/po_search.php:78
 #: purchasing/inquiry/supplier_allocation_inquiry.php:57
-#: purchasing/inquiry/supplier_inquiry.php:54
-#: purchasing/inquiry/supplier_inquiry.php.orig:54
+#: purchasing/inquiry/supplier_inquiry.php:147
+#: purchasing/inquiry/suppliers_list.php:42
 #: sales/inquiry/customer_allocation_inquiry.php:51
-#: sales/inquiry/customer_inquiry.php:54
+#: sales/inquiry/customer_branches_list.php:38
+#: sales/inquiry/customer_inquiry.php:164 sales/inquiry/customers_list.php:42
 #: sales/inquiry/sales_deliveries_view.php:116
-#: sales/inquiry/sales_orders_view.php:238
+#: sales/inquiry/sales_orders_view.php:236
 msgid "Search"
 msgstr ""
 
@@ -2072,92 +2423,50 @@ msgid ""
 "zero."
 msgstr ""
 
-#: admin/view_print_transaction.php:127 admin/void_transaction.php:176
+#: admin/view_print_transaction.php:128 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:70 gl/inquiry/journal_inquiry.php:124
-#: gl/view/bank_transfer_view.php:86 gl/view/gl_deposit_view.php:75
-#: gl/view/gl_payment_view.php:73 gl/view/gl_trans_view.php:35
-#: includes/ui/contacts_view.inc:41 inventory/inquiry/stock_movements.php:76
-#: inventory/view/view_adjustment.php:44 inventory/view/view_transfer.php:44
-#: manufacturing/search_work_orders.php:160
-#: manufacturing/view/wo_issue_view.php:43
-#: manufacturing/view/wo_production_view.php:44
-#: manufacturing/includes/manufacturing_ui.inc:157
-#: manufacturing/includes/manufacturing_ui.inc:200
-#: manufacturing/includes/manufacturing_ui.inc:276
-#: manufacturing/includes/manufacturing_ui.inc:280
-#: manufacturing/includes/manufacturing_ui.inc:331
-#: purchasing/includes/ui/grn_ui.inc:36 purchasing/includes/ui/grn_ui.inc:53
-#: purchasing/includes/ui/po_ui.inc:314 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/inquiry/supplier_inquiry.php.orig:164
-#: purchasing/allocations/supplier_allocation_main.php:96
-#: reporting/rep501.php:85 reporting/rep601.php:76 reporting/rep702.php:51
-#: reporting/includes/doctext.inc:47 sales/customer_credit_invoice.php:247
-#: sales/customer_credit_invoice.php:249 sales/customer_delivery.php:345
-#: sales/customer_delivery.php:347 sales/customer_invoice.php:388
-#: sales/customer_invoice.php:390
-#: 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:81
-#: sales/inquiry/customer_allocation_inquiry.php:143
-#: sales/inquiry/customer_inquiry.php:215
-#: sales/inquiry/sales_deliveries_view.php:184
-#: sales/includes/ui/sales_credit_ui.inc:85
-#: sales/includes/ui/sales_credit_ui.inc:87
-#: sales/includes/ui/sales_order_ui.inc:373
-msgid "Reference"
-msgstr ""
-
-#: admin/view_print_transaction.php:128 admin/void_transaction.php:177
-#: 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:70 gl/inquiry/gl_account_inquiry.php:125
-#: gl/inquiry/journal_inquiry.php:121 gl/view/accrual_trans.php:52
+#: dimensions/view/view_dimension.php:55 gl/accruals.php:104
+#: gl/accruals.php:211 gl/bank_account_reconcile.php:233
+#: gl/inquiry/bank_inquiry.php:71 gl/inquiry/gl_account_inquiry.php:126
+#: gl/inquiry/journal_inquiry.php:107 gl/view/accrual_trans.php:52
 #: gl/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:488
-#: inventory/inquiry/stock_movements.php:76
-#: inventory/view/view_adjustment.php:45 inventory/view/view_transfer.php:47
-#: manufacturing/search_work_orders.php:166
-#: manufacturing/work_order_entry.php:419
-#: manufacturing/work_order_entry.php:425
-#: manufacturing/view/wo_production_view.php:45
-#: manufacturing/includes/manufacturing_ui.inc:157
-#: manufacturing/includes/manufacturing_ui.inc:200
-#: manufacturing/includes/manufacturing_ui.inc:236
-#: manufacturing/includes/manufacturing_ui.inc:277
-#: manufacturing/includes/manufacturing_ui.inc:281
-#: manufacturing/includes/manufacturing_ui.inc:332
-#: purchasing/includes/ui/invoice_ui.inc:103
-#: purchasing/includes/ui/po_ui.inc:328 purchasing/view/view_po.php:140
-#: purchasing/inquiry/supplier_allocation_inquiry.php:130
-#: purchasing/inquiry/supplier_inquiry.php:167
-#: purchasing/inquiry/supplier_inquiry.php.orig:167
+#: gl/view/gl_payment_view.php:66 includes/dashboard.inc:486
+#: includes/dashboard.inc:571 includes/ui/allocation_cart.inc:290
+#: includes/ui/ui_view.inc:546 inventory/inquiry/stock_movements.php:109
+#: inventory/view/view_adjustment.php:44 inventory/view/view_transfer.php:37
+#: manufacturing/search_work_orders.php:164
+#: manufacturing/work_order_entry.php:399
+#: manufacturing/work_order_entry.php:405
+#: manufacturing/view/wo_costs_view.php:60
+#: manufacturing/view/wo_production_view.php:44
+#: manufacturing/includes/manufacturing_ui.inc:174
+#: manufacturing/includes/manufacturing_ui.inc:217
+#: manufacturing/includes/manufacturing_ui.inc:253
+#: manufacturing/includes/manufacturing_ui.inc:292
+#: manufacturing/includes/manufacturing_ui.inc:296
+#: manufacturing/includes/manufacturing_ui.inc:347
+#: purchasing/includes/ui/invoice_ui.inc:114
+#: purchasing/includes/ui/po_ui.inc:312 purchasing/view/view_po.php:140
+#: purchasing/inquiry/supplier_allocation_inquiry.php:141
+#: purchasing/inquiry/supplier_inquiry.php:178
 #: purchasing/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:109 reporting/rep710.php:75
-#: reporting/includes/doctext.inc:15 reporting/includes/doctext.inc:110
-#: reporting/includes/doctext.inc:118 sales/customer_delivery.php:375
-#: sales/customer_invoice.php:419
-#: sales/allocations/customer_allocation_main.php:96
-#: sales/view/view_credit.php:69 sales/view/view_sales_order.php:96
-#: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161
-#: sales/inquiry/customer_allocation_inquiry.php:145
-#: sales/inquiry/customer_inquiry.php:216
+#: reporting/rep101.php:132 reporting/rep107.php:203 reporting/rep201.php:107
+#: reporting/rep306.php:141 reporting/rep402.php:103 reporting/rep501.php:87
+#: reporting/rep601.php:79 reporting/rep602.php:80 reporting/rep704.php:82
+#: reporting/rep704.php:85 reporting/rep704.php:88 reporting/rep709.php:116
+#: reporting/rep710.php:77 reporting/includes/doctext.inc:166
+#: reporting/includes/doctext.inc:207 reporting/includes/doctext.inc:245
+#: reporting/includes/header2.inc:137 sales/customer_delivery.php:366
+#: sales/customer_invoice.php:485
+#: sales/allocations/customer_allocation_main.php:95
+#: sales/view/view_credit.php:69 sales/view/view_sales_order.php:109
+#: sales/view/view_sales_order.php:142 sales/view/view_sales_order.php:179
+#: sales/inquiry/customer_allocation_inquiry.php:150
+#: sales/inquiry/customer_inquiry.php:197
 msgid "Date"
 msgstr ""
 
-#: admin/view_print_transaction.php:130 admin/void_transaction.php:178
+#: admin/view_print_transaction.php:130 admin/void_transaction.php:183
 #: includes/ui/ui_view.inc:51
 msgid "GL"
 msgstr ""
@@ -2166,166 +2475,226 @@ msgstr ""
 msgid "Void a Transaction"
 msgstr ""
 
-#: admin/void_transaction.php:119 admin/void_transaction.php:179
-#: includes/ui/ui_input.inc:136 includes/ui/ui_input.inc:277
-#: includes/ui/ui_lists.inc:20
+#: admin/void_transaction.php:125 admin/void_transaction.php:184
+#: gl/inquiry/accounts_list.php:63 includes/ui/ui_input.inc:152
+#: includes/ui/ui_input.inc:300 includes/ui/ui_lists.inc:20
+#: includes/ui/ui_lists.inc.orig:20 inventory/inquiry/stock_list.php:66
+#: inventory/inquiry/stock_list.php:69
+#: purchasing/inquiry/suppliers_list.php:65
+#: purchasing/inquiry/suppliers_list.php:68
+#: sales/inquiry/customer_branches_list.php:60
+#: sales/inquiry/customers_list.php:66 sales/inquiry/customers_list.php:69
 msgid "Select"
 msgstr ""
 
-#: admin/void_transaction.php:198
+#: admin/void_transaction.php:156 includes/ui/class.reflines_crud.inc:90
+#: includes/ui/class.reflines_crud.inc:93
+msgid "Transaction Type:"
+msgstr ""
+
+#: admin/void_transaction.php:203
 msgid "Transaction #:"
 msgstr ""
 
-#: admin/void_transaction.php:200
+#: admin/void_transaction.php:205
 msgid "Voiding Date:"
 msgstr ""
 
-#: admin/void_transaction.php:202 dimensions/dimension_entry.php:283
-#: gl/bank_transfer.php:93 gl/inquiry/journal_inquiry.php:56
-#: gl/manage/revaluate_currencies.php:106 includes/ui/ui_view.inc:308
-#: manufacturing/work_order_add_finished.php:210
-#: manufacturing/work_order_entry.php:451
-#: manufacturing/work_order_release.php:100
-#: purchasing/includes/ui/invoice_ui.inc:161 purchasing/po_entry_items.php:511
-#: purchasing/supplier_payment.php:313
-#: purchasing/supplier_payment.php.orig:314 sales/customer_payments.php:292
-#: sales/customer_payments.php.orig:293
+#: admin/void_transaction.php:207 dimensions/dimension_entry.php:273
+#: gl/bank_transfer.php:137 gl/inquiry/journal_inquiry.php:53
+#: gl/manage/revaluate_currencies.php:96
+#: includes/ui/class.reflines_crud.inc:105 includes/ui/ui_view.inc:344
+#: manufacturing/work_order_add_finished.php:196
+#: manufacturing/work_order_costs.php:147
+#: manufacturing/work_order_entry.php:429
+#: manufacturing/work_order_release.php:102
+#: purchasing/includes/ui/invoice_ui.inc:193
+#: purchasing/includes/ui/po_ui.inc:465 purchasing/po_entry_items.php:486
+#: purchasing/supplier_payment.php:331 sales/customer_invoice.php:658
+#: sales/customer_payments.php:378
 msgid "Memo:"
 msgstr ""
 
-#: admin/void_transaction.php:207 admin/void_transaction.php:216
+#: admin/void_transaction.php:212 admin/void_transaction.php:221
 msgid "Void Transaction"
 msgstr ""
 
-#: admin/void_transaction.php:212 admin/void_transaction.php:291
+#: admin/void_transaction.php:217
 msgid "The entered transaction does not exist or cannot be voided."
 msgstr ""
 
-#: admin/void_transaction.php:220
+#: admin/void_transaction.php:225
 msgid ""
 "Are you sure you want to void this transaction ? This action cannot be "
 "undone."
 msgstr ""
 
-#: admin/void_transaction.php:222 includes/ui/ui_controls.inc:586
+#: admin/void_transaction.php:227 includes/ui/ui_controls.inc:644
 msgid "Proceed"
 msgstr ""
 
-#: admin/void_transaction.php:236
+#: admin/void_transaction.php:241
 msgid "The selected transaction was closed for edition and cannot be voided."
 msgstr ""
 
-#: admin/void_transaction.php:242 gl/accruals.php:32 gl/bank_transfer.php:110
-#: gl/gl_journal.php:156 gl/manage/exchange_rates.php:33
-#: gl/manage/revaluate_currencies.php:53
-#: manufacturing/work_order_add_finished.php:98
-#: manufacturing/work_order_costs.php:83 purchasing/po_receive_items.php:174
-#: purchasing/supplier_payment.php:178
-#: purchasing/supplier_payment.php.orig:175
-#: sales/customer_credit_invoice.php:91 sales/sales_order_entry.php:342
-#: sales/manage/recurrent_invoices.php:41
-#: sales/manage/recurrent_invoices.php:46
-#: sales/manage/recurrent_invoices.php:51
+#: admin/void_transaction.php:247 gl/accruals.php:42 gl/bank_transfer.php:159
+#: gl/gl_journal.php:217 gl/gl_journal.php:229 gl/gl_journal.php:235
+#: gl/gl_journal.php:256 gl/manage/close_period.php:34
+#: gl/manage/exchange_rates.php:33 gl/manage/revaluate_currencies.php:51
+#: manufacturing/work_order_add_finished.php:89
+#: manufacturing/work_order_costs.php:80 purchasing/po_receive_items.php:174
+#: purchasing/supplier_payment.php:194 sales/customer_credit_invoice.php:90
+#: sales/sales_order_entry.php:373 sales/manage/recurrent_invoices.php:60
+#: sales/manage/recurrent_invoices.php:66
+#: sales/manage/recurrent_invoices.php:71
 msgid "The entered date is invalid."
 msgstr ""
 
-#: admin/void_transaction.php:248 gl/accruals.php:38 gl/bank_transfer.php:116
-#: gl/gl_bank.php:266 gl/gl_journal.php:162
-#: gl/manage/revaluate_currencies.php:59 inventory/adjustments.php:116
-#: inventory/transfers.php:111 manufacturing/work_order_add_finished.php:104
-#: manufacturing/work_order_costs.php:89
-#: manufacturing/work_order_entry.php:160
-#: manufacturing/work_order_issue.php:85 purchasing/supplier_credit.php:176
-#: purchasing/supplier_invoice.php:174 purchasing/supplier_payment.php:184
-#: purchasing/supplier_payment.php.orig:181
-#: sales/create_recurrent_invoices.php:108 sales/credit_note_entry.php:161
-#: sales/customer_credit_invoice.php:95 sales/customer_payments.php:100
-#: sales/customer_payments.php.orig:100
-msgid "The entered date is not in fiscal year."
+#: admin/void_transaction.php:253 gl/accruals.php:48 gl/bank_transfer.php:165
+#: gl/gl_bank.php:261 gl/gl_journal.php:223 gl/gl_journal.php:262
+#: gl/manage/revaluate_currencies.php:57 inventory/adjustments.php:123
+#: inventory/transfers.php:115 manufacturing/work_order_add_finished.php:95
+#: manufacturing/work_order_costs.php:86
+#: manufacturing/work_order_entry.php:151
+#: manufacturing/work_order_issue.php:82 purchasing/po_entry_items.php:351
+#: purchasing/po_receive_items.php:179 purchasing/supplier_credit.php:186
+#: purchasing/supplier_invoice.php:195 purchasing/supplier_payment.php:200
+#: sales/create_recurrent_invoices.php:87
+#: sales/create_recurrent_invoices.php:166 sales/credit_note_entry.php:157
+#: sales/customer_credit_invoice.php:94 sales/customer_delivery.php:164
+#: sales/customer_invoice.php:302 sales/customer_payments.php:157
+#: sales/sales_order_entry.php:378
+msgid ""
+"The entered date is out of fiscal year or is closed for further data entry."
 msgstr ""
 
-#: admin/void_transaction.php:255
+#: admin/void_transaction.php:260
 msgid "The transaction number is expected to be numeric and greater than zero."
 msgstr ""
 
-#: admin/void_transaction.php:272
+#: admin/void_transaction.php:277
 msgid "The selected transaction has already been voided."
 msgstr ""
 
-#: admin/void_transaction.php:285
+#: admin/void_transaction.php:290
 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:137
 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:167 admin/db/fiscalyears_db.inc:168
+#: admin/db/fiscalyears_db.inc:169
 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:220 reporting/rep101.php:187
+#: reporting/rep201.php:162 reporting/rep706.php:185
 msgid "Open Balance"
 msgstr ""
 
-#: admin/db/maintenance_db.inc:150
+#: admin/db/maintenance_db.inc:154
 #, php-format
 msgid "Cannot open the extension setup file '%s' for writing."
 msgstr ""
 
-#: admin/db/maintenance_db.inc:158
+#: admin/db/maintenance_db.inc:162
 #, php-format
 msgid "Cannot write to the extensions setup file '%s'."
 msgstr ""
 
-#: admin/db/maintenance_db.inc:176
+#: admin/db/maintenance_db.inc:181
 msgid "Cannot update system extensions list."
 msgstr ""
 
-#: admin/db/maintenance_db.inc:194
+#: admin/db/maintenance_db.inc:199
 #, php-format
 msgid "Cannot update extensions list for company '%s'."
 msgstr ""
 
-#: admin/db/maintenance_db.inc:231
+#: admin/db/maintenance_db.inc:235
 msgid "Cannot open the languages file - "
 msgstr ""
 
-#: admin/db/maintenance_db.inc:238
+#: admin/db/maintenance_db.inc:242
 msgid "Cannot write to the language file - "
 msgstr ""
 
-#: admin/db/maintenance_db.inc:248
+#: admin/db/maintenance_db.inc:253
 msgid "The language files folder "
 msgstr ""
 
-#: admin/db/maintenance_db.inc:387
+#: admin/db/maintenance_db.inc:402
+msgid ""
+"This is new format backup file which cannot be restored on database not "
+"migrated to utf8."
+msgstr ""
+
+#: admin/db/maintenance_db.inc:486
 #, php-format
 msgid "SQL script execution failed in line %d: %s"
 msgstr ""
 
-#: admin/db/users_db.inc:197
+#: admin/db/users_db.inc:207
 msgid "user online"
 msgstr ""
 
-#: admin/db/users_db.inc:197
+#: admin/db/users_db.inc:207
 msgid "users online"
 msgstr ""
 
-#: admin/db/voiding_db.inc:111
-#: manufacturing/includes/db/work_orders_db.inc:446
-#: manufacturing/includes/db/work_orders_db.inc:462
-#: sales/includes/db/sales_invoice_db.inc:205
+#: admin/db/voiding_db.inc:23
+msgid "This transaction was already voided before."
+msgstr ""
+
+#: admin/db/voiding_db.inc:30
+#, php-format
+msgid ""
+"This transaction cannot be voided because it is part of Work Order %s costs."
+msgstr ""
+
+#: admin/db/voiding_db.inc:37 admin/db/voiding_db.inc:46
+msgid ""
+"This transaction cannot be voided because the operation would decrease "
+"account balance below allowed limit in some point of account history."
+msgstr ""
+
+#: admin/db/voiding_db.inc:49
+msgid "This invoice cannot be voided because it was already credited."
+msgstr ""
+
+#: admin/db/voiding_db.inc:58
+msgid "This delivery cannot be voided because it was already invoiced."
+msgstr ""
+
+#: admin/db/voiding_db.inc:76 admin/db/voiding_db.inc:119
+#: admin/db/voiding_db.inc:122
+msgid "This transaction type cannot be voided."
+msgstr ""
+
+#: admin/db/voiding_db.inc:81
+msgid "This GRN cannot be voided because it was already invoiced."
+msgstr ""
+
+#: admin/db/voiding_db.inc:83 admin/db/voiding_db.inc:92
+msgid "Error encountered when voiding transaction."
+msgstr ""
+
+#: admin/db/voiding_db.inc:105 admin/db/voiding_db.inc:113
+#, php-format
+msgid ""
+"Selected document cannot be voided because related Work Order %s is already "
+"closed."
+msgstr ""
+
+#: admin/db/voiding_db.inc:127 sales/includes/db/sales_invoice_db.inc:250
 msgid "Voided."
 msgstr ""
 
@@ -2334,8 +2703,9 @@ msgid "&Sales"
 msgstr ""
 
 #: applications/customers.php:18 applications/dimensions.php:21
-#: applications/generalledger.php:18 applications/inventory.php:18
-#: applications/manufacturing.php:18 applications/suppliers.php:18
+#: applications/fixed_assets.php:18 applications/generalledger.php:18
+#: applications/inventory.php:18 applications/manufacturing.php:18
+#: applications/suppliers.php:18
 msgid "Transactions"
 msgstr ""
 
@@ -2351,7 +2721,7 @@ msgstr ""
 msgid "Direct &Delivery"
 msgstr ""
 
-#: applications/customers.php:25 applications/suppliers.php:25
+#: applications/customers.php:25
 msgid "Direct &Invoice"
 msgstr ""
 
@@ -2380,75 +2750,80 @@ 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/dimensions.php:27
-#: applications/generalledger.php:34 applications/inventory.php:24
-#: applications/manufacturing.php:24 applications/suppliers.php:38
+#: applications/customers.php:49 applications/dimensions.php:27
+#: applications/fixed_assets.php:33 applications/generalledger.php:34
+#: applications/inventory.php:24 applications/manufacturing.php:24
+#: applications/suppliers.php:38
 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/dimensions.php:34
-#: applications/generalledger.php:55 applications/inventory.php:32
-#: applications/manufacturing.php:34 applications/setup.php:54
-#: applications/suppliers.php:50
+#: applications/customers.php:62 applications/dimensions.php:34
+#: applications/fixed_assets.php:43 applications/generalledger.php:55
+#: applications/inventory.php:32 applications/manufacturing.php:34
+#: applications/setup.php:54 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 ""
 
@@ -2476,6 +2851,58 @@ msgstr ""
 msgid "Dimension &Tags"
 msgstr ""
 
+#: applications/fixed_assets.php:16
+msgid "&Fixed Assets"
+msgstr ""
+
+#: applications/fixed_assets.php:19
+msgid "Fixed Assets &Purchase"
+msgstr ""
+
+#: applications/fixed_assets.php:21
+msgid "Fixed Assets Location &Transfers"
+msgstr ""
+
+#: applications/fixed_assets.php:23
+msgid "Fixed Assets &Disposal"
+msgstr ""
+
+#: applications/fixed_assets.php:25
+msgid "Fixed Assets &Sale"
+msgstr ""
+
+#: applications/fixed_assets.php:27
+msgid "Process &Depreciation"
+msgstr ""
+
+#: applications/fixed_assets.php:34
+msgid "Fixed Assets &Movements"
+msgstr ""
+
+#: applications/fixed_assets.php:36
+msgid "Fixed Assets In&quiry"
+msgstr ""
+
+#: applications/fixed_assets.php:40
+msgid "Fixed Assets &Reports"
+msgstr ""
+
+#: applications/fixed_assets.php:45
+msgid "Fixed &Assets"
+msgstr ""
+
+#: applications/fixed_assets.php:47
+msgid "Fixed Assets &Locations"
+msgstr ""
+
+#: applications/fixed_assets.php:49
+msgid "Fixed Assets &Categories"
+msgstr ""
+
+#: applications/fixed_assets.php:51
+msgid "Fixed Assets Cl&asses"
+msgstr ""
+
 #: applications/generalledger.php:16
 msgid "&Banking and General Ledger"
 msgstr ""
@@ -2524,8 +2951,8 @@ msgstr ""
 msgid "Ta&x Inquiry"
 msgstr ""
 
-#: applications/generalledger.php:44 reporting/reports_main.php:296
-#: reporting/reports_main.php:341 reporting/reports_main.php:381
+#: applications/generalledger.php:44 reporting/reports_main.php:402
+#: reporting/reports_main.php:452 reporting/reports_main.php:497
 msgid "Trial &Balance"
 msgstr ""
 
@@ -2577,7 +3004,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 ""
 
@@ -2626,30 +3057,26 @@ msgid "Inventory &Locations"
 msgstr ""
 
 #: applications/inventory.php:43
-msgid "Inventory &Movement Types"
-msgstr ""
-
-#: applications/inventory.php:45
 msgid "&Units of Measure"
 msgstr ""
 
-#: applications/inventory.php:47
+#: applications/inventory.php:45 inventory/manage/items.php:593
 msgid "&Reorder Levels"
 msgstr ""
 
-#: applications/inventory.php:50
+#: applications/inventory.php:48
 msgid "Pricing and Costs"
 msgstr ""
 
-#: applications/inventory.php:51
+#: applications/inventory.php:49
 msgid "Sales &Pricing"
 msgstr ""
 
-#: applications/inventory.php:53
+#: applications/inventory.php:51
 msgid "Purchasing &Pricing"
 msgstr ""
 
-#: applications/inventory.php:55
+#: applications/inventory.php:53 inventory/manage/items.php:592
 msgid "Standard &Costs"
 msgstr ""
 
@@ -2657,7 +3084,7 @@ msgstr ""
 msgid "&Manufacturing"
 msgstr ""
 
-#: applications/manufacturing.php:19 sales/sales_order_entry.php:112
+#: applications/manufacturing.php:19 sales/sales_order_entry.php:136
 msgid "Work &Order Entry"
 msgstr ""
 
@@ -2711,7 +3138,7 @@ msgid "&Display Setup"
 msgstr ""
 
 #: applications/setup.php:27
-msgid "&Forms Setup"
+msgid "Transaction &References"
 msgstr ""
 
 #: applications/setup.php:29
@@ -2818,6 +3245,10 @@ msgstr ""
 msgid "Direct &GRN"
 msgstr ""
 
+#: applications/suppliers.php:25
+msgid "Direct Supplier &Invoice"
+msgstr ""
+
 #: applications/suppliers.php:28
 msgid "&Payments to Suppliers"
 msgstr ""
@@ -2842,153 +3273,138 @@ 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 ""
 
-#: dimensions/dimension_entry.php:27
+#: dimensions/dimension_entry.php:26
 msgid "Dimension Entry"
 msgstr ""
 
-#: dimensions/dimension_entry.php:47
+#: dimensions/dimension_entry.php:46
 msgid "The dimension has been entered."
 msgstr ""
 
-#: dimensions/dimension_entry.php:58
+#: dimensions/dimension_entry.php:57
 msgid "The dimension has been updated."
 msgstr ""
 
-#: dimensions/dimension_entry.php:68
+#: dimensions/dimension_entry.php:67
 msgid "The dimension has been deleted."
 msgstr ""
 
-#: dimensions/dimension_entry.php:78
+#: dimensions/dimension_entry.php:77
 msgid "The dimension has been closed. There can be no more changes to it."
 msgstr ""
 
-#: dimensions/dimension_entry.php:88
+#: dimensions/dimension_entry.php:87
 msgid "The dimension has been re-opened. "
 msgstr ""
 
-#: dimensions/dimension_entry.php:98
+#: dimensions/dimension_entry.php:97
 msgid "Enter a &new dimension"
 msgstr ""
 
-#: dimensions/dimension_entry.php:100
+#: dimensions/dimension_entry.php:99
 msgid "&Select an existing dimension"
 msgstr ""
 
-#: dimensions/dimension_entry.php:116
-msgid "The dimension reference must be entered."
-msgstr ""
-
-#: dimensions/dimension_entry.php:123 gl/bank_transfer.php:171
-#: gl/gl_bank.php:254 gl/gl_journal.php:176
-#: gl/manage/revaluate_currencies.php:72 inventory/adjustments.php:103
-#: inventory/transfers.php:99 manufacturing/work_order_add_finished.php:84
-#: manufacturing/work_order_entry.php:139
-#: manufacturing/work_order_issue.php:98 purchasing/po_entry_items.php:363
-#: purchasing/po_receive_items.php:195 purchasing/supplier_credit.php:156
-#: purchasing/supplier_invoice.php:154 purchasing/supplier_payment.php:207
-#: purchasing/supplier_payment.php.orig:204 sales/credit_note_entry.php:151
-#: sales/customer_credit_invoice.php:108 sales/customer_delivery.php:169
-#: sales/customer_invoice.php:282 sales/customer_payments.php:112
-#: sales/customer_payments.php.orig:112 sales/sales_order_entry.php:411
-msgid "The entered reference is already in use."
-msgstr ""
-
-#: dimensions/dimension_entry.php:131
+#: dimensions/dimension_entry.php:121
 msgid "The dimension name must be entered."
 msgstr ""
 
-#: dimensions/dimension_entry.php:138 manufacturing/work_order_entry.php:154
-#: manufacturing/work_order_entry.php:234 purchasing/po_entry_items.php:235
+#: dimensions/dimension_entry.php:128 manufacturing/work_order_entry.php:145
+#: manufacturing/work_order_entry.php:223 purchasing/po_entry_items.php:250
 msgid "The date entered is in an invalid format."
 msgstr ""
 
-#: dimensions/dimension_entry.php:145
+#: dimensions/dimension_entry.php:135
 msgid "The required by date entered is in an invalid format."
 msgstr ""
 
-#: dimensions/dimension_entry.php:190
+#: dimensions/dimension_entry.php:180
 msgid "This dimension cannot be deleted because it has already been processed."
 msgstr ""
 
-#: dimensions/dimension_entry.php:234
+#: dimensions/dimension_entry.php:224
 msgid "The dimension sent is not valid."
 msgstr ""
 
-#: dimensions/dimension_entry.php:261 dimensions/dimension_entry.php:268
+#: dimensions/dimension_entry.php:251 dimensions/dimension_entry.php:258
 msgid "Dimension Reference:"
 msgstr ""
 
-#: dimensions/dimension_entry.php:277 reporting/reports_main.php:34
-#: reporting/reports_main.php:60 reporting/reports_main.php:74
-#: reporting/reports_main.php:82 reporting/reports_main.php:134
-#: reporting/reports_main.php:198 reporting/reports_main.php:206
-#: reporting/reports_main.php:238 reporting/reports_main.php:249
-#: reporting/reports_main.php:260 reporting/reports_main.php:276
-#: reporting/reports_main.php:286 reporting/reports_main.php:297
-#: reporting/reports_main.php:309 reporting/reports_main.php:323
-#: reporting/reports_main.php:332 reporting/reports_main.php:342
-#: reporting/reports_main.php:353 reporting/reports_main.php:365
-#: reporting/reports_main.php:373 reporting/reports_main.php:382
-#: reporting/reports_main.php:390 reporting/reports_main.php:396
+#: dimensions/dimension_entry.php:267 reporting/reports_main.php:36
+#: reporting/reports_main.php:66 reporting/reports_main.php:82
+#: reporting/reports_main.php:91 reporting/reports_main.php:153
+#: reporting/reports_main.php:235 reporting/reports_main.php:245
+#: reporting/reports_main.php:251 reporting/reports_main.php:261
+#: reporting/reports_main.php:269 reporting/reports_main.php:277
+#: reporting/reports_main.php:332 reporting/reports_main.php:340
+#: reporting/reports_main.php:352 reporting/reports_main.php:362
+#: reporting/reports_main.php:380 reporting/reports_main.php:391
+#: reporting/reports_main.php:403 reporting/reports_main.php:416
+#: reporting/reports_main.php:432 reporting/reports_main.php:442
+#: reporting/reports_main.php:453 reporting/reports_main.php:465
+#: reporting/reports_main.php:479 reporting/reports_main.php:488
+#: reporting/reports_main.php:498 reporting/reports_main.php:507
+#: reporting/reports_main.php:514
 msgid "Start Date"
 msgstr ""
 
-#: dimensions/dimension_entry.php:279 manufacturing/work_order_entry.php:420
+#: dimensions/dimension_entry.php:269 manufacturing/work_order_entry.php:400
 msgid "Date Required By"
 msgstr ""
 
-#: dimensions/dimension_entry.php:281
+#: dimensions/dimension_entry.php:271
 msgid "Tags:"
 msgstr ""
 
-#: dimensions/dimension_entry.php:288
+#: dimensions/dimension_entry.php:278
 msgid "This Dimension is closed."
 msgstr ""
 
-#: dimensions/dimension_entry.php:293
+#: dimensions/dimension_entry.php:283
 msgid "Save changes to dimension"
 msgstr ""
 
-#: dimensions/dimension_entry.php:295
+#: dimensions/dimension_entry.php:285
 msgid "Re-open This Dimension"
 msgstr ""
 
-#: dimensions/dimension_entry.php:295
+#: dimensions/dimension_entry.php:285
 msgid "Mark this dimension as re-opened"
 msgstr ""
 
-#: dimensions/dimension_entry.php:297
+#: dimensions/dimension_entry.php:287
 msgid "Close This Dimension"
 msgstr ""
 
-#: dimensions/dimension_entry.php:297
+#: dimensions/dimension_entry.php:287
 msgid "Mark this dimension as closed"
 msgstr ""
 
-#: dimensions/dimension_entry.php:298
+#: dimensions/dimension_entry.php:288
 msgid "Delete This Dimension"
 msgstr ""
 
-#: dimensions/dimension_entry.php:298
+#: dimensions/dimension_entry.php:288
 msgid "Delete unused dimension"
 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
+#: dimensions/dimension_entry.php:292 includes/ui/class.crud_view.inc:296
+#: includes/ui/simple_crud_class.inc:223
+#: purchasing/includes/ui/invoice_ui.inc:219
+#: purchasing/includes/ui/invoice_ui.inc:421
+#: purchasing/includes/ui/invoice_ui.inc:423
 msgid "Add"
 msgstr ""
 
@@ -3000,62 +3416,66 @@ msgstr ""
 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:170
-#: 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:109
-#: reporting/rep705.php:234 reporting/rep706.php:181 reporting/rep707.php:206
-#: reporting/rep708.php:178
+#: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:104
+#: gl/inquiry/gl_account_inquiry.php:129 gl/inquiry/gl_trial_balance.php:215
+#: gl/manage/gl_quick_entries.php:248 gl/manage/gl_quick_entries.php:342
+#: includes/dashboard.inc:606 includes/sysnames.inc:179
+#: purchasing/includes/ui/invoice_ui.inc:278
+#: purchasing/includes/ui/invoice_ui.inc:280
+#: purchasing/includes/ui/invoice_ui.inc:282 reporting/rep701.php:110
+#: reporting/rep705.php:235 reporting/rep706.php:185 reporting/rep707.php:210
+#: reporting/rep708.php:192
 msgid "Account"
 msgstr ""
 
-#: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:98
-#: gl/bank_account_reconcile.php:237 gl/inquiry/bank_inquiry.php:71
-#: gl/inquiry/gl_account_inquiry.php:140 gl/inquiry/gl_account_inquiry.php:142
-#: gl/inquiry/gl_trial_balance.php:176 gl/inquiry/gl_trial_balance.php:178
-#: gl/inquiry/gl_trial_balance.php:180 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/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
-#: purchasing/inquiry/supplier_inquiry.php.orig:170 reporting/rep601.php:77
-#: reporting/rep702.php:52 reporting/rep704.php:79 reporting/rep704.php:82
-#: reporting/rep704.php:85 reporting/rep708.php:178 reporting/rep708.php:179
-#: sales/inquiry/customer_allocation_inquiry.php:149
-#: sales/inquiry/customer_inquiry.php:221
+#: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:112
+#: gl/bank_account_reconcile.php:234 gl/inquiry/bank_inquiry.php:72
+#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
+#: gl/inquiry/gl_trial_balance.php:221 gl/inquiry/gl_trial_balance.php:223
+#: gl/inquiry/gl_trial_balance.php:225 gl/view/accrual_trans.php:60
+#: gl/view/gl_trans_view.php:96 gl/view/gl_trans_view.php:99
+#: gl/view/gl_trans_view.php:102 gl/includes/ui/gl_journal_ui.inc:103
+#: gl/includes/ui/gl_journal_ui.inc:106 gl/includes/ui/gl_journal_ui.inc:109
+#: manufacturing/view/wo_costs_view.php:61
+#: purchasing/inquiry/supplier_allocation_inquiry.php:144
+#: reporting/rep601.php:80 reporting/rep602.php:81 reporting/rep702.php:54
+#: reporting/rep704.php:83 reporting/rep704.php:86 reporting/rep704.php:89
+#: reporting/rep708.php:192 reporting/rep708.php:193
+#: sales/inquiry/customer_allocation_inquiry.php:154
 msgid "Debit"
 msgstr ""
 
-#: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:98
-#: gl/bank_account_reconcile.php:238 gl/inquiry/bank_inquiry.php:71
-#: gl/inquiry/gl_account_inquiry.php:140 gl/inquiry/gl_account_inquiry.php:142
-#: gl/inquiry/gl_trial_balance.php:177 gl/inquiry/gl_trial_balance.php:179
-#: gl/inquiry/gl_trial_balance.php:181 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/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90
-#: includes/sysnames.inc:85
-#: purchasing/inquiry/supplier_allocation_inquiry.php:134
-#: purchasing/inquiry/supplier_inquiry.php:171
-#: purchasing/inquiry/supplier_inquiry.php.orig:171 reporting/rep601.php:77
-#: reporting/rep702.php:52 reporting/rep704.php:79 reporting/rep704.php:82
-#: reporting/rep704.php:85 reporting/rep708.php:178 reporting/rep708.php:179
-#: sales/inquiry/customer_allocation_inquiry.php:150
-#: sales/inquiry/customer_inquiry.php:222
+#: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:112
+#: gl/bank_account_reconcile.php:235 gl/inquiry/bank_inquiry.php:72
+#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
+#: gl/inquiry/gl_trial_balance.php:222 gl/inquiry/gl_trial_balance.php:224
+#: gl/inquiry/gl_trial_balance.php:226 gl/view/accrual_trans.php:60
+#: gl/view/gl_trans_view.php:96 gl/view/gl_trans_view.php:99
+#: gl/view/gl_trans_view.php:102 gl/includes/ui/gl_journal_ui.inc:103
+#: gl/includes/ui/gl_journal_ui.inc:106 gl/includes/ui/gl_journal_ui.inc:109
+#: includes/sysnames.inc:90 manufacturing/view/wo_costs_view.php:61
+#: purchasing/inquiry/supplier_allocation_inquiry.php:145
+#: reporting/rep601.php:80 reporting/rep602.php:81 reporting/rep702.php:54
+#: reporting/rep704.php:83 reporting/rep704.php:86 reporting/rep704.php:89
+#: reporting/rep708.php:192 reporting/rep708.php:193
+#: sales/inquiry/customer_allocation_inquiry.php:155
 msgid "Credit"
 msgstr ""
 
 #: dimensions/includes/dimensions_ui.inc:45
-#: dimensions/inquiry/search_dimensions.php:134 gl/inquiry/bank_inquiry.php:71
-#: gl/inquiry/gl_account_inquiry.php:140 gl/inquiry/gl_trial_balance.php:174
-#: purchasing/inquiry/supplier_allocation_inquiry.php:136
-#: reporting/rep203.php:92 reporting/rep204.php:82 reporting/rep601.php:77
-#: reporting/rep701.php:109 reporting/rep704.php:79 reporting/rep704.php:82
-#: reporting/rep704.php:85 reporting/rep708.php:171
-#: sales/inquiry/customer_allocation_inquiry.php:152
+#: dimensions/inquiry/search_dimensions.php:131 gl/inquiry/bank_inquiry.php:72
+#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_trial_balance.php:219
+#: includes/dashboard.inc:606
+#: purchasing/inquiry/supplier_allocation_inquiry.php:147
+#: purchasing/inquiry/supplier_inquiry.php:182
+#: purchasing/inquiry/supplier_inquiry.php:195 reporting/rep101.php:136
+#: reporting/rep201.php:111 reporting/rep203.php:89 reporting/rep204.php:84
+#: reporting/rep307.php:114 reporting/rep601.php:80 reporting/rep602.php:81
+#: reporting/rep701.php:110 reporting/rep704.php:83 reporting/rep704.php:86
+#: reporting/rep704.php:89 reporting/rep708.php:185
+#: sales/inquiry/customer_allocation_inquiry.php:157
+#: sales/inquiry/customer_inquiry.php:203
+#: sales/inquiry/customer_inquiry.php:216
 msgid "Balance"
 msgstr ""
 
@@ -3067,92 +3487,92 @@ msgstr ""
 msgid "Search Dimensions"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:73 gl/bank_transfer.php:91
-#: gl/inquiry/journal_inquiry.php:45 gl/manage/revaluate_currencies.php:105
-#: gl/includes/ui/gl_bank_ui.inc:25 gl/includes/ui/gl_bank_ui.inc.orig:25
-#: 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_entry.php:378
-#: manufacturing/work_order_entry.php:385
-#: manufacturing/includes/work_order_issue_ui.inc:156
-#: 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:285
-#: purchasing/supplier_payment.php.orig:287 sales/customer_payments.php:258
-#: sales/customer_payments.php.orig:260
+#: dimensions/inquiry/search_dimensions.php:72 gl/bank_transfer.php:117
+#: gl/inquiry/journal_inquiry.php:45 gl/manage/revaluate_currencies.php:95
+#: gl/includes/ui/gl_bank_ui.inc:26 gl/includes/ui/gl_journal_ui.inc:51
+#: includes/ui/contacts_view.inc:91
+#: inventory/includes/item_adjustments_ui.inc:39
+#: inventory/includes/stock_transfers_ui.inc:42
+#: manufacturing/search_work_orders.php:68
+#: manufacturing/work_order_add_finished.php:185
+#: manufacturing/work_order_costs.php:134
+#: manufacturing/work_order_entry.php:357
+#: manufacturing/work_order_entry.php:365
+#: manufacturing/includes/work_order_issue_ui.inc:161
+#: purchasing/includes/ui/invoice_ui.inc:116
+#: purchasing/includes/ui/po_ui.inc:156 purchasing/includes/ui/po_ui.inc:161
+#: purchasing/supplier_payment.php:302 sales/customer_payments.php:347
 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:96 reporting/rep104.php:95
-#: reporting/rep104.php:99 reporting/rep105.php:93 reporting/rep105.php:97
-#: reporting/rep201.php:100 reporting/rep202.php:98 reporting/rep203.php:72
-#: reporting/rep204.php:75 reporting/rep301.php:87 reporting/rep301.php:94
-#: reporting/rep302.php:103 reporting/rep302.php:110 reporting/rep303.php:84
-#: reporting/rep303.php:91 reporting/rep304.php:96 reporting/rep304.php:103
-#: reporting/rep304.php:108 reporting/rep702.php:59 reporting/rep710.php:84
-#: reporting/rep710.php:85
+#: dimensions/inquiry/search_dimensions.php:74
+#: includes/ui/allocation_cart.inc:314 includes/ui/ui_lists.inc:2118
+#: includes/ui/ui_lists.inc.orig:2115 reporting/rep101.php:114
+#: reporting/rep102.php:92 reporting/rep104.php:95 reporting/rep104.php:99
+#: reporting/rep105.php:95 reporting/rep105.php:99 reporting/rep201.php:89
+#: reporting/rep202.php:98 reporting/rep203.php:69 reporting/rep204.php:77
+#: reporting/rep301.php:151 reporting/rep301.php:158 reporting/rep302.php:103
+#: reporting/rep302.php:110 reporting/rep303.php:95 reporting/rep303.php:102
+#: reporting/rep304.php:109 reporting/rep304.php:114 reporting/rep304.php:119
+#: reporting/rep306.php:120 reporting/rep306.php:125 reporting/rep306.php:130
+#: reporting/rep306.php:135 reporting/rep307.php:103 reporting/rep307.php:108
+#: reporting/rep308.php:212 reporting/rep308.php:217 reporting/rep309.php:93
+#: reporting/rep402.php:87 reporting/rep402.php:95 reporting/rep451.php:67
+#: reporting/rep451.php:74 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:49
-#: gl/inquiry/gl_trial_balance.php:49 gl/inquiry/journal_inquiry.php:48
-#: gl/inquiry/profit_loss.php:163 gl/includes/ui/gl_bank_ui.inc:50
-#: gl/includes/ui/gl_bank_ui.inc:105 gl/includes/ui/gl_bank_ui.inc.orig:50
-#: gl/includes/ui/gl_bank_ui.inc.orig:105
-#: inventory/inquiry/stock_movements.php:58
+#: dimensions/inquiry/search_dimensions.php:75 gl/inquiry/bank_inquiry.php:50
+#: gl/inquiry/gl_trial_balance.php:55 gl/inquiry/journal_inquiry.php:48
+#: gl/inquiry/profit_loss.php:175 gl/includes/ui/gl_bank_ui.inc:52
+#: gl/includes/ui/gl_bank_ui.inc:114 inventory/inquiry/stock_movements.php:85
 #: purchasing/inquiry/supplier_allocation_inquiry.php:50
-#: purchasing/inquiry/supplier_inquiry.php:49
-#: purchasing/inquiry/supplier_inquiry.php.orig:49
-#: sales/inquiry/customer_inquiry.php:46
+#: purchasing/inquiry/supplier_inquiry.php:143
+#: sales/inquiry/customer_inquiry.php:160
 msgid "From:"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:77 gl/inquiry/bank_inquiry.php:50
-#: gl/inquiry/gl_trial_balance.php:50 gl/inquiry/journal_inquiry.php:49
-#: gl/inquiry/profit_loss.php:164 gl/includes/ui/gl_bank_ui.inc:105
-#: gl/includes/ui/gl_bank_ui.inc.orig:105
-#: inventory/inquiry/stock_movements.php:59
+#: dimensions/inquiry/search_dimensions.php:76 gl/inquiry/bank_inquiry.php:51
+#: gl/inquiry/gl_trial_balance.php:56 gl/inquiry/journal_inquiry.php:49
+#: gl/inquiry/profit_loss.php:176 inventory/inquiry/stock_movements.php:86
 #: purchasing/inquiry/supplier_allocation_inquiry.php:51
-#: purchasing/inquiry/supplier_inquiry.php:50
-#: purchasing/inquiry/supplier_inquiry.php.orig:50
-#: sales/inquiry/customer_inquiry.php:47
+#: purchasing/inquiry/supplier_inquiry.php:144
+#: sales/inquiry/customer_inquiry.php:161
 msgid "To:"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:79
-#: manufacturing/search_work_orders.php:71
+#: dimensions/inquiry/search_dimensions.php:78
+#: manufacturing/search_work_orders.php:77
 msgid "Only Overdue:"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:83
-#: manufacturing/search_work_orders.php:74
+#: dimensions/inquiry/search_dimensions.php:82
+#: manufacturing/search_work_orders.php:80
 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/inquiry/search_dimensions.php:129
+#: dimensions/view/view_dimension.php:55 includes/dashboard.inc:486
+#: includes/dashboard.inc:571 includes/ui/allocation_cart.inc:290
+#: purchasing/includes/ui/invoice_ui.inc:135
 #: purchasing/view/view_supp_credit.php:48
-#: purchasing/view/view_supp_invoice.php:51
-#: purchasing/inquiry/supplier_allocation_inquiry.php:131
-#: purchasing/inquiry/supplier_inquiry.php:168
-#: purchasing/inquiry/supplier_inquiry.php.orig:168 reporting/rep101.php:130
-#: reporting/rep201.php:118 reporting/rep203.php:91 reporting/rep501.php:85
-#: reporting/includes/doctext.inc:40 reporting/includes/doctext.inc:110
-#: sales/customer_invoice.php:426 sales/view/view_dispatch.php:97
+#: purchasing/view/view_supp_invoice.php:52
+#: purchasing/inquiry/supplier_allocation_inquiry.php:142
+#: purchasing/inquiry/supplier_inquiry.php:179 reporting/rep101.php:132
+#: reporting/rep201.php:107 reporting/rep203.php:88 reporting/rep501.php:87
+#: reporting/includes/doctext.inc:111 reporting/includes/doctext.inc:143
+#: reporting/includes/doctext.inc:164 reporting/includes/doctext.inc:166
+#: reporting/includes/doctext.inc:205 reporting/includes/doctext.inc:207
+#: sales/customer_invoice.php:492 sales/view/view_dispatch.php:97
 #: sales/view/view_invoice.php:96
-#: sales/inquiry/customer_allocation_inquiry.php:146
-#: sales/inquiry/customer_inquiry.php:217
-#: sales/includes/ui/sales_order_ui.inc:595
+#: sales/inquiry/customer_allocation_inquiry.php:151
+#: sales/inquiry/customer_inquiry.php:198
+#: sales/includes/ui/sales_order_ui.inc:588
 msgid "Due Date"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:143
+#: dimensions/inquiry/search_dimensions.php:140
 msgid "Marked dimensions are overdue."
 msgstr ""
 
@@ -3160,498 +3580,536 @@ 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
-#: gl/inquiry/tax_inquiry.php:61 purchasing/inquiry/po_search_completed.php:62
+#: dimensions/view/view_dimension.php:85 gl/inquiry/gl_account_inquiry.php:71
+#: gl/inquiry/tax_inquiry.php:61 purchasing/inquiry/po_search_completed.php:82
 #: 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_deliveries_view.php:102
+#: sales/inquiry/sales_orders_view.php:217
 msgid "from:"
 msgstr ""
 
-#: dimensions/view/view_dimension.php:85 gl/inquiry/gl_account_inquiry.php:71
-#: gl/inquiry/tax_inquiry.php:62 purchasing/inquiry/po_search_completed.php:63
+#: dimensions/view/view_dimension.php:86 gl/inquiry/gl_account_inquiry.php:72
+#: gl/inquiry/tax_inquiry.php:62 purchasing/inquiry/po_search_completed.php:83
 #: 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_deliveries_view.php:103
+#: sales/inquiry/sales_orders_view.php:218
 msgid "to:"
 msgstr ""
 
-#: dimensions/view/view_dimension.php:86 gl/inquiry/balance_sheet.php:131
-#: gl/inquiry/bank_inquiry.php:52 gl/inquiry/gl_account_inquiry.php:84
-#: gl/inquiry/gl_trial_balance.php:58 gl/inquiry/profit_loss.php:178
+#: dimensions/view/view_dimension.php:87 gl/inquiry/balance_sheet.php:130
+#: gl/inquiry/bank_inquiry.php:53 gl/inquiry/gl_account_inquiry.php:85
+#: gl/inquiry/gl_trial_balance.php:63 gl/inquiry/profit_loss.php:188
 #: gl/inquiry/tax_inquiry.php:63
 msgid "Show"
 msgstr ""
 
-#: gl/accruals.php:20 includes/access_levels.inc:243
+#: gl/accruals.php:30 includes/access_levels.inc:266
 msgid "Revenue / Cost Accruals"
 msgstr ""
 
-#: gl/accruals.php:44
+#: gl/accruals.php:54
 msgid "The amount can not be 0."
 msgstr ""
 
-#: gl/accruals.php:50
+#: gl/accruals.php:60
 msgid "The periods must be greater than 0."
 msgstr ""
 
-#: gl/accruals.php:67
+#: gl/accruals.php:81
 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:96
 #, php-format
 msgid "Accruals for %s"
 msgstr ""
 
-#: gl/accruals.php:92 gl/accruals.php:94 gl/accruals.php:203
-#: gl/accruals.php:205 gl/gl_budget.php:71 gl/gl_budget.php:72
-#: gl/gl_budget.php:76 gl/inquiry/balance_sheet.php:128
-#: gl/inquiry/balance_sheet.php:130 gl/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:52
-#: gl/inquiry/gl_trial_balance.php:54 gl/inquiry/profit_loss.php:174
-#: gl/inquiry/profit_loss.php:176 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:132
-#: gl/includes/ui/gl_bank_ui.inc:133 gl/includes/ui/gl_bank_ui.inc:135
-#: gl/includes/ui/gl_bank_ui.inc.orig:132
-#: gl/includes/ui/gl_bank_ui.inc.orig:133
-#: gl/includes/ui/gl_bank_ui.inc.orig:135 gl/includes/ui/gl_journal_ui.inc:83
-#: gl/includes/ui/gl_journal_ui.inc:84 gl/includes/ui/gl_journal_ui.inc:86
-#: 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:187
-#: reporting/rep708.php:189 reporting/rep708.php:196
-#: reporting/reports_main.php:264 reporting/reports_main.php:265
-#: reporting/reports_main.php:270 reporting/reports_main.php:271
-#: reporting/reports_main.php:278 reporting/reports_main.php:279
-#: reporting/reports_main.php:289 reporting/reports_main.php:290
-#: reporting/reports_main.php:301 reporting/reports_main.php:302
-#: reporting/reports_main.php:313 reporting/reports_main.php:318
-#: reporting/reports_main.php:325 reporting/reports_main.php:335
-#: reporting/reports_main.php:346 sales/customer_delivery.php:392
-#: sales/customer_delivery.php:400 sales/customer_invoice.php:401
-#: sales/customer_invoice.php:428 sales/manage/customers.php:234
-#: sales/manage/customers.php:236 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
+#: gl/accruals.php:106 gl/accruals.php:108 gl/accruals.php:219
+#: gl/accruals.php:221 gl/gl_budget.php:70 gl/gl_budget.php:71
+#: gl/gl_budget.php:75 gl/inquiry/balance_sheet.php:127
+#: gl/inquiry/balance_sheet.php:129 gl/inquiry/gl_account_inquiry.php:79
+#: gl/inquiry/gl_account_inquiry.php:81 gl/inquiry/gl_account_inquiry.php:134
+#: gl/inquiry/gl_account_inquiry.php:136 gl/inquiry/gl_trial_balance.php:58
+#: gl/inquiry/gl_trial_balance.php:60 gl/inquiry/profit_loss.php:184
+#: gl/inquiry/profit_loss.php:186 gl/manage/gl_quick_entries.php:268
+#: gl/manage/gl_quick_entries.php:270 gl/manage/gl_quick_entries.php:353
+#: gl/manage/gl_quick_entries.php:355 gl/view/accrual_trans.php:54
+#: gl/view/accrual_trans.php:56 gl/view/gl_deposit_view.php:104
+#: gl/view/gl_deposit_view.php:107 gl/view/gl_payment_view.php:103
+#: gl/view/gl_payment_view.php:106 gl/view/gl_trans_view.php:95
+#: gl/view/gl_trans_view.php:98 gl/includes/ui/gl_bank_ui.inc:146
+#: gl/includes/ui/gl_bank_ui.inc:147 gl/includes/ui/gl_bank_ui.inc:149
+#: gl/includes/ui/gl_journal_ui.inc:102 gl/includes/ui/gl_journal_ui.inc:103
+#: gl/includes/ui/gl_journal_ui.inc:105 includes/dashboard.inc:134
+#: includes/dashboard.inc:336 includes/sysnames.inc:43
+#: includes/sysnames.inc:180 inventory/manage/item_categories.php:258
+#: inventory/manage/item_categories.php:260 inventory/manage/items.php:458
+#: inventory/manage/items.php:460 purchasing/includes/ui/invoice_ui.inc:140
+#: purchasing/includes/ui/invoice_ui.inc:278
+#: purchasing/includes/ui/invoice_ui.inc:280
+#: purchasing/includes/ui/po_ui.inc:172 purchasing/manage/suppliers.php:147
+#: purchasing/manage/suppliers.php:148 purchasing/manage/suppliers.php:150
+#: reporting/rep103.php:240 reporting/rep103.php:252 reporting/rep205.php:152
+#: reporting/rep205.php:164 reporting/rep501.php:92 reporting/rep704.php:82
+#: reporting/rep704.php:85 reporting/rep704.php:96 reporting/rep704.php:98
+#: reporting/rep704.php:106 reporting/rep705.php:246 reporting/rep705.php:248
+#: reporting/rep705.php:259 reporting/rep706.php:194 reporting/rep706.php:196
+#: reporting/rep706.php:204 reporting/rep707.php:218 reporting/rep707.php:220
+#: reporting/rep707.php:228 reporting/rep708.php:201 reporting/rep708.php:203
+#: reporting/rep708.php:210 reporting/reports_main.php:366
+#: reporting/reports_main.php:367 reporting/reports_main.php:373
+#: reporting/reports_main.php:374 reporting/reports_main.php:382
+#: reporting/reports_main.php:383 reporting/reports_main.php:394
+#: reporting/reports_main.php:395 reporting/reports_main.php:407
+#: reporting/reports_main.php:408 reporting/reports_main.php:420
+#: reporting/reports_main.php:426 reporting/reports_main.php:434
+#: reporting/reports_main.php:445 reporting/reports_main.php:457
+#: sales/customer_delivery.php:383 sales/customer_delivery.php:391
+#: sales/customer_invoice.php:457 sales/customer_invoice.php:494
+#: sales/manage/customers.php:275 sales/manage/customers.php:277
+#: sales/includes/ui/sales_credit_ui.inc:128
+#: sales/includes/ui/sales_credit_ui.inc:133
+#: sales/includes/ui/sales_order_ui.inc:441
+#: sales/includes/ui/sales_order_ui.inc:446
 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/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:133
-#: gl/includes/ui/gl_bank_ui.inc:136 gl/includes/ui/gl_bank_ui.inc:139
-#: gl/includes/ui/gl_bank_ui.inc:279 gl/includes/ui/gl_bank_ui.inc.orig:133
-#: gl/includes/ui/gl_bank_ui.inc.orig:136
-#: gl/includes/ui/gl_bank_ui.inc.orig:139
-#: gl/includes/ui/gl_bank_ui.inc.orig:279 gl/includes/ui/gl_journal_ui.inc:84
-#: 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
+#: gl/accruals.php:112 gl/accruals.php:229 gl/inquiry/bank_inquiry.php:72
+#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
+#: gl/inquiry/journal_inquiry.php:114 gl/manage/gl_quick_entries.php:268
+#: gl/manage/gl_quick_entries.php:270 gl/manage/gl_quick_entries.php:272
+#: gl/view/accrual_trans.php:60 gl/view/gl_deposit_view.php:105
+#: gl/view/gl_deposit_view.php:108 gl/view/gl_deposit_view.php:111
+#: gl/view/gl_payment_view.php:104 gl/view/gl_payment_view.php:107
+#: gl/view/gl_payment_view.php:110 gl/view/gl_trans_view.php:96
+#: gl/view/gl_trans_view.php:99 gl/view/gl_trans_view.php:102
+#: gl/includes/ui/gl_bank_ui.inc:147 gl/includes/ui/gl_bank_ui.inc:150
+#: gl/includes/ui/gl_bank_ui.inc:153 gl/includes/ui/gl_bank_ui.inc:302
+#: gl/includes/ui/gl_journal_ui.inc:103 gl/includes/ui/gl_journal_ui.inc:106
+#: gl/includes/ui/gl_journal_ui.inc:109 gl/includes/ui/gl_journal_ui.inc:286
+#: includes/ui/class.reflines_crud.inc:38 inventory/cost_update.php:146
+#: inventory/includes/item_adjustments_ui.inc:214
+#: inventory/includes/stock_transfers_ui.inc:174
+#: manufacturing/view/wo_costs_view.php:61
 #: manufacturing/includes/work_order_issue_ui.inc:169
-#: purchasing/includes/ui/invoice_ui.inc:245
-#: purchasing/includes/ui/invoice_ui.inc:247
-#: purchasing/includes/ui/invoice_ui.inc:249
-#: sales/customer_credit_invoice.php:366 sales/customer_delivery.php:516
-#: sales/customer_invoice.php:557 sales/includes/ui/sales_credit_ui.inc:339
+#: purchasing/includes/ui/invoice_ui.inc:278
+#: purchasing/includes/ui/invoice_ui.inc:280
+#: purchasing/includes/ui/invoice_ui.inc:282
+#: sales/customer_credit_invoice.php:359 sales/customer_delivery.php:523
+#: sales/includes/ui/sales_credit_ui.inc:334
 msgid "Memo"
 msgstr ""
 
-#: gl/accruals.php:162
+#: gl/accruals.php:178
 msgid "Revenue / Cost Accruals have been processed."
 msgstr ""
 
-#: gl/accruals.php:168
+#: gl/accruals.php:184
 msgid "Showing GL Transactions."
 msgstr ""
 
-#: gl/accruals.php:180
+#: gl/accruals.php:196
 msgid "Weekly"
 msgstr ""
 
-#: gl/accruals.php:181
+#: gl/accruals.php:197
 msgid "Bi-weekly"
 msgstr ""
 
-#: gl/accruals.php:182 gl/manage/gl_quick_entries.php:240
-#: gl/includes/ui/gl_journal_ui.inc:57 sales/create_recurrent_invoices.php:115
-#: sales/manage/recurrent_invoices.php:102
-msgid "Monthly"
-msgstr ""
-
-#: gl/accruals.php:183
+#: gl/accruals.php:199
 msgid "Quarterly"
 msgstr ""
 
-#: gl/accruals.php:195
+#: gl/accruals.php:211
 msgid "First date of Accruals"
 msgstr ""
 
-#: gl/accruals.php:197
+#: gl/accruals.php:213
 msgid "Accrued Balance Account"
 msgstr ""
 
-#: gl/accruals.php:200
+#: gl/accruals.php:216
 msgid "Revenue / Cost Account"
 msgstr ""
 
-#: gl/accruals.php:208 gl/gl_budget.php:91 gl/gl_budget.php:93
-#: gl/inquiry/journal_inquiry.php:125 gl/inquiry/tax_inquiry.php:82
-#: gl/manage/gl_quick_entries.php:261 gl/manage/gl_quick_entries.php:263
-#: gl/manage/gl_quick_entries.php:265 gl/manage/gl_quick_entries.php:339
+#: gl/accruals.php:224 gl/gl_budget.php:90 gl/gl_budget.php:92
+#: gl/inquiry/journal_inquiry.php:113 gl/inquiry/tax_inquiry.php:80
+#: gl/manage/gl_quick_entries.php:268 gl/manage/gl_quick_entries.php:270
+#: gl/manage/gl_quick_entries.php:272 gl/manage/gl_quick_entries.php:348
 #: gl/view/bank_transfer_view.php:70 gl/view/bank_transfer_view.php:80
-#: gl/view/gl_deposit_view.php:67 gl/view/gl_deposit_view.php:100
-#: gl/view/gl_deposit_view.php:103 gl/view/gl_deposit_view.php:106
-#: 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:133 gl/includes/ui/gl_bank_ui.inc:136
-#: gl/includes/ui/gl_bank_ui.inc:139 gl/includes/ui/gl_bank_ui.inc.orig:133
-#: gl/includes/ui/gl_bank_ui.inc.orig:136
-#: gl/includes/ui/gl_bank_ui.inc.orig:139 includes/sysnames.inc:132
-#: includes/ui/allocation_cart.inc:263 includes/ui/ui_lists.inc:1152
-#: 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
+#: gl/view/gl_deposit_view.php:67 gl/view/gl_deposit_view.php:105
+#: gl/view/gl_deposit_view.php:108 gl/view/gl_deposit_view.php:111
+#: gl/view/gl_payment_view.php:65 gl/view/gl_payment_view.php:104
+#: gl/view/gl_payment_view.php:107 gl/view/gl_payment_view.php:110
+#: gl/includes/ui/gl_bank_ui.inc:147 gl/includes/ui/gl_bank_ui.inc:150
+#: gl/includes/ui/gl_bank_ui.inc:153 includes/dashboard.inc:121
+#: includes/dashboard.inc:147 includes/dashboard.inc:170
+#: includes/dashboard.inc:189 includes/dashboard.inc:226
+#: includes/dashboard.inc:294 includes/dashboard.inc:336
+#: includes/dashboard.inc:448 includes/sysnames.inc:138
+#: includes/ui/allocation_cart.inc:290 includes/ui/ui_lists.inc:1367
+#: includes/ui/ui_lists.inc.orig:1364
+#: manufacturing/includes/manufacturing_ui.inc:253
+#: purchasing/includes/ui/invoice_ui.inc:278
+#: purchasing/includes/ui/invoice_ui.inc:280
+#: purchasing/includes/ui/invoice_ui.inc:282
 #: purchasing/view/view_supp_payment.php:60
-#: purchasing/view/view_supp_payment.php:69 reporting/rep102.php:243
-#: reporting/rep202.php:249 reporting/rep706.php:303 reporting/rep707.php:321
-#: reporting/rep710.php:76 reporting/includes/doctext.inc:152
-#: sales/view/view_receipt.php:44
+#: purchasing/view/view_supp_payment.php:72
+#: purchasing/inquiry/supplier_inquiry.php:181 reporting/rep102.php:242
+#: reporting/rep107.php:205 reporting/rep107.php:270 reporting/rep109.php:197
+#: reporting/rep110.php:194 reporting/rep111.php:194 reporting/rep113.php:183
+#: reporting/rep202.php:250 reporting/rep209.php:199 reporting/rep706.php:308
+#: reporting/rep707.php:328 reporting/rep710.php:78
+#: sales/view/view_receipt.php:44 sales/inquiry/customer_inquiry.php:202
 msgid "Amount"
 msgstr ""
 
-#: gl/accruals.php:208
+#: gl/accruals.php:224
 msgid "Search Amount"
 msgstr ""
 
-#: gl/accruals.php:210
+#: gl/accruals.php:226
 msgid "Frequency"
 msgstr ""
 
-#: gl/accruals.php:212
+#: gl/accruals.php:228
 msgid "Periods"
 msgstr ""
 
-#: gl/accruals.php:216
+#: gl/accruals.php:232
 msgid "Show GL Rows"
 msgstr ""
 
-#: gl/accruals.php:217
+#: gl/accruals.php:233
 msgid "Process Accruals"
 msgstr ""
 
-#: gl/accruals.php:218
+#: gl/accruals.php:234
 msgid "Are you sure you want to post accruals?"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:33
+#: gl/bank_account_reconcile.php:32
 msgid "Reconcile Bank Account"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:35 gl/bank_transfer.php:30 gl/gl_bank.php:48
-#: gl/inquiry/bank_inquiry.php:30 purchasing/supplier_payment.php:42
-#: purchasing/supplier_payment.php.orig:42 sales/customer_payments.php:39
-#: sales/customer_payments.php.orig:39
+#: gl/bank_account_reconcile.php:34 gl/bank_transfer.php:37 gl/gl_bank.php:49
+#: gl/inquiry/bank_inquiry.php:31 purchasing/supplier_payment.php:42
+#: sales/customer_payments.php:38
 msgid "There are no bank accounts defined in the system."
 msgstr ""
 
-#: gl/bank_account_reconcile.php:39
+#: gl/bank_account_reconcile.php:38
 msgid "Invalid reconcile date format"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:56
+#: gl/bank_account_reconcile.php:55
 msgid "Reconcile this transaction"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:166 gl/inquiry/bank_inquiry.php:47
-#: gl/inquiry/gl_account_inquiry.php:69
+#: gl/bank_account_reconcile.php:163 gl/inquiry/bank_inquiry.php:48
+#: gl/inquiry/gl_account_inquiry.php:70
 msgid "Account:"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:168
+#: gl/bank_account_reconcile.php:165
 msgid "Bank Statement:"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:169
+#: gl/bank_account_reconcile.php:166 includes/ui/class.crud_view.inc:300
 msgid "New"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:198
+#: gl/bank_account_reconcile.php:195
 msgid "Reconcile Date"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:198
+#: gl/bank_account_reconcile.php:195
 msgid "Beginning<br>Balance"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:199
+#: gl/bank_account_reconcile.php:196
 msgid "Ending<br>Balance"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:199
+#: gl/bank_account_reconcile.php:196
 msgid "Account<br>Total"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:199
+#: gl/bank_account_reconcile.php:196
 msgid "Reconciled<br>Amount"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:199
+#: gl/bank_account_reconcile.php:196 reporting/rep602.php:205
 msgid "Difference"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:203
+#: gl/bank_account_reconcile.php:200
 msgid "Date of bank statement to reconcile"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:239 gl/inquiry/bank_inquiry.php:71
-#: gl/inquiry/gl_account_inquiry.php:140 gl/inquiry/gl_account_inquiry.php:142
-#: 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/rep704.php:84
+#: gl/bank_account_reconcile.php:236 gl/inquiry/bank_inquiry.php:72
+#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
+#: gl/view/accrual_trans.php:60 reporting/rep601.php:79
+#: reporting/rep602.php:80 reporting/rep704.php:83 reporting/rep704.php:85
+#: reporting/rep704.php:88
 msgid "Person/Item"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:249
+#: gl/bank_account_reconcile.php:246
 msgid "Reconcile"
 msgstr ""
 
-#: gl/bank_transfer.php:28
-msgid "Transfer between Bank Accounts"
+#: gl/bank_transfer.php:30
+msgid "Modify Bank Account Transfer"
 msgstr ""
 
-#: gl/bank_transfer.php:39 gl/manage/revaluate_currencies.php:35
+#: gl/bank_transfer.php:32
+msgid "Bank Account Transfer Entry"
+msgstr ""
+
+#: gl/bank_transfer.php:46 gl/manage/revaluate_currencies.php:35
 msgid "Transfer has been entered"
 msgstr ""
 
-#: gl/bank_transfer.php:41 gl/manage/revaluate_currencies.php:37
+#: gl/bank_transfer.php:48 gl/manage/revaluate_currencies.php:37
 msgid "&View the GL Journal Entries for this Transfer"
 msgstr ""
 
-#: gl/bank_transfer.php:43
+#: gl/bank_transfer.php:50
 msgid "Enter &Another Transfer"
 msgstr ""
 
-#: gl/bank_transfer.php:66
+#: gl/bank_transfer.php:104
 msgid "From Account:"
 msgstr ""
 
-#: gl/bank_transfer.php:70
+#: gl/bank_transfer.php:108
 msgid "To Account:"
 msgstr ""
 
-#: gl/bank_transfer.php:72
+#: gl/bank_transfer.php:115
 msgid "Transfer Date:"
 msgstr ""
 
-#: gl/bank_transfer.php:78 gl/bank_transfer.php:85
-#: sales/customer_payments.php:290 sales/customer_payments.php.orig:291
+#: gl/bank_transfer.php:126 gl/bank_transfer.php:133
+#: sales/customer_payments.php:376
 msgid "Amount:"
 msgstr ""
 
-#: gl/bank_transfer.php:79 gl/bank_transfer.php:86
-#: purchasing/supplier_payment.php:298
-#: purchasing/supplier_payment.php.orig:300 sales/customer_payments.php:274
-#: sales/customer_payments.php.orig:276
+#: gl/bank_transfer.php:127 gl/bank_transfer.php:134
+#: purchasing/supplier_payment.php:319 sales/customer_payments.php:362
 msgid "Bank Charge:"
 msgstr ""
 
-#: gl/bank_transfer.php:97
+#: gl/bank_transfer.php:129
+msgid "Incoming Amount:"
+msgstr ""
+
+#: gl/bank_transfer.php:143
+msgid "Modify Transfer"
+msgstr ""
+
+#: gl/bank_transfer.php:145
 msgid "Enter Transfer"
 msgstr ""
 
-#: gl/bank_transfer.php:123 gl/bank_transfer.php:153
-#: purchasing/supplier_payment.php:129 purchasing/supplier_payment.php:135
-#: purchasing/supplier_payment.php.orig:126
-#: purchasing/supplier_payment.php.orig:132
+#: gl/bank_transfer.php:172 gl/bank_transfer.php:226 gl/bank_transfer.php:250
+#: purchasing/supplier_payment.php:144 purchasing/supplier_payment.php:150
 msgid "The entered amount is invalid or less than zero."
 msgstr ""
 
-#: gl/bank_transfer.php:128 gl/gl_bank.php:224
+#: gl/bank_transfer.php:177 gl/gl_bank.php:226
 msgid "The total bank amount cannot be 0."
 msgstr ""
 
-#: gl/bank_transfer.php:139
+#: gl/bank_transfer.php:193
 #, php-format
-msgid "The total bank amount exceeds allowed limit (%s) for source account."
+msgid ""
+"This bank transfer change would result in exceeding authorized overdraft "
+"limit (%s) of the account '%s'"
 msgstr ""
 
-#: gl/bank_transfer.php:145 gl/gl_bank.php:241
+#: gl/bank_transfer.php:198
 #, php-format
 msgid ""
-"The bank transaction would result in exceed of authorized overdraft limit "
-"for transaction: %s #%s on %s."
+"This bank transfer change would result in exceeding authorized overdraft "
+"limit on '%s' for transaction: %s #%s on %s."
 msgstr ""
 
-#: gl/bank_transfer.php:158 purchasing/supplier_payment.php:143
-#: purchasing/supplier_payment.php.orig:140 sales/customer_payments.php:131
-#: sales/customer_payments.php.orig:131
+#: gl/bank_transfer.php:210
+#, php-format
 msgid ""
-"The Bank Charge Account has not been set in System and General GL Setup."
+"This bank transfer would result in exceeding authorized overdraft limit of "
+"the account (%s)"
 msgstr ""
 
-#: gl/bank_transfer.php:164 gl/gl_bank.php:248 gl/gl_journal.php:168
-#: gl/manage/revaluate_currencies.php:65 inventory/adjustments.php:96
-#: inventory/transfers.php:93 manufacturing/work_order_add_finished.php:77
-#: manufacturing/work_order_entry.php:132
-#: manufacturing/work_order_issue.php:91 purchasing/po_receive_items.php:188
-#: purchasing/supplier_payment.php:200
-#: purchasing/supplier_payment.php.orig:197 sales/credit_note_entry.php:147
-#: sales/customer_credit_invoice.php:102 sales/customer_delivery.php:163
-#: sales/customer_invoice.php:276 sales/customer_payments.php:106
-#: sales/customer_payments.php.orig:106 sales/sales_order_entry.php:405
-msgid "You must enter a reference."
+#: gl/bank_transfer.php:215
+#, php-format
+msgid ""
+"This bank transfer would result in exceeding authorized overdraft limit for "
+"transaction: %s #%s on %s."
+msgstr ""
+
+#: gl/bank_transfer.php:231 purchasing/supplier_payment.php:158
+#: sales/customer_payments.php:181
+msgid ""
+"The Bank Charge Account has not been set in System and General GL Setup."
 msgstr ""
 
-#: gl/bank_transfer.php:178
+#: gl/bank_transfer.php:243
 msgid "The source and destination bank accouts cannot be the same."
 msgstr ""
 
-#: gl/gl_bank.php:33
+#: gl/bank_transfer.php:255
+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:92
+#: 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:94
+#: gl/gl_bank.php:81 gl/gl_bank.php:99
 msgid "Enter Another &Payment"
 msgstr ""
 
-#: gl/gl_bank.php:78 gl/gl_bank.php:96
+#: gl/gl_bank.php:83 gl/gl_bank.php:101
 msgid "Enter A &Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:80 gl/gl_journal.php:61 inventory/adjustments.php:50
-#: manufacturing/work_order_entry.php:68 purchasing/po_entry_items.php:109
-#: purchasing/po_entry_items.php:133 purchasing/supplier_credit.php:49
-#: purchasing/supplier_invoice.php:52 sales/credit_note_entry.php:77
-#: sales/customer_credit_invoice.php:62 sales/customer_invoice.php:66
-#: sales/sales_order_entry.php:226
+#: gl/gl_bank.php:85 gl/gl_journal.php:64 inventory/adjustments.php:65
+#: manufacturing/work_order_entry.php:67 purchasing/po_entry_items.php:117
+#: purchasing/po_entry_items.php:138 purchasing/supplier_credit.php:82
+#: purchasing/supplier_invoice.php:76 sales/credit_note_entry.php:77
+#: sales/customer_credit_invoice.php:61 sales/customer_invoice.php:72
+#: sales/sales_order_entry.php:250
 msgid "Add an Attachment"
 msgstr ""
 
-#: gl/gl_bank.php:106
+#: 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:108
+#: gl/gl_bank.php:113
 msgid "View the GL Postings for this Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:110
+#: gl/gl_bank.php:115
 msgid "Enter Another Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:112
+#: gl/gl_bank.php:117
 msgid "Enter A Payment"
 msgstr ""
 
-#: gl/gl_bank.php:123
+#: 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:125
+#: gl/gl_bank.php:130
 msgid "Enter Another &Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:127
+#: gl/gl_bank.php:132
 msgid "Enter A &Payment"
 msgstr ""
 
-#: gl/gl_bank.php:218
+#: gl/gl_bank.php:220
 msgid "You must enter at least one payment line."
 msgstr ""
 
-#: gl/gl_bank.php:235 purchasing/supplier_payment.php:193
-#: purchasing/supplier_payment.php.orig:190
+#: gl/gl_bank.php:237 purchasing/supplier_payment.php:209
 #, php-format
 msgid "The total bank amount exceeds allowed limit (%s)."
 msgstr ""
 
-#: gl/gl_bank.php:260
+#: gl/gl_bank.php:243
+#, php-format
+msgid ""
+"The bank transaction would result in exceed of authorized overdraft limit "
+"for transaction: %s #%s on %s."
+msgstr ""
+
+#: gl/gl_bank.php:255
 msgid "The entered date for the payment is invalid."
 msgstr ""
 
-#: gl/gl_bank.php:272
+#: gl/gl_bank.php:267
 msgid "You have to select customer and customer branch."
 msgstr ""
 
-#: gl/gl_bank.php:276
+#: gl/gl_bank.php:271
 msgid "You have to select supplier."
 msgstr ""
 
-#: gl/gl_bank.php:322
+#: gl/gl_bank.php:279
+msgid "Settled amount have to be positive number."
+msgstr ""
+
+#: gl/gl_bank.php:325
 msgid "The amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: gl/gl_bank.php:394
+#: gl/gl_bank.php:331 gl/manage/exchange_rates.php:39
+msgid "The exchange rate cannot be zero or a negative number."
+msgstr ""
+
+#: gl/gl_bank.php:403
 msgid "Payment Items"
 msgstr ""
 
-#: gl/gl_bank.php:394
+#: gl/gl_bank.php:403
 msgid "Deposit Items"
 msgstr ""
 
-#: gl/gl_bank.php:402
+#: gl/gl_bank.php:411
 msgid "Process Payment"
 msgstr ""
 
-#: gl/gl_bank.php:402
+#: gl/gl_bank.php:411
 msgid "Process Deposit"
 msgstr ""
 
@@ -3659,7 +4117,7 @@ msgstr ""
 msgid "Budget Entry"
 msgstr ""
 
-#: gl/gl_budget.php:26 gl/manage/gl_accounts.php:23
+#: gl/gl_budget.php:26 gl/manage/gl_accounts.php:27
 msgid ""
 "There are no account groups defined. Please define at least one account "
 "group before entering accounts."
@@ -3673,268 +4131,368 @@ msgstr ""
 msgid "The Budget has been deleted."
 msgstr ""
 
-#: gl/gl_budget.php:64 gl/manage/gl_accounts.php:231
-#: gl/manage/gl_accounts.php:241
+#: gl/gl_budget.php:63 gl/manage/gl_accounts.php:234
+#: gl/manage/gl_accounts.php:244
 msgid "Account Code:"
 msgstr ""
 
-#: gl/gl_budget.php:84 gl/manage/exchange_rates.php:142
+#: gl/gl_budget.php:83 gl/manage/exchange_rates.php:143
 msgid "Get"
 msgstr ""
 
-#: gl/gl_budget.php:91 gl/gl_budget.php:93 gl/inquiry/profit_loss.php:231
-#: gl/manage/gl_quick_entries.php:240 reporting/rep101.php:136
-#: reporting/rep105.php:116 reporting/rep106.php:90 reporting/rep114.php:88
-#: reporting/rep201.php:124 reporting/rep304.php:121 reporting/rep305.php:100
-#: 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:186 reporting/rep708.php:195
-#: reporting/rep708.php:202 reporting/rep709.php:104 reporting/rep710.php:83
+#: gl/gl_budget.php:90 gl/gl_budget.php:92 gl/inquiry/profit_loss.php:237
+#: gl/manage/gl_quick_entries.php:247 reporting/rep101.php:140
+#: reporting/rep105.php:118 reporting/rep106.php:98 reporting/rep114.php:90
+#: reporting/rep201.php:115 reporting/rep304.php:134 reporting/rep305.php:111
+#: reporting/rep306.php:148 reporting/rep307.php:119 reporting/rep308.php:229
+#: reporting/rep309.php:104 reporting/rep601.php:85 reporting/rep602.php:86
+#: reporting/rep702.php:59 reporting/rep704.php:94 reporting/rep704.php:104
+#: reporting/rep704.php:112 reporting/rep706.php:185 reporting/rep706.php:193
+#: reporting/rep706.php:203 reporting/rep706.php:211 reporting/rep707.php:210
+#: reporting/rep707.php:217 reporting/rep707.php:227 reporting/rep707.php:235
+#: reporting/rep708.php:200 reporting/rep708.php:209 reporting/rep708.php:216
+#: reporting/rep709.php:111 reporting/rep710.php:85
 msgid "Period"
 msgstr ""
 
-#: gl/gl_budget.php:91
+#: gl/gl_budget.php:90
 msgid "Dim. incl."
 msgstr ""
 
-#: gl/gl_budget.php:91 gl/gl_budget.php:93
+#: gl/gl_budget.php:90 gl/gl_budget.php:92
 msgid "Last Year"
 msgstr ""
 
-#: gl/gl_budget.php:127 gl/inquiry/balance_sheet.php:98
-#: gl/inquiry/balance_sheet.php:205 gl/inquiry/balance_sheet.php:236
-#: gl/inquiry/gl_trial_balance.php:209 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:106
-#: gl/includes/ui/gl_bank_ui.inc:182 gl/includes/ui/gl_bank_ui.inc.orig:182
-#: gl/includes/ui/gl_journal_ui.inc:141
-#: inventory/includes/item_adjustments_ui.inc:63
-#: inventory/includes/item_adjustments_ui.inc:102
-#: 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
+#: gl/gl_budget.php:126 gl/inquiry/balance_sheet.php:98
+#: gl/inquiry/balance_sheet.php:202 gl/inquiry/balance_sheet.php:233
+#: gl/inquiry/gl_trial_balance.php:174 gl/inquiry/gl_trial_balance.php:251
+#: gl/inquiry/profit_loss.php:120 gl/inquiry/profit_loss.php:287
+#: gl/view/gl_deposit_view.php:137 gl/view/gl_payment_view.php:136
+#: gl/view/gl_trans_view.php:144 gl/includes/ui/gl_bank_ui.inc:195
+#: gl/includes/ui/gl_journal_ui.inc:169 includes/dashboard.inc:487
+#: includes/dashboard.inc:571 inventory/includes/item_adjustments_ui.inc:60
+#: inventory/includes/item_adjustments_ui.inc:114
+#: manufacturing/includes/manufacturing_ui.inc:195
+#: purchasing/includes/ui/invoice_ui.inc:341
+#: purchasing/includes/ui/invoice_ui.inc:504
+#: purchasing/includes/ui/invoice_ui.inc:575
 #: purchasing/po_receive_items.php:63 purchasing/view/view_po.php:140
 #: purchasing/allocations/supplier_allocation_main.php:100
-#: reporting/rep101.php:237 reporting/rep106.php:82 reporting/rep106.php:120
-#: reporting/rep106.php:168 reporting/rep114.php:156 reporting/rep201.php:221
-#: reporting/rep203.php:92 reporting/rep203.php:167 reporting/rep204.php:109
-#: reporting/rep204.php:137 reporting/rep301.php:126 reporting/rep301.php:163
-#: reporting/rep304.php:144 reporting/rep304.php:186 reporting/rep305.php:95
-#: reporting/rep305.php:119 reporting/rep305.php:176 reporting/rep702.php:138
-#: reporting/rep705.php:152 reporting/rep705.php:309 reporting/rep706.php:106
-#: reporting/rep706.php:249 reporting/rep706.php:284 reporting/rep707.php:115
-#: reporting/rep707.php:291 reporting/rep708.php:234
-#: reporting/includes/doctext.inc:105 reporting/includes/doctext.inc:113
-#: sales/customer_credit_invoice.php:283 sales/customer_delivery.php:430
-#: sales/customer_invoice.php:449
-#: sales/allocations/customer_allocation_main.php:99
+#: reporting/rep101.php:255 reporting/rep106.php:90 reporting/rep106.php:125
+#: reporting/rep106.php:172 reporting/rep114.php:161 reporting/rep201.php:222
+#: reporting/rep203.php:89 reporting/rep203.php:166 reporting/rep204.php:113
+#: reporting/rep204.php:141 reporting/rep301.php:192 reporting/rep301.php:240
+#: reporting/rep304.php:160 reporting/rep304.php:205 reporting/rep305.php:106
+#: reporting/rep305.php:132 reporting/rep305.php:188 reporting/rep306.php:141
+#: reporting/rep306.php:176 reporting/rep306.php:196 reporting/rep306.php:212
+#: reporting/rep306.php:261 reporting/rep306.php:276 reporting/rep306.php:287
+#: reporting/rep308.php:304 reporting/rep309.php:125 reporting/rep309.php:152
+#: reporting/rep451.php:120 reporting/rep451.php:155 reporting/rep702.php:142
+#: reporting/rep705.php:152 reporting/rep705.php:312 reporting/rep706.php:106
+#: reporting/rep706.php:255 reporting/rep706.php:290 reporting/rep707.php:115
+#: reporting/rep707.php:299 reporting/rep708.php:253
+#: reporting/includes/doctext.inc:32 reporting/includes/doctext.inc:191
+#: sales/customer_credit_invoice.php:276 sales/customer_delivery.php:421
+#: sales/customer_invoice.php:519 sales/customer_invoice.php:522
+#: sales/allocations/customer_allocation_main.php:98
 #: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113
-#: sales/view/view_invoice.php:114 sales/view/view_sales_order.php:96
-#: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161
-#: sales/view/view_sales_order.php:202
-#: sales/includes/ui/sales_credit_ui.inc:168
-#: sales/includes/ui/sales_order_ui.inc:142
+#: sales/view/view_invoice.php:116 sales/view/view_sales_order.php:109
+#: sales/view/view_sales_order.php:142 sales/view/view_sales_order.php:179
+#: sales/view/view_sales_order.php:220
+#: sales/includes/ui/sales_credit_ui.inc:163
+#: sales/includes/ui/sales_order_ui.inc:148
 msgid "Total"
 msgstr ""
 
+#: gl/gl_budget.php:135
+msgid "Save"
+msgstr ""
+
 #: gl/gl_journal.php:32
 #, php-format
 msgid "Modifying Journal Transaction # %d."
 msgstr ""
 
-#: gl/gl_journal.php:36 includes/sysnames.inc:22 includes/sysnames.inc:149
+#: gl/gl_journal.php:36 includes/sysnames.inc:22 includes/sysnames.inc:155
 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:71
+#: 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:69
+#: gl/gl_journal.php:72
 msgid "Journal entry has been updated"
 msgstr ""
 
-#: gl/gl_journal.php:73
+#: gl/gl_journal.php:76
 msgid "Return to Journal &Inquiry"
 msgstr ""
 
-#: gl/gl_journal.php:86
+#: gl/gl_journal.php:91
 msgid ""
 "You can edit directly only journal entries created via Journal Entry page."
 msgstr ""
 
-#: gl/gl_journal.php:87
+#: gl/gl_journal.php:92
 msgid "Entry &New Journal Entry"
 msgstr ""
 
-#: gl/gl_journal.php:143
+#: gl/gl_journal.php:204
 msgid "You must enter at least one journal line."
 msgstr ""
 
-#: gl/gl_journal.php:149
+#: gl/gl_journal.php:210
 msgid ""
 "The journal must balance (debits equal to credits) before it can be "
 "processed."
 msgstr ""
 
-#: gl/gl_journal.php:211 gl/gl_journal.php:218
+#: gl/gl_journal.php:247
+msgid "The exchange rate must be numeric and greater than zero."
+msgstr ""
+
+#: gl/gl_journal.php:273
+msgid ""
+"Check tax register records before processing transaction or switch off "
+"'Include in tax register' option."
+msgstr ""
+
+#: gl/gl_journal.php:287
+msgid ""
+"Cannot determine tax register to be used. You have to make at least one "
+"posting either to tax or customer/supplier account to use tax register."
+msgstr ""
+
+#: gl/gl_journal.php:347 gl/manage/gl_quick_entries.php:121
+msgid "You must select GL account."
+msgstr ""
+
+#: gl/gl_journal.php:353
+msgid "You must select subledger account."
+msgstr ""
+
+#: gl/gl_journal.php:361 gl/gl_journal.php:368
 msgid "Dimension is closed."
 msgstr ""
 
-#: gl/gl_journal.php:225
+#: gl/gl_journal.php:375
 msgid "You must enter either a debit amount or a credit amount."
 msgstr ""
 
-#: gl/gl_journal.php:232
+#: gl/gl_journal.php:382
 msgid "The debit amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: gl/gl_journal.php:237
+#: gl/gl_journal.php:387
 msgid "The credit amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: gl/gl_journal.php:243 includes/ui/ui_view.inc:655
-#: purchasing/supplier_credit.php:119 purchasing/supplier_invoice.php:119
+#: gl/gl_journal.php:393 includes/ui/ui_view.inc:649
+#: purchasing/supplier_credit.php:143 purchasing/supplier_invoice.php:154
 msgid "Cannot post to GL account used by more than one tax type."
 msgstr ""
 
-#: gl/gl_journal.php:250
+#: gl/gl_journal.php:400
 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:329
+#: gl/gl_journal.php:520
+msgid "&GL postings"
+msgstr ""
+
+#: gl/gl_journal.php:521
+msgid "&Tax register"
+msgstr ""
+
+#: gl/gl_journal.php:530
 msgid "Rows"
 msgstr ""
 
-#: gl/gl_journal.php:335
+#: gl/gl_journal.php:540
+msgid "Tax register record"
+msgstr ""
+
+#: gl/gl_journal.php:543
+msgid "VAT date:"
+msgstr ""
+
+#: gl/gl_journal.php:548 gl/inquiry/tax_inquiry.php:102
+#: reporting/rep709.php:189
+msgid "Input Tax"
+msgstr ""
+
+#: gl/gl_journal.php:548 gl/inquiry/tax_inquiry.php:96
+#: reporting/rep709.php:189
+msgid "Output Tax"
+msgstr ""
+
+#: gl/gl_journal.php:548
+msgid "Net amount"
+msgstr ""
+
+#: gl/gl_journal.php:563
 msgid "Process Journal Entry"
 msgstr ""
 
-#: gl/gl_journal.php:336
+#: gl/gl_journal.php:564
 msgid "Process journal entry only if debits equal to credits"
 msgstr ""
 
+#: gl/inquiry/accounts_list.php:25 inventory/manage/items.php:467
+#: sales/manage/customer_branches.php:240
+msgid "GL Accounts"
+msgstr ""
+
+#: gl/inquiry/accounts_list.php:40 includes/ui/ui_lists.inc:349
+#: includes/ui/ui_lists.inc.orig:349
+msgid "Search GL accounts"
+msgstr ""
+
+#: gl/inquiry/accounts_list.php:52 gl/view/gl_deposit_view.php:104
+#: gl/view/gl_deposit_view.php:107 gl/view/gl_deposit_view.php:110
+#: gl/view/gl_payment_view.php:103 gl/view/gl_payment_view.php:106
+#: gl/view/gl_payment_view.php:109 gl/view/gl_trans_view.php:95
+#: gl/view/gl_trans_view.php:98 gl/view/gl_trans_view.php:101
+#: gl/includes/ui/gl_bank_ui.inc:146 gl/includes/ui/gl_bank_ui.inc:149
+#: gl/includes/ui/gl_bank_ui.inc:152 gl/includes/ui/gl_journal_ui.inc:102
+#: gl/includes/ui/gl_journal_ui.inc:105 gl/includes/ui/gl_journal_ui.inc:108
+#: manufacturing/view/wo_costs_view.php:60 reporting/rep701.php:110
+msgid "Account Code"
+msgstr ""
+
+#: gl/inquiry/accounts_list.php:52 inventory/inquiry/stock_list.php:53
+#: inventory/manage/item_codes.php:127 reporting/rep104.php:115
+#: reporting/rep105.php:119 reporting/rep301.php:164 reporting/rep301.php:170
+#: reporting/rep302.php:122 reporting/rep302.php:129 reporting/rep303.php:132
+#: reporting/rep304.php:127 reporting/rep304.php:135 reporting/rep306.php:141
+#: reporting/rep306.php:149 reporting/rep307.php:114 reporting/rep307.php:120
+#: reporting/rep308.php:223 reporting/rep308.php:230 reporting/rep309.php:105
+msgid "Category"
+msgstr ""
+
 #: gl/inquiry/balance_sheet.php:27
 msgid "Balance Sheet Drilldown"
 msgstr ""
 
-#: gl/inquiry/balance_sheet.php:126
+#: gl/inquiry/balance_sheet.php:125
 msgid "As at:"
 msgstr ""
 
-#: gl/inquiry/balance_sheet.php:228 gl/inquiry/profit_loss.php:294
-#: reporting/rep705.php:319 reporting/rep706.php:272 reporting/rep706.php:297
-#: reporting/rep707.php:303 reporting/rep707.php:309
+#: gl/inquiry/balance_sheet.php:225 gl/inquiry/profit_loss.php:298
+#: includes/dashboard.inc:394 reporting/rep705.php:322
+#: reporting/rep706.php:278 reporting/rep706.php:303 reporting/rep707.php:311
+#: reporting/rep707.php:317
 msgid "Calculated Return"
 msgstr ""
 
-#: gl/inquiry/balance_sheet.php:236 includes/sysnames.inc:120
-#: reporting/rep706.php:284
+#: gl/inquiry/balance_sheet.php:233 includes/sysnames.inc:126
+#: reporting/rep706.php:290
 msgid "Liabilities"
 msgstr ""
 
-#: gl/inquiry/balance_sheet.php:236 reporting/rep706.php:284
+#: gl/inquiry/balance_sheet.php:233 reporting/rep706.php:290
 msgid " and "
 msgstr ""
 
-#: gl/inquiry/balance_sheet.php:236 reporting/rep706.php:284
+#: gl/inquiry/balance_sheet.php:233 reporting/rep706.php:290
 msgid "Equities"
 msgstr ""
 
-#: gl/inquiry/bank_inquiry.php:28 reporting/rep601.php:69
+#: gl/inquiry/bank_inquiry.php:29 reporting/rep601.php:72
 msgid "Bank Statement"
 msgstr ""
 
-#: gl/inquiry/bank_inquiry.php:78 gl/inquiry/gl_account_inquiry.php:161
-#: reporting/rep601.php:99 reporting/rep704.php:137
+#: gl/inquiry/bank_inquiry.php:79 gl/inquiry/gl_account_inquiry.php:162
+#: reporting/rep601.php:104 reporting/rep602.php:103 reporting/rep704.php:143
 msgid "Opening Balance"
 msgstr ""
 
-#: gl/inquiry/bank_inquiry.php:123 gl/inquiry/gl_account_inquiry.php:210
-#: gl/inquiry/gl_trial_balance.php:219 reporting/rep601.php:150
-#: reporting/rep704.php:185 reporting/rep708.php:243
+#: gl/inquiry/bank_inquiry.php:130 gl/inquiry/gl_account_inquiry.php:213
+#: gl/inquiry/gl_trial_balance.php:261 reporting/rep601.php:157
+#: reporting/rep602.php:157 reporting/rep704.php:191 reporting/rep708.php:262
 msgid "Ending Balance"
 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:205
+#: gl/inquiry/gl_trial_balance.php:28 reporting/rep708.php:219
 msgid "Trial Balance"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:55
+#: gl/inquiry/gl_trial_balance.php:61
 msgid "No zero values"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:56 reporting/reports_main.php:300
-#: reporting/reports_main.php:345 reporting/reports_main.php:385
+#: gl/inquiry/gl_trial_balance.php:62 reporting/reports_main.php:406
+#: reporting/reports_main.php:456 reporting/reports_main.php:501
 msgid "Only balances"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:89 gl/inquiry/gl_trial_balance.php:141
-#: reporting/rep706.php:302 reporting/rep707.php:320 reporting/rep708.php:50
-#: reporting/rep708.php:116 sales/create_recurrent_invoices.php:115
-#: sales/manage/recurrent_invoices.php:102
+#: gl/inquiry/gl_trial_balance.php:104 gl/inquiry/gl_trial_balance.php:165
+#: includes/dashboard.inc:526 reporting/rep706.php:307
+#: reporting/rep707.php:327 reporting/rep708.php:51 reporting/rep708.php:126
+#: sales/create_recurrent_invoices.php:203
+#: sales/manage/recurrent_invoices.php:128
 msgid "Group"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:158
+#: gl/inquiry/gl_trial_balance.php:203
 msgid "The from date cannot be bigger than the fiscal year end."
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:171 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:109
-#: reporting/rep702.php:51 reporting/rep705.php:234 reporting/rep706.php:181
-#: reporting/rep707.php:206 reporting/rep708.php:178
+#: gl/inquiry/gl_trial_balance.php:216 gl/manage/bank_accounts.php:109
+#: gl/view/gl_trans_view.php:95 gl/view/gl_trans_view.php:98
+#: gl/view/gl_trans_view.php:101 manufacturing/view/wo_costs_view.php:60
+#: reporting/rep701.php:110 reporting/rep702.php:53 reporting/rep705.php:235
+#: reporting/rep706.php:185 reporting/rep707.php:210 reporting/rep708.php:192
 msgid "Account Name"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:172 reporting/rep708.php:171
+#: gl/inquiry/gl_trial_balance.php:217 reporting/rep708.php:185
 msgid "Brought Forward"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:173 reporting/rep708.php:171
+#: gl/inquiry/gl_trial_balance.php:218 reporting/rep708.php:185
 msgid "This Period"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:192
+#: gl/inquiry/gl_trial_balance.php:237 gl/manage/gl_account_types.php:127
+#: includes/dashboard.inc:147 includes/dashboard.inc:170
+#: reporting/rep451.php:80 reporting/rep451.php:86
 msgid "Class"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:227 reporting/rep708.php:264
+#: gl/inquiry/gl_trial_balance.php:269 reporting/rep708.php:283
 msgid ""
 "The Opening Balance is not in balance, probably due to a non closed Previous "
 "Fiscalyear."
@@ -3948,20 +4506,45 @@ msgstr ""
 msgid "Enter reference fragment or leave empty"
 msgstr ""
 
-#: gl/inquiry/journal_inquiry.php:51
-msgid "Show closed:"
+#: gl/inquiry/journal_inquiry.php:53
+msgid "Enter memo fragment or leave empty"
+msgstr ""
+
+#: gl/inquiry/journal_inquiry.php:54
+msgid "User:"
 msgstr ""
 
 #: gl/inquiry/journal_inquiry.php:56
-msgid "Enter memo fragment or leave empty"
+msgid "Dimension:"
+msgstr ""
+
+#: gl/inquiry/journal_inquiry.php:57
+msgid "Show closed:"
 msgstr ""
 
-#: gl/inquiry/journal_inquiry.php:123
+#: gl/inquiry/journal_inquiry.php:109
 msgid "Trans #"
 msgstr ""
 
-#: gl/inquiry/journal_inquiry.php:127 reporting/rep710.php:75
-#: reporting/rep710.php:85 reporting/reports_main.php:399
+#: gl/inquiry/journal_inquiry.php:110 gl/view/gl_trans_view.php:44
+#: gl/includes/ui/gl_journal_ui.inc:113
+msgid "Counterparty"
+msgstr ""
+
+#: gl/inquiry/journal_inquiry.php:111 gl/inquiry/journal_inquiry.php:126
+#: purchasing/includes/ui/grn_ui.inc:34 purchasing/includes/ui/grn_ui.inc:77
+#: purchasing/includes/ui/po_ui.inc:328
+#: purchasing/view/view_supp_credit.php:44
+#: purchasing/view/view_supp_invoice.php:48
+#: purchasing/inquiry/po_search_completed.php:114
+#: purchasing/inquiry/po_search.php:121
+#: purchasing/inquiry/supplier_inquiry.php:177
+#: reporting/includes/doctext.inc:163 reporting/includes/doctext.inc:186
+msgid "Supplier's Reference"
+msgstr ""
+
+#: gl/inquiry/journal_inquiry.php:115 reporting/rep710.php:77
+#: reporting/rep710.php:87 reporting/reports_main.php:517
 msgid "User"
 msgstr ""
 
@@ -3969,31 +4552,31 @@ msgstr ""
 msgid "Profit & Loss Drilldown"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:168 reporting/rep707.php:206
-#: reporting/includes/reports_classes.inc:235
+#: gl/inquiry/profit_loss.php:30 reporting/rep707.php:210
+#: reporting/includes/reports_classes.inc:249
 msgid "Accumulated"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:168 reporting/rep707.php:251
-#: reporting/includes/reports_classes.inc:235
+#: gl/inquiry/profit_loss.php:31 reporting/rep707.php:257
+#: reporting/includes/reports_classes.inc:249
 msgid "Period Y-1"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:168 reporting/rep707.php:242
-#: reporting/includes/reports_classes.inc:235
+#: gl/inquiry/profit_loss.php:32 reporting/rep707.php:246
+#: reporting/includes/reports_classes.inc:249
 msgid "Budget"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:169 reporting/reports_main.php:288
-#: reporting/reports_main.php:334 reporting/reports_main.php:375
+#: gl/inquiry/profit_loss.php:178 reporting/reports_main.php:393
+#: reporting/reports_main.php:444 reporting/reports_main.php:490
 msgid "Compare to"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:230
+#: gl/inquiry/profit_loss.php:236
 msgid "Group/Account Name"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:233 reporting/rep707.php:206
+#: gl/inquiry/profit_loss.php:239 reporting/rep707.php:210
 msgid "Achieved %"
 msgstr ""
 
@@ -4001,39 +4584,32 @@ msgstr ""
 msgid "Tax Inquiry"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:82 reporting/rep709.php:172
+#: gl/inquiry/tax_inquiry.php:80 reporting/rep709.php:189
 msgid "Outputs"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:82 reporting/rep709.php:172
+#: gl/inquiry/tax_inquiry.php:80 reporting/rep709.php:189
 msgid "Inputs"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:100
+#: gl/inquiry/tax_inquiry.php:96
 msgid "Charged on sales"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:100 reporting/rep709.php:172
-msgid "Output Tax"
-msgstr ""
-
-#: gl/inquiry/tax_inquiry.php:106
+#: gl/inquiry/tax_inquiry.php:102
 msgid "Paid on purchases"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:106 reporting/rep709.php:172
-msgid "Input Tax"
-msgstr ""
-
-#: gl/inquiry/tax_inquiry.php:112
+#: gl/inquiry/tax_inquiry.php:108
 msgid "Net payable or collectible"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:119 reporting/rep709.php:203
+#: gl/inquiry/tax_inquiry.php:115 reporting/rep709.php:221
 msgid "Total payable or refund"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:16 reporting/reports_main.php:237
+#: gl/manage/bank_accounts.php:16 reporting/reports_main.php:331
+#: reporting/reports_main.php:339
 msgid "Bank Accounts"
 msgstr ""
 
@@ -4041,119 +4617,162 @@ 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 or has transactions. Select "
+"another empty 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/view/bank_transfer_view.php:69
+#: 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:129 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
+#: gl/view/gl_payment_view.php:64 includes/dashboard.inc:486
+#: includes/dashboard.inc:571 includes/dashboard.inc:606
+#: inventory/prices.php:151 inventory/purchasing_data.php:150
+#: purchasing/view/view_supp_credit.php:49
+#: purchasing/view/view_supp_invoice.php:54
+#: purchasing/inquiry/po_search_completed.php:116
+#: purchasing/inquiry/po_search.php:123
+#: purchasing/inquiry/supplier_allocation_inquiry.php:143
+#: purchasing/inquiry/supplier_allocation_inquiry.php:153
+#: purchasing/inquiry/supplier_inquiry.php:50
 #: purchasing/inquiry/supplier_inquiry.php:180
-#: purchasing/inquiry/supplier_inquiry.php.orig:72
-#: purchasing/inquiry/supplier_inquiry.php.orig:169
-#: purchasing/inquiry/supplier_inquiry.php.orig: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:133 reporting/rep102.php:139
-#: reporting/rep104.php:114 reporting/rep201.php:126 reporting/rep202.php:136
-#: reporting/rep203.php:99 sales/customer_credit_invoice.php:239
-#: sales/customer_delivery.php:337 sales/customer_invoice.php:398
-#: sales/allocations/customer_allocation_main.php:98
-#: sales/allocations/customer_allocation_main.php:106
+#: reporting/rep101.php:142 reporting/rep102.php:129 reporting/rep102.php:135
+#: reporting/rep103.php:229 reporting/rep104.php:114 reporting/rep201.php:117
+#: reporting/rep202.php:136 reporting/rep203.php:96 reporting/rep205.php:141
+#: sales/customer_credit_invoice.php:236 sales/customer_delivery.php:328
+#: sales/customer_invoice.php:455
+#: sales/allocations/customer_allocation_main.php:97
+#: sales/allocations/customer_allocation_main.php:105
 #: sales/view/view_credit.php:70 sales/view/view_dispatch.php:86
-#: sales/view/view_invoice.php:85
-#: sales/inquiry/customer_allocation_inquiry.php:148
-#: sales/inquiry/customer_allocation_inquiry.php:158
-#: 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
+#: sales/view/view_invoice.php:86
+#: sales/inquiry/customer_allocation_inquiry.php:153
+#: sales/inquiry/customer_allocation_inquiry.php:163
+#: sales/inquiry/customer_inquiry.php:121
+#: sales/inquiry/customer_inquiry.php:201
+#: sales/inquiry/customer_inquiry.php:213
+#: sales/inquiry/sales_deliveries_view.php:178
+#: sales/inquiry/sales_orders_view.php:262
+#: sales/inquiry/sales_orders_view.php:276
 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:79
+#: gl/manage/bank_accounts.php:110 reporting/includes/doctext.inc:259
 msgid "Bank"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:103 includes/ui/ui_view.inc:488
-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:164
 msgid "Bank Account Name:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:163 gl/manage/bank_accounts.php:167
+#: gl/manage/bank_accounts.php:168 gl/manage/bank_accounts.php:173
 msgid "Account Type:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:171 gl/manage/bank_accounts.php:175
+#: gl/manage/bank_accounts.php:177 gl/manage/bank_accounts.php:182
 msgid "Bank Account Currency:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:178
+#: gl/manage/bank_accounts.php:185
 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:192
 msgid "Bank Account GL Code:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:185
+#: gl/manage/bank_accounts.php:195
 msgid "Bank Name:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:186
+#: gl/manage/bank_accounts.php:196 sales/manage/customer_branches.php:246
+#: sales/manage/customers.php:260
 msgid "Bank Account Number:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:187
+#: gl/manage/bank_accounts.php:197
 msgid "Bank Address:"
 msgstr ""
 
-#: gl/manage/currencies.php:16 includes/access_levels.inc:223
+#: 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:244
 msgid "Currencies"
 msgstr ""
 
@@ -4181,83 +4800,83 @@ 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 ""
 
@@ -4265,48 +4884,43 @@ 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 ""
 
-#: gl/manage/exchange_rates.php:127 gl/manage/exchange_rates.php:133
+#: gl/manage/exchange_rates.php:128 gl/manage/exchange_rates.php:134
 msgid "Date to Use From:"
 msgstr ""
 
-#: gl/manage/exchange_rates.php:141 includes/ui/ui_view.inc:288
-#: includes/ui/ui_view.inc:290
+#: gl/manage/exchange_rates.php:142 includes/ui/ui_view.inc:325
 msgid "Exchange Rate:"
 msgstr ""
 
-#: gl/manage/exchange_rates.php:142
-msgid "Get current ECB rate"
+#: gl/manage/exchange_rates.php:143
+msgid "Get current rate from"
 msgstr ""
 
-#: gl/manage/exchange_rates.php:148
+#: gl/manage/exchange_rates.php:149
 msgid "Exchange rates are entered against the company currency."
 msgstr ""
 
-#: gl/manage/exchange_rates.php:179
+#: gl/manage/exchange_rates.php:180
 msgid "Select a currency :"
 msgstr ""
 
-#: gl/manage/exchange_rates.php:195
+#: gl/manage/exchange_rates.php:196
 msgid "Date to Use From"
 msgstr ""
 
-#: gl/manage/exchange_rates.php:196
+#: gl/manage/exchange_rates.php:197
 msgid "Exchange Rate"
 msgstr ""
 
-#: gl/manage/exchange_rates.php:205
+#: gl/manage/exchange_rates.php:206
 msgid "The selected currency is the company currency."
 msgstr ""
 
-#: gl/manage/exchange_rates.php:206
+#: gl/manage/exchange_rates.php:207
 msgid ""
 "The company currency is the base currency so exchange rates cannot be set "
 "for it."
@@ -4350,137 +4964,141 @@ msgstr ""
 msgid "Class Name"
 msgstr ""
 
-#: gl/manage/gl_account_classes.php:110 gl/manage/gl_account_types.php:129
+#: gl/manage/gl_account_classes.php:110
 msgid "Class Type"
 msgstr ""
 
-#: gl/manage/gl_account_classes.php:112 gl/manage/gl_account_classes.php:169
-#: reporting/rep706.php:211
+#: gl/manage/gl_account_classes.php:112 gl/manage/gl_account_classes.php:168
+#: reporting/rep706.php:215
 msgid "Balance Sheet"
 msgstr ""
 
-#: gl/manage/gl_account_classes.php:157 gl/manage/gl_account_classes.php:163
+#: gl/manage/gl_account_classes.php:156 gl/manage/gl_account_classes.php:162
 msgid "Class ID:"
 msgstr ""
 
-#: gl/manage/gl_account_classes.php:166
+#: gl/manage/gl_account_classes.php:165
 msgid "Class Name:"
 msgstr ""
 
-#: gl/manage/gl_account_classes.php:171 gl/manage/gl_account_types.php:193
+#: gl/manage/gl_account_classes.php:170
 msgid "Class Type:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:16 reporting/rep701.php:115
+#: gl/manage/gl_accounts.php:20 reporting/rep701.php:116
 msgid "Chart of Accounts"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:53
+#: gl/manage/gl_accounts.php:57
 msgid "The account code must be entered."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:59
+#: gl/manage/gl_accounts.php:63
 msgid "The account name cannot be empty."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:65
+#: gl/manage/gl_accounts.php:69
 msgid "The account code must be numeric."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:81
+#: gl/manage/gl_accounts.php:84
 msgid "The account belongs to a bank account and cannot be inactivated."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:90
+#: gl/manage/gl_accounts.php:93
 msgid "Account data has been updated."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:99
+#: gl/manage/gl_accounts.php:102
 msgid "New account has been added."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:117
+#: gl/manage/gl_accounts.php:106
+msgid "Account not added, possible duplicate Account Code."
+msgstr ""
+
+#: gl/manage/gl_accounts.php:121
 msgid ""
 "Cannot delete this account because transactions have been created using this "
 "account."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:123
+#: gl/manage/gl_accounts.php:127
 msgid ""
 "Cannot delete this account because it is used as one of the company default "
 "GL accounts."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:129
+#: gl/manage/gl_accounts.php:133
 msgid "Cannot delete this account because it is used by a bank account."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:135
+#: gl/manage/gl_accounts.php:139
 msgid ""
 "Cannot delete this account because it is used by one or more Item Categories."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:141
+#: gl/manage/gl_accounts.php:145
 msgid "Cannot delete this account because it is used by one or more Items."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:147
+#: gl/manage/gl_accounts.php:151
 msgid "Cannot delete this account because it is used by one or more Taxes."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:153
+#: gl/manage/gl_accounts.php:157
 msgid ""
 "Cannot delete this account because it is used by one or more Customer "
 "Branches."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:159
+#: gl/manage/gl_accounts.php:162
 msgid "Cannot delete this account because it is used by one or more suppliers."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:165
+#: gl/manage/gl_accounts.php:168
 msgid ""
 "Cannot delete this account because it is used by one or more Quick Entry "
 "Lines."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:183
+#: gl/manage/gl_accounts.php:186
 msgid "Selected account has been deleted"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:198
+#: gl/manage/gl_accounts.php:201
 msgid "New account"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:244
+#: gl/manage/gl_accounts.php:247
 msgid "Account Code 2:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:246
+#: gl/manage/gl_accounts.php:249
 msgid "Account Name:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:248
+#: gl/manage/gl_accounts.php:251
 msgid "Account Group:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:250
+#: gl/manage/gl_accounts.php:253
 msgid "Account Tags:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:252
+#: gl/manage/gl_accounts.php:255
 msgid "Account status:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:257
+#: gl/manage/gl_accounts.php:260
 msgid "Add Account"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:261
+#: gl/manage/gl_accounts.php:264
 msgid "Update Account"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:262
+#: gl/manage/gl_accounts.php:265
 msgid "Delete account"
 msgstr ""
 
@@ -4500,60 +5118,65 @@ msgstr ""
 msgid "This account group id is already in use."
 msgstr ""
 
-#: gl/manage/gl_account_types.php:50
+#: gl/manage/gl_account_types.php:49
 msgid "You cannot set an account group to be a subgroup of itself."
 msgstr ""
 
-#: gl/manage/gl_account_types.php:68
+#: gl/manage/gl_account_types.php:67
 msgid "Selected account type has been updated"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:73
+#: gl/manage/gl_account_types.php:72
 msgid "New account type has been added"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:90
+#: gl/manage/gl_account_types.php:88
 msgid ""
 "Cannot delete this account group because GL accounts have been created "
 "referring to it."
 msgstr ""
 
-#: gl/manage/gl_account_types.php:96
+#: gl/manage/gl_account_types.php:94
 msgid ""
 "Cannot delete this account group because GL account groups have been created "
 "referring to it."
 msgstr ""
 
-#: gl/manage/gl_account_types.php:112
+#: gl/manage/gl_account_types.php:110
 msgid "Selected account group has been deleted"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:129
+#: gl/manage/gl_account_types.php:127
 msgid "Group ID"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:129 sales/manage/sales_groups.php:85
+#: gl/manage/gl_account_types.php:127 sales/manage/sales_groups.php:85
 msgid "Group Name"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:129
+#: gl/manage/gl_account_types.php:127
 msgid "Subgroup Of"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:188
+#: gl/manage/gl_account_types.php:186
 msgid "ID:"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:191
+#: gl/manage/gl_account_types.php:189
 msgid "Subgroup Of:"
 msgstr ""
 
+#: gl/manage/gl_account_types.php:191
+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
+#: gl/manage/gl_quick_entries.php:58 includes/ui/class.crud_view.inc:296
+#: includes/ui/class.crud_view.inc:300 includes/ui/simple_crud_class.inc:219
+#: includes/ui/ui_input.inc:224
 msgid "Add new"
 msgstr ""
 
@@ -4577,77 +5200,81 @@ msgstr ""
 msgid "New quick entry has been added"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:124
+#: gl/manage/gl_quick_entries.php:128
 msgid "Selected quick entry line has been updated"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:130
+#: gl/manage/gl_quick_entries.php:134
 msgid "New quick entry line has been added"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:142
+#: gl/manage/gl_quick_entries.php:146
 msgid "Selected quick entry has been deleted"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:147
+#: gl/manage/gl_quick_entries.php:151
 msgid "The Quick Entry has Quick Entry Lines. Cannot be deleted."
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:163
+#: gl/manage/gl_quick_entries.php:167
 msgid "Selected quick entry line has been deleted"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:171
+#: gl/manage/gl_quick_entries.php:175
 msgid "Base Amount"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:226
-msgid "Entry Type"
+#: gl/manage/gl_quick_entries.php:190 gl/manage/gl_quick_entries.php:231
+msgid "Usage"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:230
-msgid "Balance Based"
+#: gl/manage/gl_quick_entries.php:233
+msgid "Entry Type"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:240 gl/includes/ui/gl_journal_ui.inc:57
-msgid "Yearly"
+#: gl/manage/gl_quick_entries.php:237
+msgid "Balance Based"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:245
+#: gl/manage/gl_quick_entries.php:252
 msgid "Base Amount Description"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:246
+#: gl/manage/gl_quick_entries.php:253
 msgid "Default Base Amount"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:255
+#: gl/manage/gl_quick_entries.php:262
 msgid "Quick Entry Lines"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:261 gl/manage/gl_quick_entries.php:263
-#: gl/manage/gl_quick_entries.php:265
+#: gl/manage/gl_quick_entries.php:268 gl/manage/gl_quick_entries.php:270
+#: gl/manage/gl_quick_entries.php:272
 msgid "Post"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:261 gl/manage/gl_quick_entries.php:263
-#: gl/manage/gl_quick_entries.php:265
+#: gl/manage/gl_quick_entries.php:268 gl/manage/gl_quick_entries.php:270
+#: gl/manage/gl_quick_entries.php:272
 msgid "Account/Tax Type"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:320
+#: gl/manage/gl_quick_entries.php:329
 msgid "Posted"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:329 sales/customer_delivery.php:430
-#: sales/customer_invoice.php:449
+#: gl/manage/gl_quick_entries.php:338 sales/customer_delivery.php:421
+#: sales/customer_invoice.php:519 sales/customer_invoice.php:522
 msgid "Tax Type"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:337
+#: gl/manage/gl_quick_entries.php:346
 msgid "Part"
 msgstr ""
 
+#: gl/manage/gl_quick_entries.php:350
+msgid "Line memo"
+msgstr ""
+
 #: gl/manage/revaluate_currencies.php:23
 msgid "Revaluation of Currency Accounts"
 msgstr ""
@@ -4661,11 +5288,11 @@ msgstr ""
 msgid "%d Journal Entries for AR/AP accounts have been added"
 msgstr ""
 
-#: gl/manage/revaluate_currencies.php:104
+#: gl/manage/revaluate_currencies.php:94
 msgid "Date for Revaluation:"
 msgstr ""
 
-#: gl/manage/revaluate_currencies.php:109
+#: gl/manage/revaluate_currencies.php:99
 msgid "Revaluate Currencies"
 msgstr ""
 
@@ -4696,7 +5323,7 @@ msgstr ""
 msgid "Transfer Type"
 msgstr ""
 
-#: gl/view/bank_transfer_view.php:92 inventory/view/view_transfer.php:76
+#: gl/view/bank_transfer_view.php:92 inventory/view/view_transfer.php:70
 msgid "This transfer has been voided."
 msgstr ""
 
@@ -4708,57 +5335,49 @@ msgstr ""
 msgid "GL Deposit"
 msgstr ""
 
-#: gl/view/gl_deposit_view.php:71 gl/includes/db/gl_db_banking.inc:212
-#: reporting/reports_main.php:88 reporting/reports_main.php:95
-#: reporting/reports_main.php:102 reporting/reports_main.php:114
-#: reporting/reports_main.php:121 reporting/reports_main.php:127
-#: reporting/reports_main.php:163 reporting/reports_main.php:169
-#: reporting/reports_main.php:218
+#: gl/view/gl_deposit_view.php:71 gl/includes/db/gl_db_banking.inc:227
+#: reporting/reports_main.php:98 reporting/reports_main.php:108
+#: reporting/reports_main.php:116 reporting/reports_main.php:130
+#: reporting/reports_main.php:138 reporting/reports_main.php:145
+#: reporting/reports_main.php:194 reporting/reports_main.php:201
+#: reporting/reports_main.php:300
 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:132
-#: gl/includes/ui/gl_bank_ui.inc:135 gl/includes/ui/gl_bank_ui.inc:138
-#: gl/includes/ui/gl_bank_ui.inc.orig:132
-#: gl/includes/ui/gl_bank_ui.inc.orig:135
-#: gl/includes/ui/gl_bank_ui.inc.orig:138 gl/includes/ui/gl_journal_ui.inc:83
-#: gl/includes/ui/gl_journal_ui.inc:86 gl/includes/ui/gl_journal_ui.inc:89
-#: reporting/rep701.php:109
-msgid "Account Code"
+#: gl/view/gl_deposit_view.php:99 gl/view/gl_payment_view.php:97
+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/includes/ui/gl_bank_ui.inc:132 gl/includes/ui/gl_bank_ui.inc:135
-#: gl/includes/ui/gl_bank_ui.inc:138 gl/includes/ui/gl_bank_ui.inc.orig:132
-#: gl/includes/ui/gl_bank_ui.inc.orig:135
-#: gl/includes/ui/gl_bank_ui.inc.orig:138 gl/includes/ui/gl_journal_ui.inc:83
-#: gl/includes/ui/gl_journal_ui.inc:86 gl/includes/ui/gl_journal_ui.inc:89
+#: gl/view/gl_deposit_view.php:104 gl/view/gl_deposit_view.php:107
+#: gl/view/gl_deposit_view.php:110 gl/view/gl_payment_view.php:103
+#: gl/view/gl_payment_view.php:106 gl/view/gl_payment_view.php:109
+#: gl/includes/ui/gl_bank_ui.inc:146 gl/includes/ui/gl_bank_ui.inc:149
+#: gl/includes/ui/gl_bank_ui.inc:152 gl/includes/ui/gl_journal_ui.inc:102
+#: gl/includes/ui/gl_journal_ui.inc:105 gl/includes/ui/gl_journal_ui.inc:108
 msgid "Account Description"
 msgstr ""
 
@@ -4774,878 +5393,1333 @@ 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 ""
 
-#: gl/view/gl_trans_view.php:16 gl/view/gl_trans_view.php:35
+#: gl/view/gl_trans_view.php:16 gl/view/gl_trans_view.php:38
 msgid "General Ledger Transaction Details"
 msgstr ""
 
-#: gl/view/gl_trans_view.php:54
+#: gl/view/gl_trans_view.php:39
+msgid "Transaction Date"
+msgstr ""
+
+#: gl/view/gl_trans_view.php:39
+msgid "Journal #"
+msgstr ""
+
+#: gl/view/gl_trans_view.php:42
+msgid "Document Date"
+msgstr ""
+
+#: gl/view/gl_trans_view.php:42
+msgid "Event Date"
+msgstr ""
+
+#: gl/view/gl_trans_view.php:48
+msgid "Supplier Reference"
+msgstr ""
+
+#: gl/view/gl_trans_view.php:70
+msgid "Entered By"
+msgstr ""
+
+#: gl/view/gl_trans_view.php:75
+msgid "Exchange rate"
+msgstr ""
+
+#: gl/view/gl_trans_view.php:76
+msgid "Source document"
+msgstr ""
+
+#: gl/view/gl_trans_view.php:86
 msgid "No general ledger transactions have been created for"
 msgstr ""
 
-#: gl/view/gl_trans_view.php:54
+#: gl/view/gl_trans_view.php:86
 msgid "number"
 msgstr ""
 
-#: gl/view/gl_trans_view.php:120
+#: gl/view/gl_trans_view.php:95 gl/view/gl_trans_view.php:98
+#: gl/view/gl_trans_view.php:101
+msgid "Journal Date"
+msgstr ""
+
+#: gl/view/gl_trans_view.php:158
 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:59 gl/includes/db/gl_db_banking.inc:62
+#: gl/includes/db/gl_db_banking.inc:52 gl/includes/db/gl_db_banking.inc:56
+#: gl/includes/db/gl_db_banking.inc:77 gl/includes/db/gl_db_banking.inc:80
+#: gl/includes/db/gl_db_banking.inc:270
 msgid "Exchange Variance"
 msgstr ""
 
-#: gl/includes/db/gl_db_banking.inc:212 reporting/reports_main.php:89
-#: reporting/reports_main.php:96 reporting/reports_main.php:103
-#: reporting/reports_main.php:115 reporting/reports_main.php:122
-#: reporting/reports_main.php:128 reporting/reports_main.php:164
-#: reporting/reports_main.php:170 reporting/reports_main.php:219
+#: gl/includes/db/gl_db_banking.inc:227 reporting/reports_main.php:99
+#: reporting/reports_main.php:109 reporting/reports_main.php:117
+#: reporting/reports_main.php:131 reporting/reports_main.php:139
+#: reporting/reports_main.php:146 reporting/reports_main.php:195
+#: reporting/reports_main.php:202 reporting/reports_main.php:301
 msgid "To"
 msgstr ""
 
-#: gl/includes/db/gl_db_banking.inc:311
+#: gl/includes/db/gl_db_banking.inc:533 gl/includes/db/gl_journal.inc:114
+#: purchasing/includes/db/invoice_db.inc:139
 msgid "Document reentered."
 msgstr ""
 
-#: gl/includes/db/gl_db_rates.inc:129
+#: gl/includes/db/gl_db_trans.inc:97 includes/ui/items_cart.inc:359
 #, 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:23 gl/includes/ui/gl_bank_ui.inc.orig:23
-#: 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:152
-#: purchasing/allocations/supplier_allocate.php:54
-#: sales/allocations/customer_allocate.php:53
-#: sales/includes/ui/sales_credit_ui.inc:121
+#: gl/includes/ui/gl_bank_ui.inc:24
+#: inventory/includes/item_adjustments_ui.inc:35
+#: inventory/includes/stock_transfers_ui.inc:40
+#: manufacturing/work_order_add_finished.php:186
+#: manufacturing/work_order_costs.php:133
+#: purchasing/allocations/supplier_allocate.php:56
+#: sales/allocations/customer_allocate.php:59
+#: sales/includes/ui/sales_credit_ui.inc:117
 msgid "Date:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:50 gl/includes/ui/gl_bank_ui.inc.orig: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.orig:55
+#: gl/includes/ui/gl_bank_ui.inc:57
 msgid "To the Order of:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:62 gl/includes/ui/gl_bank_ui.inc.orig:62
-#: inventory/purchasing_data.php:184 inventory/purchasing_data.php:188
-#: 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:61 inventory/purchasing_data.php:206
+#: inventory/purchasing_data.php:210 purchasing/includes/ui/invoice_ui.inc:90
+#: purchasing/includes/ui/invoice_ui.inc:98
+#: purchasing/includes/ui/invoice_ui.inc:100
+#: purchasing/includes/ui/po_ui.inc:108 purchasing/includes/ui/po_ui.inc:113
 msgid "Supplier:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:65 gl/includes/ui/gl_bank_ui.inc.orig:65
-#: sales/manage/recurrent_invoices.php:169
+#: gl/includes/ui/gl_bank_ui.inc:64 sales/manage/recurrent_invoices.php:195
 #: sales/includes/ui/sales_credit_ui.inc:29
-#: sales/includes/ui/sales_order_ui.inc:278
+#: sales/includes/ui/sales_order_ui.inc:267
 msgid "Customer:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:69 gl/includes/ui/gl_bank_ui.inc.orig:69
-#: sales/customer_payments.php:238 sales/customer_payments.php.orig:240
-#: sales/manage/recurrent_invoices.php:172
+#: gl/includes/ui/gl_bank_ui.inc:68 sales/customer_payments.php:324
+#: sales/manage/recurrent_invoices.php:198
 #: sales/includes/ui/sales_credit_ui.inc:37
-#: sales/includes/ui/sales_order_ui.inc:285
+#: sales/includes/ui/sales_order_ui.inc:274
 msgid "Branch:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:87 gl/includes/ui/gl_bank_ui.inc.orig:87
-#: gl/includes/ui/gl_journal_ui.inc:58 gl/includes/ui/gl_journal_ui.inc:62
-#: purchasing/includes/ui/invoice_ui.inc:231
+#: gl/includes/ui/gl_bank_ui.inc:82 gl/includes/ui/gl_bank_ui.inc:85
+#: sales/customer_payments.php:340
+msgid "This customer account is on hold."
+msgstr ""
+
+#: gl/includes/ui/gl_bank_ui.inc:98 gl/includes/ui/gl_journal_ui.inc:70
+#: gl/includes/ui/gl_journal_ui.inc:76
+#: purchasing/includes/ui/invoice_ui.inc:264
 msgid "Go"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:167 gl/includes/ui/gl_bank_ui.inc.orig:167
+#: gl/includes/ui/gl_bank_ui.inc:114
+msgid "Into:"
+msgstr ""
+
+#: gl/includes/ui/gl_bank_ui.inc:180 includes/ui/class.crud_view.inc:281
 #: includes/ui/simple_crud_class.inc:52
-#: inventory/includes/item_adjustments_ui.inc: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
-#: sales/includes/ui/sales_credit_ui.inc:198
-#: sales/includes/ui/sales_order_ui.inc:203
+#: inventory/includes/item_adjustments_ui.inc:100
+#: inventory/includes/stock_transfers_ui.inc:83
+#: manufacturing/includes/work_order_issue_ui.inc:62
+#: purchasing/includes/ui/invoice_ui.inc:551
+#: purchasing/includes/ui/po_ui.inc:250
+#: sales/includes/ui/sales_credit_ui.inc:193
+#: sales/includes/ui/sales_order_ui.inc:197
 msgid "Edit document line"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:169 gl/includes/ui/gl_bank_ui.inc.orig:169
+#: gl/includes/ui/gl_bank_ui.inc:182 includes/ui/class.crud_view.inc:285
 #: includes/ui/simple_crud_class.inc:54
-#: inventory/includes/item_adjustments_ui.inc: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
-#: sales/includes/ui/sales_credit_ui.inc:200
-#: sales/includes/ui/sales_order_ui.inc:205
+#: inventory/includes/item_adjustments_ui.inc:102
+#: inventory/includes/stock_transfers_ui.inc:84
+#: manufacturing/includes/work_order_issue_ui.inc:64
+#: purchasing/includes/ui/invoice_ui.inc:318
+#: purchasing/includes/ui/po_ui.inc:252
+#: sales/includes/ui/sales_credit_ui.inc:195
+#: sales/includes/ui/sales_order_ui.inc:199
 msgid "Remove line from document"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:258 gl/includes/ui/gl_bank_ui.inc.orig:258
-#: gl/includes/ui/gl_journal_ui.inc:222 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:132
-#: purchasing/includes/ui/po_ui.inc:443
-#: sales/includes/ui/sales_credit_ui.inc:294
-#: sales/includes/ui/sales_order_ui.inc:556
+#: gl/includes/ui/gl_bank_ui.inc:268 gl/includes/ui/gl_journal_ui.inc:268
+#: includes/ui/simple_crud_class.inc:56
+#: inventory/includes/item_adjustments_ui.inc:191
+#: inventory/includes/stock_transfers_ui.inc:151
+#: manufacturing/includes/work_order_issue_ui.inc:133
+#: purchasing/includes/ui/po_ui.inc:437
+#: sales/includes/ui/sales_credit_ui.inc:289
+#: sales/includes/ui/sales_order_ui.inc:548
 msgid "Confirm changes"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:260 gl/includes/ui/gl_bank_ui.inc.orig:260
-#: gl/includes/ui/gl_journal_ui.inc:224 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:134
-#: purchasing/includes/ui/po_ui.inc:445
-#: sales/includes/ui/sales_credit_ui.inc:296
-#: sales/includes/ui/sales_order_ui.inc:558
+#: gl/includes/ui/gl_bank_ui.inc:270 gl/includes/ui/gl_journal_ui.inc:270
+#: includes/ui/class.crud_view.inc:292 includes/ui/simple_crud_class.inc:58
+#: inventory/includes/item_adjustments_ui.inc:193
+#: inventory/includes/stock_transfers_ui.inc:153
+#: manufacturing/includes/work_order_issue_ui.inc:135
+#: purchasing/includes/ui/po_ui.inc:439
+#: sales/includes/ui/sales_credit_ui.inc:291
+#: sales/includes/ui/sales_order_ui.inc:550
 msgid "Cancel changes"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:265 gl/includes/ui/gl_bank_ui.inc.orig:265
-#: 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:140
-#: purchasing/includes/ui/po_ui.inc:451
-#: sales/includes/ui/sales_credit_ui.inc:302
-#: sales/includes/ui/sales_order_ui.inc:564
+#: gl/includes/ui/gl_bank_ui.inc:275 gl/includes/ui/gl_journal_ui.inc:274
+#: inventory/includes/item_adjustments_ui.inc:199
+#: inventory/includes/stock_transfers_ui.inc:159
+#: manufacturing/includes/work_order_issue_ui.inc:141
+#: purchasing/includes/ui/po_ui.inc:445
+#: sales/includes/ui/sales_credit_ui.inc:297
+#: sales/includes/ui/sales_order_ui.inc:556
 msgid "Add Item"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:266 gl/includes/ui/gl_bank_ui.inc.orig:266
-#: inventory/includes/item_adjustments_ui.inc:167
-#: inventory/includes/stock_transfers_ui.inc:147
-#: manufacturing/includes/work_order_issue_ui.inc:141
-#: purchasing/includes/ui/po_ui.inc:452
-#: sales/includes/ui/sales_credit_ui.inc:303
-#: sales/includes/ui/sales_order_ui.inc:565
+#: gl/includes/ui/gl_bank_ui.inc:276
+#: inventory/includes/item_adjustments_ui.inc:200
+#: inventory/includes/stock_transfers_ui.inc:160
+#: manufacturing/includes/work_order_issue_ui.inc:142
+#: purchasing/includes/ui/po_ui.inc:446
+#: sales/includes/ui/sales_credit_ui.inc:298
+#: sales/includes/ui/sales_order_ui.inc:557
 msgid "Add new item to document"
 msgstr ""
 
-#: gl/includes/ui/gl_journal_ui.inc:38
-msgid "Reverse Transaction:"
+#: gl/includes/ui/gl_bank_ui.inc:299
+msgid "Settled AR Amount:"
 msgstr ""
 
-#: gl/includes/ui/gl_journal_ui.inc:46 includes/sysnames.inc:98
-msgid "Quick Entry"
+#: gl/includes/ui/gl_bank_ui.inc:299
+msgid "Settled AP Amount:"
 msgstr ""
 
-#: gl/includes/ui/gl_journal_ui.inc:57
-msgid "balance from account"
+#: gl/includes/ui/gl_journal_ui.inc:26
+msgid "Journal Date:"
 msgstr ""
 
-#: gl/includes/ui/gl_journal_ui.inc:123
-msgid "Edit journal line"
+#: gl/includes/ui/gl_journal_ui.inc:33 inventory/prices.php:193
+msgid "Currency:"
 msgstr ""
 
-#: gl/includes/ui/gl_journal_ui.inc:125
-msgid "Remove line from journal"
+#: gl/includes/ui/gl_journal_ui.inc:43
+msgid "Document Date:"
 msgstr ""
 
-#: gl/includes/ui/gl_journal_ui.inc:229
-msgid "Add new line to journal"
+#: gl/includes/ui/gl_journal_ui.inc:44
+msgid "Event Date:"
 msgstr ""
 
-#: includes/access_levels.inc:56
-msgid "System administration"
+#: gl/includes/ui/gl_journal_ui.inc:45
+msgid "Source ref:"
 msgstr ""
 
-#: includes/access_levels.inc:57
+#: gl/includes/ui/gl_journal_ui.inc:57 includes/sysnames.inc:103
+msgid "Quick Entry"
+msgstr ""
+
+#: gl/includes/ui/gl_journal_ui.inc:69
+msgid "balance from account"
+msgstr ""
+
+#: gl/includes/ui/gl_journal_ui.inc:74
+msgid "Additional info:"
+msgstr ""
+
+#: gl/includes/ui/gl_journal_ui.inc:81
+msgid "Include in tax register:"
+msgstr ""
+
+#: gl/includes/ui/gl_journal_ui.inc:151
+msgid "Edit journal line"
+msgstr ""
+
+#: gl/includes/ui/gl_journal_ui.inc:153
+msgid "Remove line from journal"
+msgstr ""
+
+#: gl/includes/ui/gl_journal_ui.inc:216 gl/includes/ui/gl_journal_ui.inc:234
+msgid "[Select account]"
+msgstr ""
+
+#: gl/includes/ui/gl_journal_ui.inc:275
+msgid "Add new line to journal"
+msgstr ""
+
+#: includes/access_levels.inc:60
+msgid "System administration"
+msgstr ""
+
+#: includes/access_levels.inc:61
 msgid "Company setup"
 msgstr ""
 
-#: includes/access_levels.inc:58
+#: includes/access_levels.inc:62
 msgid "Special maintenance"
 msgstr ""
 
-#: includes/access_levels.inc:59
+#: includes/access_levels.inc:63
 msgid "Sales configuration"
 msgstr ""
 
-#: includes/access_levels.inc:60
+#: includes/access_levels.inc:64
 msgid "Sales transactions"
 msgstr ""
 
-#: includes/access_levels.inc:61
+#: includes/access_levels.inc:65
 msgid "Sales related reports"
 msgstr ""
 
-#: includes/access_levels.inc:62
+#: includes/access_levels.inc:66
 msgid "Purchase configuration"
 msgstr ""
 
-#: includes/access_levels.inc:63
+#: includes/access_levels.inc:67
 msgid "Purchase transactions"
 msgstr ""
 
-#: includes/access_levels.inc:64
+#: includes/access_levels.inc:68
 msgid "Purchase analytics"
 msgstr ""
 
-#: includes/access_levels.inc:65
+#: includes/access_levels.inc:69
 msgid "Inventory configuration"
 msgstr ""
 
-#: includes/access_levels.inc:66
+#: includes/access_levels.inc:70
 msgid "Inventory operations"
 msgstr ""
 
-#: includes/access_levels.inc:67
+#: includes/access_levels.inc:71
 msgid "Inventory analytics"
 msgstr ""
 
-#: includes/access_levels.inc:68
+#: includes/access_levels.inc:72
+msgid "Fixed Assets configuration"
+msgstr ""
+
+#: includes/access_levels.inc:73
+msgid "Fixed Assets operations"
+msgstr ""
+
+#: includes/access_levels.inc:74
+msgid "Fixed Assets analytics"
+msgstr ""
+
+#: includes/access_levels.inc:75
 msgid "Manufacturing configuration"
 msgstr ""
 
-#: includes/access_levels.inc:69
+#: includes/access_levels.inc:76
 msgid "Manufacturing transactions"
 msgstr ""
 
-#: includes/access_levels.inc:70
+#: includes/access_levels.inc:77
 msgid "Manufacturing analytics"
 msgstr ""
 
-#: includes/access_levels.inc:71
+#: includes/access_levels.inc:78
 msgid "Dimensions configuration"
 msgstr ""
 
-#: includes/access_levels.inc:72 inventory/manage/items.php:351
-#: reporting/reports_main.php:222
+#: includes/access_levels.inc:79 inventory/manage/items.php:456
+#: reporting/reports_main.php:318
 msgid "Dimensions"
 msgstr ""
 
-#: includes/access_levels.inc:73
+#: includes/access_levels.inc:80
 msgid "Banking & GL configuration"
 msgstr ""
 
-#: includes/access_levels.inc:74
+#: includes/access_levels.inc:81
 msgid "Banking & GL transactions"
 msgstr ""
 
-#: includes/access_levels.inc:75
+#: includes/access_levels.inc:82
 msgid "Banking & GL analytics"
 msgstr ""
 
-#: includes/access_levels.inc:93
+#: includes/access_levels.inc:100
 msgid "Install/update companies"
 msgstr ""
 
-#: includes/access_levels.inc:94
+#: includes/access_levels.inc:101
 msgid "Install/update languages"
 msgstr ""
 
-#: includes/access_levels.inc:95
+#: includes/access_levels.inc:102
 msgid "Install/upgrade modules"
 msgstr ""
 
-#: includes/access_levels.inc:96
+#: includes/access_levels.inc:103
 msgid "Software upgrades"
 msgstr ""
 
-#: includes/access_levels.inc:100
+#: includes/access_levels.inc:107
 msgid "Company parameters"
 msgstr ""
 
-#: includes/access_levels.inc:101
+#: includes/access_levels.inc:108
 msgid "Access levels edition"
 msgstr ""
 
-#: includes/access_levels.inc:102
+#: includes/access_levels.inc:109
 msgid "Users setup"
 msgstr ""
 
-#: includes/access_levels.inc:103
+#: includes/access_levels.inc:110
 msgid "Point of sales definitions"
 msgstr ""
 
-#: includes/access_levels.inc:104
+#: includes/access_levels.inc:111
 msgid "Printers configuration"
 msgstr ""
 
-#: includes/access_levels.inc:105
+#: includes/access_levels.inc:112
 msgid "Print profiles"
 msgstr ""
 
-#: includes/access_levels.inc:106
+#: includes/access_levels.inc:113
 msgid "Payment terms"
 msgstr ""
 
-#: includes/access_levels.inc:107
+#: includes/access_levels.inc:114
 msgid "Shipping ways"
 msgstr ""
 
-#: includes/access_levels.inc:108
+#: includes/access_levels.inc:115
 msgid "Credit status definitions changes"
 msgstr ""
 
-#: includes/access_levels.inc:109
+#: includes/access_levels.inc:116
 msgid "Inventory locations changes"
 msgstr ""
 
-#: includes/access_levels.inc:110
+#: includes/access_levels.inc:117
 msgid "Inventory movement types"
 msgstr ""
 
-#: includes/access_levels.inc:111
+#: includes/access_levels.inc:118
 msgid "Manufacture work centres"
 msgstr ""
 
-#: includes/access_levels.inc:112
+#: includes/access_levels.inc:119
 msgid "Forms setup"
 msgstr ""
 
-#: includes/access_levels.inc:113
+#: includes/access_levels.inc:120
 msgid "Contact categories"
 msgstr ""
 
-#: includes/access_levels.inc:117
+#: includes/access_levels.inc:124
 msgid "Voiding transactions"
 msgstr ""
 
-#: includes/access_levels.inc:118
+#: includes/access_levels.inc:125
 msgid "Database backup/restore"
 msgstr ""
 
-#: includes/access_levels.inc:119
+#: includes/access_levels.inc:126
 msgid "Common view/print transactions interface"
 msgstr ""
 
-#: includes/access_levels.inc:120
+#: includes/access_levels.inc:127
 msgid "Attaching documents"
 msgstr ""
 
-#: includes/access_levels.inc:121
+#: includes/access_levels.inc:128
 msgid "Display preferences"
 msgstr ""
 
-#: includes/access_levels.inc:122
+#: includes/access_levels.inc:129
 msgid "Password changes"
 msgstr ""
 
-#: includes/access_levels.inc:127
+#: includes/access_levels.inc:130
+msgid "Edit other users transactions"
+msgstr ""
+
+#: includes/access_levels.inc:134
 msgid "Sales types"
 msgstr ""
 
-#: includes/access_levels.inc:128
+#: includes/access_levels.inc:135
 msgid "Sales prices edition"
 msgstr ""
 
-#: includes/access_levels.inc:129
+#: includes/access_levels.inc:136
 msgid "Sales staff maintenance"
 msgstr ""
 
-#: includes/access_levels.inc:130
+#: includes/access_levels.inc:137
 msgid "Sales areas maintenance"
 msgstr ""
 
-#: includes/access_levels.inc:131
+#: includes/access_levels.inc:138
 msgid "Sales groups changes"
 msgstr ""
 
-#: includes/access_levels.inc:132
+#: includes/access_levels.inc:139
 msgid "Sales templates"
 msgstr ""
 
-#: includes/access_levels.inc:133
+#: includes/access_levels.inc:140
 msgid "Recurrent invoices definitions"
 msgstr ""
 
-#: includes/access_levels.inc:135
+#: includes/access_levels.inc:142
 msgid "Sales transactions view"
 msgstr ""
 
-#: includes/access_levels.inc:136
+#: includes/access_levels.inc:143
 msgid "Sales customer and branches changes"
 msgstr ""
 
-#: includes/access_levels.inc:137
+#: includes/access_levels.inc:144
 msgid "Sales quotations"
 msgstr ""
 
-#: includes/access_levels.inc:138
+#: includes/access_levels.inc:145
 msgid "Sales orders edition"
 msgstr ""
 
-#: includes/access_levels.inc:139
+#: includes/access_levels.inc:146
 msgid "Sales deliveries edition"
 msgstr ""
 
-#: includes/access_levels.inc:140
+#: includes/access_levels.inc:147
 msgid "Sales invoices edition"
 msgstr ""
 
-#: includes/access_levels.inc:141
+#: includes/access_levels.inc:148
 msgid "Sales credit notes against invoice"
 msgstr ""
 
-#: includes/access_levels.inc:142
+#: includes/access_levels.inc:149
 msgid "Sales freehand credit notes"
 msgstr ""
 
-#: includes/access_levels.inc:143
+#: includes/access_levels.inc:150
 msgid "Customer payments entry"
 msgstr ""
 
-#: includes/access_levels.inc:144
+#: includes/access_levels.inc:151
 msgid "Customer payments allocation"
 msgstr ""
 
-#: includes/access_levels.inc:146
+#: includes/access_levels.inc:153
 msgid "Sales analytical reports"
 msgstr ""
 
-#: includes/access_levels.inc:147
+#: includes/access_levels.inc:154
 msgid "Sales document bulk reports"
 msgstr ""
 
-#: includes/access_levels.inc:148
+#: includes/access_levels.inc:155
 msgid "Sales prices listing"
 msgstr ""
 
-#: includes/access_levels.inc:149
+#: includes/access_levels.inc:156
 msgid "Sales staff listing"
 msgstr ""
 
-#: includes/access_levels.inc:150
+#: includes/access_levels.inc:157
 msgid "Customer bulk listing"
 msgstr ""
 
-#: includes/access_levels.inc:151
+#: includes/access_levels.inc:158
 msgid "Customer status report"
 msgstr ""
 
-#: includes/access_levels.inc:152
+#: includes/access_levels.inc:159
 msgid "Customer payments report"
 msgstr ""
 
-#: includes/access_levels.inc:157
+#: includes/access_levels.inc:164
 msgid "Purchase price changes"
 msgstr ""
 
-#: includes/access_levels.inc:159
+#: includes/access_levels.inc:166
 msgid "Supplier transactions view"
 msgstr ""
 
-#: includes/access_levels.inc:160
+#: includes/access_levels.inc:167
 msgid "Suppliers changes"
 msgstr ""
 
-#: includes/access_levels.inc:161
+#: includes/access_levels.inc:168
 msgid "Purchase order entry"
 msgstr ""
 
-#: includes/access_levels.inc:162
+#: includes/access_levels.inc:169
 msgid "Purchase receive"
 msgstr ""
 
-#: includes/access_levels.inc:163
+#: includes/access_levels.inc:170
 msgid "Supplier invoices"
 msgstr ""
 
-#: includes/access_levels.inc:164
+#: includes/access_levels.inc:171
 msgid "Deleting GRN items during invoice entry"
 msgstr ""
 
-#: includes/access_levels.inc:165
+#: includes/access_levels.inc:172
 msgid "Supplier credit notes"
 msgstr ""
 
-#: includes/access_levels.inc:166
+#: includes/access_levels.inc:173
 msgid "Supplier payments"
 msgstr ""
 
-#: includes/access_levels.inc:167
+#: includes/access_levels.inc:174
 msgid "Supplier payments allocations"
 msgstr ""
 
-#: includes/access_levels.inc:169
+#: includes/access_levels.inc:176
 msgid "Supplier analytical reports"
 msgstr ""
 
-#: includes/access_levels.inc:170
+#: includes/access_levels.inc:177
 msgid "Supplier document bulk reports"
 msgstr ""
 
-#: includes/access_levels.inc:171
+#: includes/access_levels.inc:178
 msgid "Supplier payments report"
 msgstr ""
 
-#: includes/access_levels.inc:175
+#: includes/access_levels.inc:182
 msgid "Stock items add/edit"
 msgstr ""
 
-#: includes/access_levels.inc:176
+#: includes/access_levels.inc:183
 msgid "Sales kits"
 msgstr ""
 
-#: includes/access_levels.inc:177
+#: includes/access_levels.inc:184
 msgid "Item categories"
 msgstr ""
 
-#: includes/access_levels.inc:178
+#: includes/access_levels.inc:185
 msgid "Units of measure"
 msgstr ""
 
-#: includes/access_levels.inc:180
+#: includes/access_levels.inc:187
 msgid "Stock status view"
 msgstr ""
 
-#: includes/access_levels.inc:181
+#: includes/access_levels.inc:188
 msgid "Stock transactions view"
 msgstr ""
 
-#: includes/access_levels.inc:182
+#: includes/access_levels.inc:189
 msgid "Foreign item codes entry"
 msgstr ""
 
-#: includes/access_levels.inc:183
+#: includes/access_levels.inc:190
 msgid "Inventory location transfers"
 msgstr ""
 
-#: includes/access_levels.inc:184
+#: includes/access_levels.inc:191
 msgid "Inventory adjustments"
 msgstr ""
 
-#: includes/access_levels.inc:186
+#: includes/access_levels.inc:193
 msgid "Reorder levels"
 msgstr ""
 
-#: includes/access_levels.inc:187
+#: includes/access_levels.inc:194
 msgid "Items analytical reports and inquiries"
 msgstr ""
 
-#: includes/access_levels.inc:188
+#: includes/access_levels.inc:195
 msgid "Inventory valuation report"
 msgstr ""
 
-#: includes/access_levels.inc:193
+#: includes/access_levels.inc:200
+msgid "Fixed Asset items add/edit"
+msgstr ""
+
+#: includes/access_levels.inc:201
+msgid "Fixed Asset categories"
+msgstr ""
+
+#: includes/access_levels.inc:202
+msgid "Fixed Asset classes"
+msgstr ""
+
+#: includes/access_levels.inc:204
+msgid "Fixed Asset transactions view"
+msgstr ""
+
+#: includes/access_levels.inc:205
+msgid "Fixed Asset location transfers"
+msgstr ""
+
+#: includes/access_levels.inc:206
+msgid "Fixed Asset disposals"
+msgstr ""
+
+#: includes/access_levels.inc:207 inventory/manage/items.php:412
+msgid "Depreciation"
+msgstr ""
+
+#: includes/access_levels.inc:209
+msgid "Fixed Asset analytical reports and inquiries"
+msgstr ""
+
+#: includes/access_levels.inc:214
 msgid "Bill of Materials"
 msgstr ""
 
-#: includes/access_levels.inc:195
+#: includes/access_levels.inc:216
 msgid "Manufacturing operations view"
 msgstr ""
 
-#: includes/access_levels.inc:196
+#: includes/access_levels.inc:217
 msgid "Work order entry"
 msgstr ""
 
-#: includes/access_levels.inc:197
+#: includes/access_levels.inc:218
 msgid "Material issues entry"
 msgstr ""
 
-#: includes/access_levels.inc:198
+#: includes/access_levels.inc:219
 msgid "Final product receive"
 msgstr ""
 
-#: includes/access_levels.inc:199
+#: includes/access_levels.inc:220
 msgid "Work order releases"
 msgstr ""
 
-#: includes/access_levels.inc:201
+#: includes/access_levels.inc:222
 msgid "Work order analytical reports and inquiries"
 msgstr ""
 
-#: includes/access_levels.inc:202
+#: includes/access_levels.inc:223
 msgid "Manufacturing cost inquiry"
 msgstr ""
 
-#: includes/access_levels.inc:203
+#: includes/access_levels.inc:224
 msgid "Work order bulk reports"
 msgstr ""
 
-#: includes/access_levels.inc:204
+#: includes/access_levels.inc:225
 msgid "Bill of materials reports"
 msgstr ""
 
-#: includes/access_levels.inc:208
+#: includes/access_levels.inc:229
 msgid "Dimension tags"
 msgstr ""
 
-#: includes/access_levels.inc:210
+#: includes/access_levels.inc:231
 msgid "Dimension view"
 msgstr ""
 
-#: includes/access_levels.inc:212
+#: includes/access_levels.inc:233
 msgid "Dimension entry"
 msgstr ""
 
-#: includes/access_levels.inc:214
+#: includes/access_levels.inc:235
 msgid "Dimension reports"
 msgstr ""
 
-#: includes/access_levels.inc:218
+#: includes/access_levels.inc:239
 msgid "Item tax type definitions"
 msgstr ""
 
-#: includes/access_levels.inc:219
+#: includes/access_levels.inc:240
 msgid "GL accounts edition"
 msgstr ""
 
-#: includes/access_levels.inc:220
+#: includes/access_levels.inc:241
 msgid "GL account groups"
 msgstr ""
 
-#: includes/access_levels.inc:221
+#: includes/access_levels.inc:242
 msgid "GL account classes"
 msgstr ""
 
-#: includes/access_levels.inc:222
+#: includes/access_levels.inc:243
 msgid "Quick GL entry definitions"
 msgstr ""
 
-#: includes/access_levels.inc:224
+#: includes/access_levels.inc:245
 msgid "Bank accounts"
 msgstr ""
 
-#: includes/access_levels.inc:225
+#: includes/access_levels.inc:246
 msgid "Tax rates"
 msgstr ""
 
-#: includes/access_levels.inc:226
+#: includes/access_levels.inc:247
 msgid "Tax groups"
 msgstr ""
 
-#: includes/access_levels.inc:227
+#: includes/access_levels.inc:248
 msgid "Fiscal years maintenance"
 msgstr ""
 
-#: includes/access_levels.inc:228
+#: includes/access_levels.inc:249
 msgid "Company GL setup"
 msgstr ""
 
-#: includes/access_levels.inc:229
+#: includes/access_levels.inc:250
 msgid "GL Account tags"
 msgstr ""
 
-#: includes/access_levels.inc:230
+#: includes/access_levels.inc:251
+msgid "Closing GL transactions"
+msgstr ""
+
+#: includes/access_levels.inc:252
+msgid "Reopening GL transactions"
+msgstr ""
+
+#: includes/access_levels.inc:253
 msgid "Allow entry on non closed Fiscal years"
 msgstr ""
 
-#: includes/access_levels.inc:232
+#: includes/access_levels.inc:255
 msgid "Bank transactions view"
 msgstr ""
 
-#: includes/access_levels.inc:233
+#: includes/access_levels.inc:256
 msgid "GL postings view"
 msgstr ""
 
-#: includes/access_levels.inc:234
+#: includes/access_levels.inc:257
 msgid "Exchange rate table changes"
 msgstr ""
 
-#: includes/access_levels.inc:235
+#: includes/access_levels.inc:258
 msgid "Bank payments"
 msgstr ""
 
-#: includes/access_levels.inc:236
+#: includes/access_levels.inc:259
 msgid "Bank deposits"
 msgstr ""
 
-#: includes/access_levels.inc:237
+#: includes/access_levels.inc:260
 msgid "Bank account transfers"
 msgstr ""
 
-#: includes/access_levels.inc:238
+#: includes/access_levels.inc:261
 msgid "Bank reconciliation"
 msgstr ""
 
-#: includes/access_levels.inc:239
+#: includes/access_levels.inc:262
 msgid "Manual journal entries"
 msgstr ""
 
-#: includes/access_levels.inc:240
+#: includes/access_levels.inc:263
 msgid "Journal entries to bank related accounts"
 msgstr ""
 
-#: includes/access_levels.inc:241
+#: includes/access_levels.inc:264
 msgid "Budget edition"
 msgstr ""
 
-#: includes/access_levels.inc:242
+#: includes/access_levels.inc:265
 msgid "Item standard costs"
 msgstr ""
 
-#: includes/access_levels.inc:245
+#: includes/access_levels.inc:268
 msgid "GL analytical reports and inquiries"
 msgstr ""
 
-#: includes/access_levels.inc:246
+#: includes/access_levels.inc:269
 msgid "Tax reports and inquiries"
 msgstr ""
 
-#: includes/access_levels.inc:247
+#: includes/access_levels.inc:270
 msgid "Bank reports and inquiries"
 msgstr ""
 
-#: includes/access_levels.inc:248
+#: includes/access_levels.inc:271
 msgid "GL reports and inquiries"
 msgstr ""
 
-#: includes/banking.inc:100
+#: includes/banking.inc:42 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:190
-#: includes/ui/ui_view.inc:826
+#: includes/current_user.inc:102 includes/ui/ui_controls.inc:215
+#: includes/ui/ui_view.inc:985
 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:162
+msgid "New password for"
+msgstr ""
+
+#: includes/current_user.inc:618
 msgid "Requesting data..."
 msgstr ""
 
-#: includes/errors.inc:123
+#: includes/dashboard.inc:89 includes/dashboard.inc:159
+#: includes/dashboard.inc:189 includes/dashboard.inc:486
+#: includes/dashboard.inc:526 includes/sysnames.inc:101
+#: includes/sysnames.inc:209 reporting/rep101.php:141 reporting/rep102.php:121
+#: reporting/rep102.php:128 reporting/rep105.php:109 reporting/rep106.php:89
+#: reporting/rep114.php:95 reporting/rep304.php:127 reporting/rep304.php:137
+#: reporting/reports_main.php:34 reporting/reports_main.php:38
+#: reporting/reports_main.php:47 reporting/reports_main.php:104
+#: reporting/reports_main.php:123 reporting/reports_main.php:239
+#: sales/create_recurrent_invoices.php:203
+#: sales/customer_credit_invoice.php:234 sales/customer_delivery.php:326
+#: sales/customer_invoice.php:431
+#: sales/allocations/customer_allocation_main.php:96
+#: sales/allocations/customer_allocation_main.php:104
+#: sales/manage/recurrent_invoices.php:128 sales/view/view_credit.php:47
+#: sales/inquiry/customer_allocation_inquiry.php:152
+#: sales/inquiry/customer_allocation_inquiry.php:162
+#: sales/inquiry/customer_inquiry.php:199
+#: sales/inquiry/customer_inquiry.php:212 sales/inquiry/customers_list.php:41
+#: sales/inquiry/customers_list.php:54
+#: sales/inquiry/sales_deliveries_view.php:169
+#: sales/inquiry/sales_orders_view.php:254
+#: sales/inquiry/sales_orders_view.php:268
+msgid "Customer"
+msgstr ""
+
+#: includes/dashboard.inc:89 includes/dashboard.inc:121
+#: includes/dashboard.inc:159 includes/dashboard.inc:165
+#: includes/dashboard.inc:292 includes/dashboard.inc:438
+#: reporting/rep304.php:127 reporting/rep309.php:99
+#: sales/manage/customer_branches.php:232 sales/manage/customers.php:265
+msgid "Sales"
+msgstr ""
+
+#: includes/dashboard.inc:103 includes/dashboard.inc:162
+#: includes/dashboard.inc:226 includes/dashboard.inc:571
+#: includes/sysnames.inc:102 includes/sysnames.inc:187
+#: includes/sysnames.inc:210 inventory/purchasing_data.php:150
+#: purchasing/includes/ui/grn_ui.inc:20 purchasing/includes/ui/grn_ui.inc:52
+#: purchasing/includes/ui/po_ui.inc:300
+#: purchasing/view/view_supp_credit.php:42
+#: purchasing/view/view_supp_invoice.php:46
+#: purchasing/inquiry/po_search_completed.php:112
+#: purchasing/inquiry/po_search.php:119
+#: purchasing/inquiry/supplier_allocation_inquiry.php:139
+#: purchasing/inquiry/supplier_allocation_inquiry.php:152
+#: purchasing/inquiry/supplier_inquiry.php:176
+#: purchasing/inquiry/supplier_inquiry.php:191
+#: purchasing/inquiry/suppliers_list.php:41
+#: purchasing/inquiry/suppliers_list.php:53
+#: purchasing/allocations/supplier_allocation_main.php:98
+#: purchasing/allocations/supplier_allocation_main.php:106
+#: reporting/rep201.php:116 reporting/rep202.php:128 reporting/rep202.php:135
+#: reporting/rep203.php:95 reporting/rep204.php:90 reporting/rep306.php:141
+#: reporting/rep306.php:151 reporting/reports_main.php:151
+#: reporting/reports_main.php:155 reporting/reports_main.php:164
+#: reporting/reports_main.php:175 reporting/reports_main.php:182
+#: reporting/reports_main.php:255
+msgid "Supplier"
+msgstr ""
+
+#: includes/dashboard.inc:103
+msgid "Purchase"
+msgstr ""
+
+#: includes/dashboard.inc:120 includes/dashboard.inc:165
+#: includes/ui/ui_controls.inc:512 includes/ui/ui_controls.inc:514
+#: inventory/transfers.php:231 inventory/inquiry/stock_list.php:29
+#: inventory/manage/items.php:29 reporting/rep402.php:108
+#: reporting/reports_main.php:256 reporting/reports_main.php:293
+msgid "Items"
+msgstr ""
+
+#: includes/dashboard.inc:122 includes/dashboard.inc:165
+#: includes/dashboard.inc:292 includes/dashboard.inc:438
+#: manufacturing/search_work_orders.php:139
+msgid "Costs"
+msgstr ""
+
+#: includes/dashboard.inc:134
+msgid "Performance"
+msgstr ""
+
+#: includes/dashboard.inc:162
+msgid "Purchases"
+msgstr ""
+
+#: includes/dashboard.inc:187
+#, php-format
+msgid "Top %s customers in fiscal year"
+msgstr ""
+
+#: includes/dashboard.inc:224
+#, php-format
+msgid "Top %s suppliers in fiscal year"
+msgstr ""
+
+#: includes/dashboard.inc:285
+#, php-format
+msgid "Top %s Manufactured Items in fiscal year"
+msgstr ""
+
+#: includes/dashboard.inc:287
+#, php-format
+msgid "Top %s Fixed Assets"
+msgstr ""
+
+#: includes/dashboard.inc:289
+#, php-format
+msgid "Top %s Sold Items in fiscal year"
+msgstr ""
+
+#: includes/dashboard.inc:292 includes/dashboard.inc:294
+#: manufacturing/search_work_orders.php:161
+#: manufacturing/view/wo_issue_view.php:43
+#: manufacturing/view/wo_production_view.php:44
+#: purchasing/includes/ui/invoice_ui.inc:501
+#: purchasing/includes/ui/invoice_ui.inc:513 reporting/rep204.php:84
+#: reporting/rep306.php:152 reporting/rep402.php:103
+msgid "Item"
+msgstr ""
+
+#: includes/dashboard.inc:292 includes/dashboard.inc:294
+#: inventory/includes/item_adjustments_ui.inc:56
+#: inventory/includes/item_adjustments_ui.inc:59
+#: inventory/includes/stock_transfers_ui.inc:57
+#: inventory/manage/item_codes.php:126 inventory/manage/sales_kits.php:36
+#: inventory/view/view_adjustment.php:54 inventory/view/view_transfer.php:50
+#: manufacturing/view/wo_issue_view.php:76
+#: manufacturing/manage/bom_edit.php:44
+#: manufacturing/includes/manufacturing_ui.inc:29
+#: manufacturing/includes/manufacturing_ui.inc:174
+#: manufacturing/includes/manufacturing_ui.inc:347
+#: manufacturing/includes/work_order_issue_ui.inc:33
+#: purchasing/includes/ui/invoice_ui.inc:514
+#: purchasing/includes/ui/po_ui.inc:214 purchasing/view/view_grn.php:40
+#: purchasing/view/view_po.php:45 reporting/rep301.php:164
+#: reporting/rep303.php:120 reporting/rep303.php:126 reporting/rep401.php:71
+#: reporting/includes/doctext.inc:31 reporting/includes/doctext.inc:191
+#: reporting/includes/doctext.inc:224 sales/customer_invoice.php:518
+#: sales/view/view_credit.php:90 sales/view/view_dispatch.php:112
+#: sales/view/view_invoice.php:115 sales/view/view_sales_order.php:219
+#: sales/includes/ui/sales_credit_ui.inc:162
+#: sales/includes/ui/sales_order_ui.inc:146
+msgid "Quantity"
+msgstr ""
+
+#: includes/dashboard.inc:334
+#, php-format
+msgid "Top %s Dimensions in fiscal year"
+msgstr ""
+
+#: includes/dashboard.inc:372
+msgid "Class Balances"
+msgstr ""
+
+#: includes/dashboard.inc:438
+msgid "Week"
+msgstr ""
+
+#: includes/dashboard.inc:484
+msgid " overdue Sales Invoices"
+msgstr ""
+
+#: includes/dashboard.inc:486 includes/dashboard.inc:571
+msgid "Ref."
+msgstr ""
+
+#: includes/dashboard.inc:486 includes/dashboard.inc:526
+#: reporting/rep105.php:109 reporting/rep106.php:89 reporting/rep112.php:180
+#: sales/create_recurrent_invoices.php:203
+#: sales/customer_credit_invoice.php:235 sales/customer_delivery.php:327
+#: sales/customer_invoice.php:432 sales/manage/customers.php:255
+#: sales/manage/customers.php:295 sales/manage/recurrent_invoices.php:128
+#: sales/view/view_credit.php:58 sales/inquiry/customer_branches_list.php:37
+#: sales/inquiry/customer_branches_list.php:49
+#: sales/inquiry/customer_inquiry.php:200
+#: sales/inquiry/sales_deliveries_view.php:171
+#: sales/inquiry/sales_orders_view.php:255
+#: sales/inquiry/sales_orders_view.php:269
+msgid "Branch"
+msgstr ""
+
+#: includes/dashboard.inc:487 includes/dashboard.inc:572
+#: includes/sysnames.inc:137
+msgid "Remainder"
+msgstr ""
+
+#: includes/dashboard.inc:487 includes/dashboard.inc:572
+#: purchasing/inquiry/supplier_inquiry.php:44
+#: purchasing/inquiry/supplier_inquiry.php:45
+#: purchasing/inquiry/supplier_inquiry.php:46 reporting/rep102.php:116
+#: reporting/rep102.php:117 reporting/rep102.php:118 reporting/rep102.php:241
+#: reporting/rep108.php:151 reporting/rep108.php:152 reporting/rep108.php:153
+#: reporting/rep202.php:122 reporting/rep202.php:123 reporting/rep202.php:124
+#: reporting/rep202.php:156 reporting/rep202.php:157 reporting/rep202.php:158
+#: reporting/rep202.php:249 sales/create_recurrent_invoices.php:203
+#: sales/manage/recurrent_invoices.php:128
+#: sales/inquiry/customer_inquiry.php:116
+#: sales/inquiry/customer_inquiry.php:117
+#: sales/inquiry/customer_inquiry.php:118
+msgid "Days"
+msgstr ""
+
+#: includes/dashboard.inc:524
+msgid "Overdue Recurrent Invoices"
+msgstr ""
+
+#: includes/dashboard.inc:526 sales/create_recurrent_invoices.php:203
+#: sales/manage/recurrent_invoices.php:128
+msgid "Template No"
+msgstr ""
+
+#: includes/dashboard.inc:526 sales/create_recurrent_invoices.php:203
+msgid "Next invoice"
+msgstr ""
+
+#: includes/dashboard.inc:569
+msgid " overdue Purchase Invoices"
+msgstr ""
+
+#: includes/dashboard.inc:604
+msgid "Bank Account Balances"
+msgstr ""
+
+#: includes/data_checks.inc:612
+#, php-format
+msgid "%s #%s is closed for further edition."
+msgstr ""
+
+#: includes/data_checks.inc:654
+msgid "You have no edit access to transactions created by other users."
+msgstr ""
+
+#: includes/data_checks.inc:669
+msgid "The entered reference is invalid."
+msgstr ""
+
+#: includes/data_checks.inc:673 sales/credit_note_entry.php:181
+#: sales/customer_credit_invoice.php:204 sales/customer_delivery.php:298
+#: sales/customer_invoice.php:364 sales/sales_order_entry.php:474
+msgid "The entered reference is already in use."
+msgstr ""
+
+#: includes/errors.inc:94
+#, php-format
+msgid "Unhandled exception [%s]: %s."
+msgstr ""
+
+#: includes/errors.inc:132
 msgid "in file"
 msgstr ""
 
-#: includes/errors.inc:123
+#: includes/errors.inc:132
 msgid "at line "
 msgstr ""
 
-#: includes/errors.inc:173
+#: includes/errors.inc:184
 msgid "Debug mode database warning:"
 msgstr ""
 
-#: includes/errors.inc:175
+#: includes/errors.inc:186
 msgid "DATABASE ERROR :"
 msgstr ""
 
-#: includes/errors.inc:206
+#: includes/errors.inc:218
 msgid ""
 "The entered information is a duplicate. Please go back and enter different "
 "values."
 msgstr ""
 
-#: includes/main.inc:41
-msgid "This page is usable only with javascript enabled browsers."
+#: includes/main.inc:49
+msgid "This page is usable only with javascript enabled browsers."
+msgstr ""
+
+#: includes/packages.inc:190
+#, php-format
+msgid "No key field '%s' in file '%s'"
+msgstr ""
+
+#: includes/packages.inc:295
+msgid "Cannot download repo index file."
+msgstr ""
+
+#: includes/packages.inc:304 includes/system_tests.inc:398
+msgid ""
+"OpenSSL have to be available on your server to use extension repository "
+"system."
 msgstr ""
 
-#: includes/packages.inc:190
+#: includes/packages.inc:311 includes/packages.inc:348
 #, php-format
-msgid "No key field '%s' in file '%s'"
+msgid "Cannot delete outdated '%s' file."
 msgstr ""
 
-#: includes/packages.inc:295
+#: includes/packages.inc:315
 msgid "Release file in repository is invalid, or public key is outdated."
 msgstr ""
 
-#: includes/packages.inc:311
+#: includes/packages.inc:332
 msgid "Repository version does not match application version."
 msgstr ""
 
-#: includes/packages.inc:325
+#: includes/packages.inc:340 includes/packages.inc:382
+#, php-format
+msgid "Cannot download '%s' file."
+msgstr ""
+
+#: includes/packages.inc:352
 #, 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:388
 #, 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:646 includes/packages.inc:701
 #, php-format
 msgid "Package '%s' not found."
 msgstr ""
 
-#: includes/session.inc:39
+#: includes/references.inc:103
+msgid "Invalid refline template."
+msgstr ""
+
+#: includes/references.inc:113
+#, php-format
+msgid "Missing refline context data: '%s'"
+msgstr ""
+
+#: includes/references.inc:156
+msgid "Missing numeric placeholder in refline definition."
+msgstr ""
+
+#: includes/session.inc:136
 msgid "Incorrect Password"
 msgstr ""
 
-#: includes/session.inc:40
+#: includes/session.inc:137
 msgid "The user and password combination is not valid for the system."
 msgstr ""
 
-#: includes/session.inc:42
+#: includes/session.inc:139
 msgid ""
 "If you are not an authorized user, please contact your system administrator "
 "to obtain an account to enable you to use the system."
 msgstr ""
 
-#: includes/session.inc:43
+#: includes/session.inc:140 includes/session.inc:155
 msgid "Try again"
 msgstr ""
 
-#: includes/session.inc:62
+#: includes/session.inc:151
+msgid "Incorrect Email"
+msgstr ""
+
+#: includes/session.inc:152
+msgid ""
+"The email address does not exist in the system, or is used by more than one "
+"user."
+msgstr ""
+
+#: includes/session.inc:154
+msgid ""
+"Plase try again or contact your system administrator to obtain new password."
+msgstr ""
+
+#: includes/session.inc:166
+msgid "New password sent"
+msgstr ""
+
+#: includes/session.inc:167
+msgid "A new password has been sent to your mailbox."
+msgstr ""
+
+#: includes/session.inc:169
+msgid "Login here"
+msgstr ""
+
+#: includes/session.inc:219
+#, php-format
+msgid ""
+"Brute force attack on account '%s' detected. Access for non-logged users "
+"temporarily blocked."
+msgstr ""
+
+#: includes/session.inc:251
 msgid "Security settings have not been defined for your user account."
 msgstr ""
 
-#: includes/session.inc:63
+#: includes/session.inc:252
 msgid "Please contact your system administrator."
 msgstr ""
 
-#: includes/session.inc:64
+#: includes/session.inc:253
 msgid ""
 "Please remove $security_groups and $security_headings arrays from config.php "
 "file!"
 msgstr ""
 
-#: includes/session.inc:66
+#: includes/session.inc:256
 msgid ""
 "Access to application has been blocked until database upgrade is completed "
 "by system administrator."
 msgstr ""
 
-#: includes/session.inc:80
+#: includes/session.inc:270
 msgid ""
 "The security settings on your account do not permit you to access this "
 "function"
 msgstr ""
 
-#: includes/session.inc:89
+#: includes/session.inc:279
 msgid ""
 "System is blocked after source upgrade until database is updated on System/"
 "Software Upgrade page"
 msgstr ""
 
-#: includes/sysnames.inc:23 includes/sysnames.inc:148
+#: includes/sysnames.inc:23 includes/sysnames.inc:154
 msgid "Bank Payment"
 msgstr ""
 
-#: includes/sysnames.inc:24 includes/sysnames.inc:147
+#: includes/sysnames.inc:24 includes/sysnames.inc:153
 msgid "Bank Deposit"
 msgstr ""
 
@@ -5677,7 +6751,7 @@ msgstr ""
 msgid "Inventory Adjustment"
 msgstr ""
 
-#: includes/sysnames.inc:32 purchasing/includes/ui/po_ui.inc:323
+#: includes/sysnames.inc:32 purchasing/includes/ui/po_ui.inc:307
 #: purchasing/view/view_po.php:30
 msgid "Purchase Order"
 msgstr ""
@@ -5686,7 +6760,8 @@ msgstr ""
 msgid "Supplier Invoice"
 msgstr ""
 
-#: includes/sysnames.inc:34 purchasing/supplier_credit.php:28
+#: includes/sysnames.inc:34 purchasing/supplier_credit.php:57
+#: purchasing/supplier_credit.php:61
 msgid "Supplier Credit Note"
 msgstr ""
 
@@ -5698,7 +6773,7 @@ msgstr ""
 msgid "Purchase Order Delivery"
 msgstr ""
 
-#: includes/sysnames.inc:37 includes/sysnames.inc:95
+#: includes/sysnames.inc:37 includes/sysnames.inc:100 includes/types.inc:133
 msgid "Work Order"
 msgstr ""
 
@@ -5710,12 +6785,12 @@ msgstr ""
 msgid "Work Order Production"
 msgstr ""
 
-#: includes/sysnames.inc:40 sales/inquiry/sales_orders_view.php:134
-#: sales/inquiry/sales_orders_view.php:156
+#: includes/sysnames.inc:40 sales/inquiry/sales_orders_view.php:126
+#: sales/inquiry/sales_orders_view.php:148
 msgid "Sales Order"
 msgstr ""
 
-#: includes/sysnames.inc:41 sales/sales_order_entry.php:615
+#: includes/sysnames.inc:41 sales/sales_order_entry.php:655
 msgid "Sales Quotation"
 msgstr ""
 
@@ -5723,297 +6798,409 @@ msgstr ""
 msgid "Cost Update"
 msgstr ""
 
-#: includes/sysnames.inc:47
-msgid "GJ"
+#: includes/sysnames.inc:47 inventory/adjustments.php:32
+msgid "Fixed Assets Disposal"
 msgstr ""
 
 #: includes/sysnames.inc:48
+msgid "Fixed Assets Revaluation"
+msgstr ""
+
+#: includes/sysnames.inc:52
+msgid "GJ"
+msgstr ""
+
+#: includes/sysnames.inc:53
 msgid "BP"
 msgstr ""
 
-#: includes/sysnames.inc:49
+#: includes/sysnames.inc:54
 msgid "BD"
 msgstr ""
 
-#: includes/sysnames.inc:50
+#: includes/sysnames.inc:55
 msgid "BT"
 msgstr ""
 
-#: includes/sysnames.inc:51
+#: includes/sysnames.inc:56
 msgid "SI"
 msgstr ""
 
-#: includes/sysnames.inc:52
+#: includes/sysnames.inc:57
 msgid "CN"
 msgstr ""
 
-#: includes/sysnames.inc:53
+#: includes/sysnames.inc:58
 msgid "CP"
 msgstr ""
 
-#: includes/sysnames.inc:54 sales/customer_invoice.php:452
+#: includes/sysnames.inc:59 sales/customer_invoice.php:525
 msgid "DN"
 msgstr ""
 
-#: includes/sysnames.inc:55
+#: includes/sysnames.inc:60
 msgid "IT"
 msgstr ""
 
-#: includes/sysnames.inc:56
+#: includes/sysnames.inc:61
 msgid "IA"
 msgstr ""
 
-#: includes/sysnames.inc:57
+#: includes/sysnames.inc:62
 msgid "PO"
 msgstr ""
 
-#: includes/sysnames.inc:58
+#: includes/sysnames.inc:63
 msgid "PI"
 msgstr ""
 
-#: includes/sysnames.inc:59
+#: includes/sysnames.inc:64
 msgid "PC"
 msgstr ""
 
-#: includes/sysnames.inc:60
+#: includes/sysnames.inc:65
 msgid "SP"
 msgstr ""
 
-#: includes/sysnames.inc:61 reporting/rep204.php:82 reporting/rep305.php:95
+#: includes/sysnames.inc:66 reporting/rep204.php:84 reporting/rep305.php:106
 msgid "GRN"
 msgstr ""
 
-#: includes/sysnames.inc:62
+#: includes/sysnames.inc:67
 msgid "WO"
 msgstr ""
 
-#: includes/sysnames.inc:63
+#: includes/sysnames.inc:68
 msgid "WI"
 msgstr ""
 
-#: includes/sysnames.inc:64
+#: includes/sysnames.inc:69
 msgid "WP"
 msgstr ""
 
-#: includes/sysnames.inc:65
+#: includes/sysnames.inc:70
 msgid "SO"
 msgstr ""
 
-#: includes/sysnames.inc:66
+#: includes/sysnames.inc:71
 msgid "SQ"
 msgstr ""
 
-#: includes/sysnames.inc:67
+#: includes/sysnames.inc:72
 msgid "CU"
 msgstr ""
 
-#: includes/sysnames.inc:68
+#: includes/sysnames.inc:73
 msgid "Dim"
 msgstr ""
 
-#: includes/sysnames.inc:76
+#: includes/sysnames.inc:81
 msgid "Savings Account"
 msgstr ""
 
-#: includes/sysnames.inc:77
+#: includes/sysnames.inc:82
 msgid "Chequing Account"
 msgstr ""
 
-#: includes/sysnames.inc:78 manufacturing/work_order_costs.php:161
+#: includes/sysnames.inc:83 manufacturing/work_order_costs.php:146
 msgid "Credit Account"
 msgstr ""
 
-#: includes/sysnames.inc:79
+#: includes/sysnames.inc:84
 msgid "Cash Account"
 msgstr ""
 
-#: includes/sysnames.inc:83
+#: includes/sysnames.inc:88
 msgid "Transfer"
 msgstr ""
 
-#: includes/sysnames.inc:84
+#: includes/sysnames.inc:89
 msgid "Cheque"
 msgstr ""
 
-#: includes/sysnames.inc:86 includes/sysnames.inc:180
+#: includes/sysnames.inc:91 includes/sysnames.inc:195
 msgid "Cash"
 msgstr ""
 
-#: includes/sysnames.inc:96 reporting/rep101.php:137 reporting/rep102.php:125
-#: reporting/rep102.php:132 reporting/rep105.php:107 reporting/rep106.php:81
-#: reporting/rep114.php:93 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:108
-#: reporting/reports_main.php:202 sales/create_recurrent_invoices.php:115
-#: sales/customer_credit_invoice.php:237 sales/customer_delivery.php:335
-#: sales/customer_invoice.php:374
-#: sales/allocations/customer_allocation_main.php:97
-#: sales/allocations/customer_allocation_main.php:105
-#: 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
-msgid "Customer"
-msgstr ""
-
-#: includes/sysnames.inc:97 includes/sysnames.inc:172
-#: inventory/purchasing_data.php:129 purchasing/includes/ui/grn_ui.inc:20
-#: purchasing/includes/ui/po_ui.inc:316
-#: 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/inquiry/supplier_inquiry.php.orig:165
-#: purchasing/inquiry/supplier_inquiry.php.orig:179
-#: purchasing/allocations/supplier_allocation_main.php:98
-#: purchasing/allocations/supplier_allocation_main.php:106
-#: reporting/rep201.php:125 reporting/rep202.php:128 reporting/rep202.php:135
-#: reporting/rep203.php:98 reporting/rep204.php:88
-#: reporting/reports_main.php:132 reporting/reports_main.php:136
-#: reporting/reports_main.php:143 reporting/reports_main.php:153
-#: reporting/reports_main.php:159
-msgid "Supplier"
-msgstr ""
-
-#: includes/sysnames.inc:105
+#: includes/sysnames.inc:110
 msgid "Assemble"
 msgstr ""
 
-#: includes/sysnames.inc:106
+#: includes/sysnames.inc:111
 msgid "Unassemble"
 msgstr ""
 
-#: includes/sysnames.inc:107
+#: includes/sysnames.inc:112
 msgid "Advanced Manufacture"
 msgstr ""
 
-#: includes/sysnames.inc:111
+#: includes/sysnames.inc:116
 msgid "Labour Cost"
 msgstr ""
 
-#: includes/sysnames.inc:112
+#: includes/sysnames.inc:117
 msgid "Overhead Cost"
 msgstr ""
 
-#: includes/sysnames.inc:119
+#: includes/sysnames.inc:118
+msgid "Materials"
+msgstr ""
+
+#: includes/sysnames.inc:125
 msgid "Assets"
 msgstr ""
 
-#: includes/sysnames.inc:121
+#: includes/sysnames.inc:127
 msgid "Equity"
 msgstr ""
 
-#: includes/sysnames.inc:122
+#: includes/sysnames.inc:128
 msgid "Income"
 msgstr ""
 
-#: includes/sysnames.inc:123
+#: includes/sysnames.inc:129
 msgid "Cost of Goods Sold"
 msgstr ""
 
-#: includes/sysnames.inc:124
+#: includes/sysnames.inc:130
 msgid "Expense"
 msgstr ""
 
-#: includes/sysnames.inc:131
-msgid "Remainder"
-msgstr ""
-
-#: includes/sysnames.inc:133
+#: includes/sysnames.inc:139
 msgid "Amount, increase base"
 msgstr ""
 
-#: includes/sysnames.inc:134
+#: includes/sysnames.inc:140
 msgid "Amount, reduce base"
 msgstr ""
 
-#: includes/sysnames.inc:135
+#: includes/sysnames.inc:141
 msgid "% amount of base"
 msgstr ""
 
-#: includes/sysnames.inc:136
+#: includes/sysnames.inc:142
 msgid "% amount of base, increase base"
 msgstr ""
 
-#: includes/sysnames.inc:137
+#: includes/sysnames.inc:143
 msgid "% amount of base, reduce base"
 msgstr ""
 
-#: includes/sysnames.inc:138
+#: includes/sysnames.inc:144
 msgid "Taxes added"
 msgstr ""
 
-#: includes/sysnames.inc:139
+#: includes/sysnames.inc:145
 msgid "Taxes added, increase base"
 msgstr ""
 
-#: includes/sysnames.inc:140
+#: includes/sysnames.inc:146
 msgid "Taxes added, reduce base"
 msgstr ""
 
-#: includes/sysnames.inc:141
+#: includes/sysnames.inc:147
 msgid "Taxes included"
 msgstr ""
 
-#: includes/sysnames.inc:142
+#: includes/sysnames.inc:148
 msgid "Taxes included, increase base"
 msgstr ""
 
-#: includes/sysnames.inc:143
+#: includes/sysnames.inc:149
 msgid "Taxes included, reduce base"
 msgstr ""
 
-#: includes/sysnames.inc:150
+#: includes/sysnames.inc:156
 msgid "Supplier Invoice/Credit"
 msgstr ""
 
-#: includes/sysnames.inc:156 manufacturing/search_work_orders.php:165
-#: manufacturing/includes/manufacturing_ui.inc:278
+#: includes/sysnames.inc:162
+msgid "Declining balance"
+msgstr ""
+
+#: includes/sysnames.inc:163
+msgid "Straight line"
+msgstr ""
+
+#: includes/sysnames.inc:164
+msgid "Sum of the Year Digits"
+msgstr ""
+
+#: includes/sysnames.inc:165
+msgid "One-time"
+msgstr ""
+
+#: includes/sysnames.inc:171 manufacturing/search_work_orders.php:163
+#: manufacturing/includes/manufacturing_ui.inc:293 reporting/rep402.php:103
 msgid "Manufactured"
 msgstr ""
 
-#: includes/sysnames.inc:157
+#: includes/sysnames.inc:172
 msgid "Purchased"
 msgstr ""
 
-#: includes/sysnames.inc:158
+#: includes/sysnames.inc:173
 msgid "Service"
 msgstr ""
 
-#: includes/sysnames.inc:171
+#: includes/sysnames.inc:186
 msgid "Customer branch"
 msgstr ""
 
-#: includes/sysnames.inc:173
+#: includes/sysnames.inc:188
 msgid "Shipper"
 msgstr ""
 
-#: includes/sysnames.inc:174
+#: includes/sysnames.inc:189
 msgid "Company internal"
 msgstr ""
 
-#: includes/sysnames.inc:179
+#: includes/sysnames.inc:194
 msgid "Prepayment"
 msgstr ""
 
-#: includes/sysnames.inc:181
+#: includes/sysnames.inc:196
 msgid "After No. of Days"
 msgstr ""
 
-#: includes/sysnames.inc:182
+#: includes/sysnames.inc:197
 msgid "Day In Following Month"
 msgstr ""
 
+#: includes/sysnames.inc:201
+msgid "Sum per line taxes"
+msgstr ""
+
+#: includes/sysnames.inc:202
+msgid "Taxes from totals"
+msgstr ""
+
+#: includes/sysnames.inc:214
+msgid "Jan"
+msgstr ""
+
+#: includes/sysnames.inc:214
+msgid "Feb"
+msgstr ""
+
+#: includes/sysnames.inc:214
+msgid "Mar"
+msgstr ""
+
+#: includes/sysnames.inc:214
+msgid "Apr"
+msgstr ""
+
+#: includes/sysnames.inc:214 includes/ui/ui_view.inc:982
+msgid "May"
+msgstr ""
+
+#: includes/sysnames.inc:214
+msgid "Jun"
+msgstr ""
+
+#: includes/sysnames.inc:214
+msgid "Jul"
+msgstr ""
+
+#: includes/sysnames.inc:214
+msgid "Aug"
+msgstr ""
+
+#: includes/sysnames.inc:214
+msgid "Sep"
+msgstr ""
+
+#: includes/sysnames.inc:214
+msgid "Oct"
+msgstr ""
+
+#: includes/sysnames.inc:214
+msgid "Nov"
+msgstr ""
+
+#: includes/sysnames.inc:214
+msgid "Dec"
+msgstr ""
+
+#: includes/sysnames.inc:220
+msgid "Unicode (multilanguage)"
+msgstr ""
+
+#: includes/sysnames.inc:221
+msgid "Icelandic"
+msgstr ""
+
+#: includes/sysnames.inc:222
+msgid "Latvian"
+msgstr ""
+
+#: includes/sysnames.inc:223
+msgid "Romanian"
+msgstr ""
+
+#: includes/sysnames.inc:224
+msgid "Slovenian"
+msgstr ""
+
+#: includes/sysnames.inc:225
+msgid "Polish"
+msgstr ""
+
+#: includes/sysnames.inc:226
+msgid "Estonian"
+msgstr ""
+
+#: includes/sysnames.inc:227
+msgid "Spanish"
+msgstr ""
+
+#: includes/sysnames.inc:228
+msgid "Swedish"
+msgstr ""
+
+#: includes/sysnames.inc:229
+msgid "Turkish"
+msgstr ""
+
+#: includes/sysnames.inc:230
+msgid "Czech"
+msgstr ""
+
+#: includes/sysnames.inc:231
+msgid "Danish"
+msgstr ""
+
+#: includes/sysnames.inc:232
+msgid "Lithuanian"
+msgstr ""
+
+#: includes/sysnames.inc:233
+msgid "Slovak"
+msgstr ""
+
+#: includes/sysnames.inc:234
+msgid "Spanish (alternative)"
+msgstr ""
+
+#: includes/sysnames.inc:235
+msgid "Persian"
+msgstr ""
+
+#: includes/sysnames.inc:236
+msgid "Hungarian"
+msgstr ""
+
+#: includes/sysnames.inc:237
+msgid "French"
+msgstr ""
+
+#: includes/sysnames.inc:238
+msgid "Italian"
+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:251 reporting/rep705.php:262 reporting/rep705.php:271
 msgid "Info"
 msgstr ""
 
@@ -6050,7 +7237,7 @@ msgid "PHP version"
 msgstr ""
 
 #: includes/system_tests.inc:50
-msgid "Upgrade PHP to version at least 4.3.3"
+msgid "Upgrade PHP to version at least 5.0.0"
 msgstr ""
 
 #: includes/system_tests.inc:57
@@ -6105,1203 +7292,1407 @@ msgstr ""
 msgid "To switch debugging on set $go_debug>0 in config.php file"
 msgstr ""
 
-#: includes/system_tests.inc:137
+#: includes/system_tests.inc:138
 msgid "Error logging"
 msgstr ""
 
-#: includes/system_tests.inc:145
+#: includes/system_tests.inc:146
 msgid "Disabled"
 msgstr ""
 
-#: includes/system_tests.inc:148
+#: includes/system_tests.inc:149
 msgid "To switch error logging set $error_logging in config.php file"
 msgstr ""
 
-#: includes/system_tests.inc:151
+#: includes/system_tests.inc:152
 msgid "Log file is not writeable"
 msgstr ""
 
-#: includes/system_tests.inc:161
+#: includes/system_tests.inc:162
 msgid "Current database version"
 msgstr ""
 
-#: includes/system_tests.inc:165
+#: includes/system_tests.inc:166
 msgid "Database structure seems to be not upgraded to current version"
 msgstr ""
 
-#: includes/system_tests.inc:180
+#: includes/system_tests.inc:181
 msgid "Company subdirectories consistency"
 msgstr ""
 
-#: includes/system_tests.inc:193 includes/system_tests.inc:200
-#: includes/system_tests.inc:208 includes/system_tests.inc:225
-#: includes/system_tests.inc:340 includes/system_tests.inc:349
-#: includes/system_tests.inc:358
+#: includes/system_tests.inc:194 includes/system_tests.inc:201
+#: includes/system_tests.inc:209 includes/system_tests.inc:226
+#: includes/system_tests.inc:341 includes/system_tests.inc:350
+#: includes/system_tests.inc:359 includes/system_tests.inc:367
 #, php-format
 msgid "'%s' is not writeable"
 msgstr ""
 
-#: includes/system_tests.inc:221
+#: includes/system_tests.inc:222
 msgid "Temporary directory"
 msgstr ""
 
-#: includes/system_tests.inc:233
+#: includes/system_tests.inc:234
 msgid "Language configuration consistency"
 msgstr ""
 
-#: includes/system_tests.inc:242
+#: includes/system_tests.inc:243
 msgid "Languages folder should be writeable."
 msgstr ""
 
-#: includes/system_tests.inc:251
+#: includes/system_tests.inc:252
 msgid "Languages configuration file should be writeable."
 msgstr ""
 
-#: includes/system_tests.inc:270
+#: includes/system_tests.inc:271
 #, php-format
 msgid "Missing %s translation file."
 msgstr ""
 
-#: includes/system_tests.inc:275
+#: includes/system_tests.inc:276
+#, php-format
+msgid "Missing system locale: %s"
+msgstr ""
+
+#: includes/system_tests.inc:289
+msgid "Main config file"
+msgstr ""
+
+#: includes/system_tests.inc:296 includes/system_tests.inc:318
+#, php-format
+msgid "Can't write '%s' file. Check FA directory write permissions."
+msgstr ""
+
+#: includes/system_tests.inc:297 includes/system_tests.inc:319
+#, php-format
+msgid "'%s' file exists."
+msgstr ""
+
+#: includes/system_tests.inc:301
+#, php-format
+msgid "'%s' file should be read-only"
+msgstr ""
+
+#: includes/system_tests.inc:310
+msgid "Database auth file"
+msgstr ""
+
+#: includes/system_tests.inc:323
+#, php-format
+msgid ""
+"'%s' file should be read-only if you do not plan to add or change companies"
+msgstr ""
+
+#: includes/system_tests.inc:334
+msgid "Extensions system"
+msgstr ""
+
+#: includes/system_tests.inc:372
+msgid "Extensions configuration files and directories should be writeable"
+msgstr ""
+
+#: includes/system_tests.inc:385
+#, php-format
+msgid "Non-standard theme directory '%s' is not writable"
+msgstr ""
+
+#: includes/system_tests.inc:395
+msgid ""
+"OpenSSL PHP extension have to be enabled to use extension repository system."
+msgstr ""
+
+#: includes/system_tests.inc:421
+msgid "Test"
+msgstr ""
+
+#: includes/system_tests.inc:421
+msgid "Test type"
+msgstr ""
+
+#: includes/system_tests.inc:421 reporting/rep204.php:85
+#: reporting/rep301.php:164 reporting/rep308.php:224
+msgid "Value"
+msgstr ""
+
+#: includes/system_tests.inc:421 reporting/reports_main.php:42
+#: reporting/reports_main.php:53 reporting/reports_main.php:62
+#: reporting/reports_main.php:69 reporting/reports_main.php:78
+#: reporting/reports_main.php:87 reporting/reports_main.php:94
+#: reporting/reports_main.php:103 reporting/reports_main.php:113
+#: reporting/reports_main.php:120 reporting/reports_main.php:127
+#: reporting/reports_main.php:135 reporting/reports_main.php:142
+#: reporting/reports_main.php:148 reporting/reports_main.php:159
+#: reporting/reports_main.php:170 reporting/reports_main.php:178
+#: reporting/reports_main.php:183 reporting/reports_main.php:190
+#: reporting/reports_main.php:198 reporting/reports_main.php:205
+#: reporting/reports_main.php:214 reporting/reports_main.php:220
+#: reporting/reports_main.php:231 reporting/reports_main.php:241
+#: reporting/reports_main.php:247 reporting/reports_main.php:257
+#: reporting/reports_main.php:265 reporting/reports_main.php:273
+#: reporting/reports_main.php:280 reporting/reports_main.php:289
+#: reporting/reports_main.php:296 reporting/reports_main.php:303
+#: reporting/reports_main.php:314 reporting/reports_main.php:325
+#: reporting/reports_main.php:335 reporting/reports_main.php:342
+#: reporting/reports_main.php:348 reporting/reports_main.php:355
+#: reporting/reports_main.php:368 reporting/reports_main.php:376
+#: reporting/reports_main.php:387 reporting/reports_main.php:399
+#: reporting/reports_main.php:409 reporting/reports_main.php:421
+#: reporting/reports_main.php:428 reporting/reports_main.php:438
+#: reporting/reports_main.php:449 reporting/reports_main.php:458
+#: reporting/reports_main.php:469 reporting/reports_main.php:475
+#: reporting/reports_main.php:484 reporting/reports_main.php:494
+#: reporting/reports_main.php:502 reporting/reports_main.php:510
+#: reporting/reports_main.php:518 reporting/includes/excel_report.inc:292
+#: reporting/includes/excel_report.inc:425
+#: reporting/includes/pdf_report.inc:358 reporting/includes/pdf_report.inc:619
+#: sales/view/view_sales_order.php:98
+msgid "Comments"
+msgstr ""
+
+#: includes/system_tests.inc:445
+msgid "Ok"
+msgstr ""
+
+#: includes/db/audit_trail_db.inc:102
+msgid ""
+"Some transactions journal GL postings were not indexed due to lack of audit "
+"trail record."
+msgstr ""
+
+#: includes/db/class.data_set.inc:77
+msgid "Invalid validator string"
+msgstr ""
+
+#: includes/db/class.data_set.inc:113
+#, php-format
+msgid "Input parameter '%s' have to be set."
+msgstr ""
+
+#: includes/db/class.data_set.inc:121
+#, php-format
+msgid "Parameter '%s' cannot be empty."
+msgstr ""
+
+#: includes/db/class.data_set.inc:128
 #, php-format
-msgid "Missing system locale: %s"
+msgid "Parameter '%s' contains invalid characters."
 msgstr ""
 
-#: includes/system_tests.inc:288
-msgid "Main config file"
+#: includes/db/class.data_set.inc:134
+#, php-format
+msgid "Parameter '%s' has invalid value."
 msgstr ""
 
-#: includes/system_tests.inc:295 includes/system_tests.inc:317
+#: includes/db/class.data_set.inc:277
 #, php-format
-msgid "Can't write '%s' file. Check FA directory write permissions."
+msgid "Invalid key passed reading '%s'"
 msgstr ""
 
-#: includes/system_tests.inc:296 includes/system_tests.inc:318
-#, php-format
-msgid "'%s' file exists."
+#: includes/db/class.data_set.inc:329
+msgid "Empty update data for table "
 msgstr ""
 
-#: includes/system_tests.inc:300
+#: includes/db/class.data_set.inc:339 includes/db/class.data_set.inc:368
 #, php-format
-msgid "'%s' file should be read-only"
+msgid "Invalid key for update '%s'"
 msgstr ""
 
-#: includes/system_tests.inc:309
-msgid "Database auth file"
+#: includes/db/class.data_set.inc:376
+msgid "Cannot update record in "
 msgstr ""
 
-#: includes/system_tests.inc:322
-#, php-format
-msgid ""
-"'%s' file should be read-only if you do not plan to add or change companies"
+#: includes/db/class.data_set.inc:395
+msgid "Empty data set for insertion into "
 msgstr ""
 
-#: includes/system_tests.inc:333
-msgid "Extensions system"
+#: includes/db/class.data_set.inc:401
+msgid "Cannot insert record into "
 msgstr ""
 
-#: includes/system_tests.inc:363
-msgid "Extensions configuration files and directories should be writeable"
+#: includes/db/class.data_set.inc:482
+msgid "Empty update data for array "
 msgstr ""
 
-#: includes/system_tests.inc:375
-#, php-format
-msgid "Non-standard theme directory '%s' is not writable"
+#: includes/db/class.data_set.inc:510
+msgid "Empty data for array "
 msgstr ""
 
-#: includes/system_tests.inc:385
+#: includes/db/class.reflines_db.inc:22
 msgid ""
-"OpenSSL PHP extension have to be enabled to use extension repository system."
+"This prefix conflicts with another one already defined. Prefix have to be "
+"unambigous."
 msgstr ""
 
-#: includes/system_tests.inc:388
-msgid ""
-"OpenSSL have to be available on your server to use extension repository "
-"system."
+#: includes/db/class.reflines_db.inc:23
+msgid "Invalid template format."
 msgstr ""
 
-#: includes/system_tests.inc:411
-msgid "Test"
+#: includes/db/class.reflines_db.inc:24
+msgid "Transaction type cannot be empty."
 msgstr ""
 
-#: includes/system_tests.inc:411
-msgid "Test type"
+#: includes/db/class.reflines_db.inc:25
+msgid "Next reference cannot be empty."
 msgstr ""
 
-#: includes/system_tests.inc:411 includes/ui/view_package.php:37
-#: reporting/rep204.php:83 reporting/rep301.php:100
-msgid "Value"
+#: includes/db/class.reflines_db.inc:50
+msgid "You cannot use placeholders in refline prefix."
 msgstr ""
 
-#: includes/system_tests.inc:411 reporting/reports_main.php:39
-#: reporting/reports_main.php:49 reporting/reports_main.php:57
-#: reporting/reports_main.php:63 reporting/reports_main.php:71
-#: reporting/reports_main.php:79 reporting/reports_main.php:85
-#: reporting/reports_main.php:93 reporting/reports_main.php:100
-#: reporting/reports_main.php:106 reporting/reports_main.php:112
-#: reporting/reports_main.php:119 reporting/reports_main.php:125
-#: reporting/reports_main.php:130 reporting/reports_main.php:139
-#: reporting/reports_main.php:149 reporting/reports_main.php:156
-#: reporting/reports_main.php:160 reporting/reports_main.php:167
-#: reporting/reports_main.php:173 reporting/reports_main.php:181
-#: reporting/reports_main.php:186 reporting/reports_main.php:195
-#: reporting/reports_main.php:203 reporting/reports_main.php:208
-#: reporting/reports_main.php:215 reporting/reports_main.php:221
-#: reporting/reports_main.php:229 reporting/reports_main.php:240
-#: reporting/reports_main.php:246 reporting/reports_main.php:252
-#: reporting/reports_main.php:266 reporting/reports_main.php:273
-#: reporting/reports_main.php:283 reporting/reports_main.php:294
-#: reporting/reports_main.php:303 reporting/reports_main.php:314
-#: reporting/reports_main.php:320 reporting/reports_main.php:329
-#: reporting/reports_main.php:339 reporting/reports_main.php:347
-#: reporting/reports_main.php:357 reporting/reports_main.php:362
-#: reporting/reports_main.php:370 reporting/reports_main.php:379
-#: reporting/reports_main.php:386 reporting/reports_main.php:393
-#: reporting/reports_main.php:400 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:85
-msgid "Comments"
+#: includes/db/class.reflines_db.inc:53
+msgid "Curly brackets does not balance."
 msgstr ""
 
-#: includes/system_tests.inc:435
-msgid "Ok"
+#: includes/db/class.reflines_db.inc:67
+#, php-format
+msgid ""
+"Invalid placeholder '%s'. Placeholders allowed for this transaction type "
+"are: %s."
 msgstr ""
 
-#: includes/db/audit_trail_db.inc:93
+#: includes/db/class.reflines_db.inc:73
 msgid ""
-"Some transactions journal GL postings were not indexed due to lack of audit "
-"trail record."
+"Missing numeric placeholder. If you want to use template based references, "
+"you have to define numeric placeholder too."
+msgstr ""
+
+#: includes/db/class.reflines_db.inc:99
+msgid ""
+"Reference line which is default for any transaction type cannot be deleted."
+msgstr ""
+
+#: includes/db/class.reflines_db.inc:102
+msgid "Reference line cannot be deleted because it is already in use."
 msgstr ""
 
-#: includes/db/inventory_db.inc:249
+#: includes/db/inventory_db.inc:321
 msgid "Cost was "
 msgstr ""
 
-#: includes/db/inventory_db.inc:249
+#: includes/db/inventory_db.inc:321
 msgid " changed to "
 msgstr ""
 
-#: includes/db/inventory_db.inc:249
+#: includes/db/inventory_db.inc:321
 msgid " for item "
 msgstr ""
 
-#: includes/db/inventory_db.inc:289
+#: includes/db/inventory_db.inc:381
 msgid "Zero/negative inventory handling"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:263
+#: includes/ui/allocation_cart.inc:288
+#, php-format
+msgid "Allocated amounts in %s:"
+msgstr ""
+
+#: includes/ui/allocation_cart.inc:290
 #: purchasing/allocations/supplier_allocation_main.php:94
-#: sales/allocations/customer_allocation_main.php:93
+#: sales/allocations/customer_allocation_main.php:92
 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:109
-#: sales/view/view_credit.php:68 sales/view/view_sales_order.php:96
-#: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161
-#: sales/inquiry/sales_orders_view.php:218
-#: sales/inquiry/sales_orders_view.php:254
-#: sales/inquiry/sales_orders_view.php:268
-msgid "Ref"
+#: includes/ui/allocation_cart.inc:290
+msgid "Supplier Ref"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:264
-msgid "Other Allocations"
+#: includes/ui/allocation_cart.inc:290 reporting/rep704.php:82
+#: reporting/rep704.php:85 reporting/rep704.php:88 reporting/rep709.php:116
+#: sales/view/view_credit.php:68 sales/view/view_sales_order.php:109
+#: sales/view/view_sales_order.php:142 sales/view/view_sales_order.php:179
+#: sales/inquiry/customer_branches_list.php:49
+#: sales/inquiry/sales_orders_view.php:214
+#: sales/inquiry/sales_orders_view.php:253
+#: sales/inquiry/sales_orders_view.php:267
+msgid "Ref"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:264 includes/ui/ui_view.inc:489
-#: reporting/includes/doctext.inc:110
-msgid "This Allocation"
+#: includes/ui/allocation_cart.inc:291
+msgid "Other Allocations"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:264 includes/ui/allocation_cart.inc:311
-#: includes/ui/ui_view.inc:489
+#: includes/ui/allocation_cart.inc:291 includes/ui/allocation_cart.inc:337
+#: includes/ui/ui_view.inc:547
 #: purchasing/allocations/supplier_allocation_main.php:101
-#: reporting/includes/doctext.inc:110 reporting/includes/doctext.inc:168
-#: sales/allocations/customer_allocation_main.php:100
+#: reporting/rep112.php:150 reporting/rep210.php:157
+#: reporting/includes/doctext.inc:166 reporting/includes/doctext.inc:207
+#: sales/allocations/customer_allocation_main.php:99
 msgid "Left to Allocate"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:294 reporting/includes/doctext.inc:167
+#: includes/ui/allocation_cart.inc:291 includes/ui/ui_view.inc:547
+#: reporting/includes/doctext.inc:166 reporting/includes/doctext.inc:207
+msgid "This Allocation"
+msgstr ""
+
+#: includes/ui/allocation_cart.inc:324 reporting/rep112.php:147
+#: reporting/rep210.php:154
 msgid "Total Allocated"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:331
+#: includes/ui/allocation_cart.inc:358
 msgid "The entry for one or more amounts is invalid or negative."
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:340
+#: includes/ui/allocation_cart.inc:369
 msgid "At least one transaction is overallocated."
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:358
+#: includes/ui/allocation_cart.inc:383
 msgid ""
 "These allocations cannot be processed because the amount allocated is more "
 "than the total amount left to allocate."
 msgstr ""
 
-#: includes/ui/contacts_view.inc:41
+#: includes/ui/class.crud_view.inc:289 includes/ui/simple_crud_class.inc:225
+#: includes/ui/ui_input.inc:226
+msgid "Submit changes"
+msgstr ""
+
+#: includes/ui/class.crud_view.inc:304 includes/ui/simple_crud_class.inc:227
+#: includes/ui/ui_input.inc:227
+msgid "Clone"
+msgstr ""
+
+#: includes/ui/class.reflines_crud.inc:37
+msgid "Transaction type"
+msgstr ""
+
+#: includes/ui/class.reflines_crud.inc:37
+msgid "Prefix"
+msgstr ""
+
+#: includes/ui/class.reflines_crud.inc:38
+msgid "Pattern"
+msgstr ""
+
+#: includes/ui/class.reflines_crud.inc:98
+msgid "Reference Pattern:"
+msgstr ""
+
+#: includes/ui/class.reflines_crud.inc:101
+msgid "Default for This Type:"
+msgstr ""
+
+#: includes/ui/class.reflines_crud.inc:103
+msgid "Set as Default for This Type:"
+msgstr ""
+
+#: includes/ui/contacts_view.inc:40
 msgid "Assignment"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:41
+#: includes/ui/contacts_view.inc:40
 msgid "Sec Phone"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:41 reporting/rep103.php:223
-#: reporting/includes/header2.inc:92 sales/manage/sales_people.php:99
+#: includes/ui/contacts_view.inc:40 reporting/rep103.php:263
+#: reporting/rep205.php:175 reporting/includes/header2.inc:106
+#: sales/manage/sales_people.php:99
 msgid "Fax"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:42
+#: includes/ui/contacts_view.inc:41
 msgid "email"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:90
+#: includes/ui/contacts_view.inc:87
 msgid "Contact data"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:92
+#: includes/ui/contacts_view.inc:89
 msgid "First Name:"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:93
+#: includes/ui/contacts_view.inc:90
 msgid "Last Name:"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:96
+#: includes/ui/contacts_view.inc:93
 msgid "Contact active for:"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:102
+#: includes/ui/contacts_view.inc:99 sales/manage/customers.php:256
 msgid "Phone:"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:105 inventory/manage/locations.php:207
-#: purchasing/manage/suppliers.php:108 sales/manage/customer_branches.php:263
-#: sales/manage/sales_people.php:158
+#: includes/ui/contacts_view.inc:102 inventory/manage/locations.php:217
+#: purchasing/manage/suppliers.php:139 sales/manage/customer_branches.php:256
+#: sales/manage/customers.php:259 sales/manage/sales_people.php:158
 msgid "E-mail:"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:110 purchasing/manage/suppliers.php:109
-#: sales/manage/customer_branches.php:264
+#: includes/ui/contacts_view.inc:107 purchasing/manage/suppliers.php:140
+#: sales/manage/customer_branches.php:257
 msgid "Document Language:"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:110 sales/manage/customer_branches.php:264
+#: includes/ui/contacts_view.inc:107 sales/manage/customer_branches.php:257
 msgid "Customer default"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:112
+#: includes/ui/contacts_view.inc:109
 msgid "Notes:"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:132
+#: includes/ui/contacts_view.inc:128
 msgid "The contact name cannot be empty."
 msgstr ""
 
-#: includes/ui/contacts_view.inc:137
+#: includes/ui/contacts_view.inc:133
 msgid "Contact reference cannot be empty."
 msgstr ""
 
-#: includes/ui/contacts_view.inc:142
+#: includes/ui/contacts_view.inc:138
 msgid "You have to select at least one category."
 msgstr ""
 
-#: includes/ui/db_pager_view.inc:166 includes/ui/ui_input.inc:892
+#: includes/ui/db_pager_view.inc:172 includes/ui/ui_input.inc:957
 msgid "Show also Inactive"
 msgstr ""
 
-#: includes/ui/db_pager_view.inc:175
+#: includes/ui/db_pager_view.inc:181
 msgid "First"
 msgstr ""
 
-#: includes/ui/db_pager_view.inc:176
+#: includes/ui/db_pager_view.inc:182
 msgid "Prev"
 msgstr ""
 
-#: includes/ui/db_pager_view.inc:177
+#: includes/ui/db_pager_view.inc:183
 msgid "Next"
 msgstr ""
 
-#: includes/ui/db_pager_view.inc:178
+#: includes/ui/db_pager_view.inc:184
 msgid "Last"
 msgstr ""
 
-#: includes/ui/db_pager_view.inc:187
+#: includes/ui/db_pager_view.inc:193
 #, php-format
 msgid "Records %d-%d of %d"
 msgstr ""
 
-#: includes/ui/db_pager_view.inc:191
+#: includes/ui/db_pager_view.inc:197
 msgid "No records"
 msgstr ""
 
-#: includes/ui/simple_crud_class.inc:227 includes/ui/ui_input.inc:203
-msgid "Submit changes"
-msgstr ""
-
-#: includes/ui/simple_crud_class.inc:229 includes/ui/ui_input.inc:204
-msgid "Clone"
+#: includes/ui/items_cart.inc:395
+msgid "Exchange rate roundings"
 msgstr ""
 
-#: includes/ui/simple_crud_class.inc:229 includes/ui/ui_input.inc:205
+#: includes/ui/simple_crud_class.inc:227 includes/ui/ui_input.inc:228
 msgid "Edit new record with current data"
 msgstr ""
 
-#: includes/ui/simple_crud_class.inc:231 includes/ui/ui_input.inc:206
+#: includes/ui/simple_crud_class.inc:229 includes/ui/ui_input.inc:229
 msgid "Cancel edition"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:72
+#: includes/ui/ui_controls.inc:93
 msgid "Request from outside of this page is forbidden."
 msgstr ""
 
-#: includes/ui/ui_controls.inc:73
+#: includes/ui/ui_controls.inc:94
 msgid "CSRF attack detected from: "
 msgstr ""
 
-#: includes/ui/ui_controls.inc:139
+#: includes/ui/ui_controls.inc:164
 msgid "You should automatically be forwarded."
 msgstr ""
 
-#: includes/ui/ui_controls.inc:140
+#: includes/ui/ui_controls.inc:165
 msgid "If this does not happen"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:140
+#: includes/ui/ui_controls.inc:165
 msgid "click here"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:140
+#: includes/ui/ui_controls.inc:165
 msgid "to continue"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:187
-msgid "View Attachment"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:190
+#: includes/ui/ui_controls.inc:215
 msgid "Close"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:450 sales/manage/customers.php:16
+#: includes/ui/ui_controls.inc:506 sales/manage/customers.php:23
+#: sales/inquiry/customers_list.php:29
 msgid "Customers"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:452
+#: includes/ui/ui_controls.inc:508
 msgid "Branches"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:454 purchasing/manage/suppliers.php:16
+#: includes/ui/ui_controls.inc:510 purchasing/manage/suppliers.php:22
+#: purchasing/inquiry/suppliers_list.php:29
 msgid "Suppliers"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:456 inventory/transfers.php:230
-#: inventory/manage/items.php:16
-msgid "Items"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:601
-msgid "Entered data has not been saved yet.\\nDo you want to abandon changes?"
+#: includes/ui/ui_controls.inc:674
+msgid ""
+"Entered data has not been saved yet.\n"
+"Do you want to abandon changes?"
 msgstr ""
 
-#: includes/ui/ui_input.inc:621 reporting/includes/reports_classes.inc:216
+#: includes/ui/ui_input.inc:654 reporting/includes/reports_classes.inc:223
 msgid "Click Here to Pick up the date"
 msgstr ""
 
-#: includes/ui/ui_input.inc:904 includes/ui/ui_lists.inc:2120
-#: reporting/rep301.php:148 reporting/rep302.php:166 reporting/rep303.php:170
-#: reporting/rep304.php:168 reporting/rep304.php:172
-#: sales/manage/customer_branches.php:302
+#: includes/ui/ui_input.inc:969 includes/ui/ui_lists.inc:2348
+#: includes/ui/ui_lists.inc.orig:2345 reporting/rep301.php:224
+#: reporting/rep302.php:168 reporting/rep303.php:178 reporting/rep304.php:184
+#: reporting/rep304.php:188 reporting/rep306.php:235 reporting/rep306.php:242
+#: reporting/rep451.php:143 sales/manage/customer_branches.php:292
 msgid "Inactive"
 msgstr ""
 
-#: includes/ui/ui_input.inc:914 includes/ui/ui_input.inc:926
+#: includes/ui/ui_input.inc:979 includes/ui/ui_input.inc:991
 msgid "Current Credit:"
 msgstr ""
 
-#: includes/ui/ui_input.inc:940
+#: includes/ui/ui_input.inc:1005
 msgid "Bank Balance:"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:17
+#: includes/ui/ui_lists.inc:17 includes/ui/ui_lists.inc.orig:17
 msgid "Set filter"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:100
+#: includes/ui/ui_lists.inc:99 includes/ui/ui_lists.inc.orig:99
 msgid "Press Space tab for search pattern entry"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:104
+#: includes/ui/ui_lists.inc:103 includes/ui/ui_lists.inc.orig:103
 msgid "Enter code fragment to search or * for all"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:105
+#: includes/ui/ui_lists.inc:104 includes/ui/ui_lists.inc.orig:104
 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:308 includes/ui/ui_lists.inc:312
+#: includes/ui/ui_lists.inc:316 includes/ui/ui_lists.inc:320
+#: includes/ui/ui_lists.inc:324 includes/ui/ui_lists.inc:329
+#: includes/ui/ui_lists.inc:333 includes/ui/ui_lists.inc.orig:308
+#: includes/ui/ui_lists.inc.orig:312 includes/ui/ui_lists.inc.orig:316
+#: includes/ui/ui_lists.inc.orig:320 includes/ui/ui_lists.inc.orig:324
+#: includes/ui/ui_lists.inc.orig:329 includes/ui/ui_lists.inc.orig:333
+#: inventory/inquiry/stock_list.php:42
+msgid "Search items"
+msgstr ""
+
+#: includes/ui/ui_lists.inc:337 includes/ui/ui_lists.inc.orig:337
+#: sales/inquiry/customers_list.php:42
+msgid "Search customers"
+msgstr ""
+
+#: includes/ui/ui_lists.inc:341 includes/ui/ui_lists.inc.orig:341
+#: sales/inquiry/customer_branches_list.php:38
+msgid "Search branches"
+msgstr ""
+
+#: includes/ui/ui_lists.inc:345 includes/ui/ui_lists.inc.orig:345
+#: purchasing/inquiry/suppliers_list.php:42
+msgid "Search suppliers"
+msgstr ""
+
+#: includes/ui/ui_lists.inc:538 includes/ui/ui_lists.inc:1546
+#: includes/ui/ui_lists.inc.orig:538 includes/ui/ui_lists.inc.orig:1543
 msgid "All Suppliers"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:442
+#: includes/ui/ui_lists.inc:542 includes/ui/ui_lists.inc.orig:542
 msgid "Press Space tab to filter by name fragment"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:443
+#: includes/ui/ui_lists.inc:543 includes/ui/ui_lists.inc.orig:543
 msgid "Select supplier"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:487
+#: includes/ui/ui_lists.inc:592 includes/ui/ui_lists.inc.orig:592
 msgid "All Customers"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:491
+#: includes/ui/ui_lists.inc:596 includes/ui/ui_lists.inc.orig:596
 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:597 includes/ui/ui_lists.inc.orig:597
 msgid "Select customer"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:535
+#: includes/ui/ui_lists.inc:642 includes/ui/ui_lists.inc.orig:642
 msgid "All branches"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:538
+#: includes/ui/ui_lists.inc:645 includes/ui/ui_lists.inc.orig:645
 msgid "Select customer branch"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:573
+#: includes/ui/ui_lists.inc:681 includes/ui/ui_lists.inc.orig:681
 msgid "All Locations"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:725 includes/ui/ui_lists.inc:790
+#: includes/ui/ui_lists.inc:838 includes/ui/ui_lists.inc:922
+#: includes/ui/ui_lists.inc.orig:838 includes/ui/ui_lists.inc.orig:922
 msgid "All Items"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1263
+#: includes/ui/ui_lists.inc:1478 includes/ui/ui_lists.inc.orig:1475
 msgid "All Sales Types"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1592
+#: includes/ui/ui_lists.inc:1825 includes/ui/ui_lists.inc.orig:1822
 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:2134 includes/ui/ui_lists.inc:2150
+#: includes/ui/ui_lists.inc:2166 includes/ui/ui_lists.inc.orig:2131
+#: includes/ui/ui_lists.inc.orig:2147 includes/ui/ui_lists.inc.orig:2163
 msgid "All Types"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1905 sales/view/view_sales_order.php:127
+#: includes/ui/ui_lists.inc:2135 includes/ui/ui_lists.inc.orig:2132
+#: 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
-msgid "Overdue Invoices"
+#: includes/ui/ui_lists.inc:2136 includes/ui/ui_lists.inc:2169
+#: includes/ui/ui_lists.inc.orig:2133 includes/ui/ui_lists.inc.orig:2166
+msgid "Unsettled transactions"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1907 includes/ui/ui_lists.inc:1924
-#: includes/ui/ui_lists.inc:1942
+#: includes/ui/ui_lists.inc:2137 includes/ui/ui_lists.inc:2153
+#: includes/ui/ui_lists.inc:2170 includes/ui/ui_lists.inc.orig:2134
+#: includes/ui/ui_lists.inc.orig:2150 includes/ui/ui_lists.inc.orig:2167
+#: includes/ui/ui_view.inc:609 includes/ui/ui_view.inc:613
 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:158
+#: includes/ui/ui_lists.inc:2138 includes/ui/ui_lists.inc:2154
+#: includes/ui/ui_lists.inc:2171 includes/ui/ui_lists.inc.orig:2135
+#: includes/ui/ui_lists.inc.orig:2151 includes/ui/ui_lists.inc.orig:2168
+#: sales/view/view_sales_order.php:176
 msgid "Credit Notes"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1909 sales/view/view_sales_order.php:93
+#: includes/ui/ui_lists.inc:2139 includes/ui/ui_lists.inc.orig:2136
+#: 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:2151 includes/ui/ui_lists.inc:2168
+#: includes/ui/ui_lists.inc.orig:2148 includes/ui/ui_lists.inc.orig:2165
 msgid "Invoices"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1926 includes/ui/ui_lists.inc:1944
+#: includes/ui/ui_lists.inc:2152 includes/ui/ui_lists.inc.orig:2149
+msgid "Overdue Invoices"
+msgstr ""
+
+#: includes/ui/ui_lists.inc:2155 includes/ui/ui_lists.inc:2172
+#: includes/ui/ui_lists.inc.orig:2152 includes/ui/ui_lists.inc.orig:2169
 msgid "Overdue Credit Notes"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1939
+#: includes/ui/ui_lists.inc:2167 includes/ui/ui_lists.inc.orig:2164
 msgid "GRNs"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1957
+#: includes/ui/ui_lists.inc:2185 includes/ui/ui_lists.inc.orig:2182
 msgid "Automatically put balance on back order"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1958
+#: includes/ui/ui_lists.inc:2186 includes/ui/ui_lists.inc.orig:2183
 msgid "Cancel any quantites not delivered"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1975
+#: includes/ui/ui_lists.inc:2203 includes/ui/ui_lists.inc.orig:2200
 msgid "Items Returned to Inventory Location"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1976
+#: includes/ui/ui_lists.inc:2204 includes/ui/ui_lists.inc.orig:2201
 msgid "Items Written Off"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2146
+#: includes/ui/ui_lists.inc:2373 includes/ui/ui_lists.inc.orig:2370
 msgid "New role"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2204
+#: includes/ui/ui_lists.inc:2425 includes/ui/ui_lists.inc.orig:2422
 msgid "No tags defined."
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2204
+#: includes/ui/ui_lists.inc:2425 includes/ui/ui_lists.inc.orig:2422
 msgid "No active tags defined."
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2242
+#: includes/ui/ui_lists.inc:2463 includes/ui/ui_lists.inc.orig:2460
 #, php-format
 msgid "Activated for '%s'"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2245
+#: includes/ui/ui_lists.inc:2466 includes/ui/ui_lists.inc.orig:2463
 msgid "Available and/or installed"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2315
+#: includes/ui/ui_lists.inc:2536 includes/ui/ui_lists.inc.orig:2533
 msgid "Standard new company American COA (4 digit)"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2317
+#: includes/ui/ui_lists.inc:2538 includes/ui/ui_lists.inc.orig:2535
 msgid "Standard American COA (4 digit) with demo data"
 msgstr ""
 
-#: includes/ui/ui_msgs.inc:63
+#: includes/ui/ui_lists.inc:2559 includes/ui/ui_lists.inc.orig:2556
+msgid "No payment Link"
+msgstr ""
+
+#: includes/ui/ui_lists.inc:2679 includes/ui/ui_lists.inc.orig:2676
+msgid "Numeric"
+msgstr ""
+
+#: includes/ui/ui_lists.inc:2679 includes/ui/ui_lists.inc.orig:2676
+msgid "Alpha Numeric"
+msgstr ""
+
+#: includes/ui/ui_lists.inc:2679 includes/ui/ui_lists.inc.orig:2676
+msgid "ALPHA NUMERIC"
+msgstr ""
+
+#: includes/ui/ui_lists.inc:2695 includes/ui/ui_lists.inc.orig:2692
+msgid "All users"
+msgstr ""
+
+#: includes/ui/ui_msgs.inc:68
 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:407 reporting/rep107.php:175
-#: reporting/rep109.php:181 reporting/rep110.php:186 reporting/rep111.php:168
-#: reporting/rep113.php:175 reporting/rep209.php:190
+#: includes/ui/ui_view.inc:442 reporting/rep107.php:261
+#: reporting/rep109.php:188 reporting/rep110.php:185 reporting/rep111.php:185
+#: reporting/rep113.php:174 reporting/rep209.php:190
 msgid "Total Tax Excluded"
 msgstr ""
 
-#: includes/ui/ui_view.inc:413 includes/ui/ui_view.inc:432
-#: includes/ui/ui_view.inc:451 reporting/includes/doctext.inc:151
+#: includes/ui/ui_view.inc:448 includes/ui/ui_view.inc:467
+#: includes/ui/ui_view.inc:491 includes/ui/ui_view.inc:508
+#: reporting/rep107.php:270 reporting/rep109.php:197 reporting/rep110.php:194
+#: reporting/rep111.php:194 reporting/rep113.php:183 reporting/rep209.php:199
 msgid "Included"
 msgstr ""
 
-#: includes/ui/ui_view.inc:484
-#: purchasing/inquiry/supplier_allocation_inquiry.php:99
-msgid "Allocations"
-msgstr ""
-
-#: includes/ui/ui_view.inc:488 reporting/includes/doctext.inc:110
+#: includes/ui/ui_view.inc:546 reporting/includes/doctext.inc:166
+#: reporting/includes/doctext.inc:207
 msgid "Total Amount"
 msgstr ""
 
-#: includes/ui/ui_view.inc:512
+#: includes/ui/ui_view.inc:570
 msgid "Total Allocated:"
 msgstr ""
 
-#: includes/ui/ui_view.inc:516
+#: includes/ui/ui_view.inc:576
 msgid "Left to Allocate:"
 msgstr ""
 
-#: includes/ui/ui_view.inc:552
+#: includes/ui/ui_view.inc:592 includes/ui/ui_view.inc:596
+#: purchasing/inquiry/supplier_allocation_inquiry.php:99
+msgid "Allocations"
+msgstr ""
+
+#: includes/ui/ui_view.inc:609 includes/ui/ui_view.inc:613
+msgid "Pre-Payments"
+msgstr ""
+
+#: includes/ui/ui_view.inc:629
 msgid "No Quick Entries are defined."
 msgstr ""
 
-#: includes/ui/ui_view.inc:580
+#: includes/ui/ui_view.inc:644
 msgid "No Quick Entry lines are defined."
 msgstr ""
 
-#: includes/ui/ui_view.inc:762 purchasing/includes/ui/invoice_ui.inc:451
+#: includes/ui/ui_view.inc:875 purchasing/includes/ui/invoice_ui.inc:482
 msgid "and"
 msgstr ""
 
-#: includes/ui/ui_view.inc:823
+#: includes/ui/ui_view.inc:982
 msgid "January"
 msgstr ""
 
-#: includes/ui/ui_view.inc:823
+#: includes/ui/ui_view.inc:982
 msgid "February"
 msgstr ""
 
-#: includes/ui/ui_view.inc:823
+#: includes/ui/ui_view.inc:982
 msgid "March"
 msgstr ""
 
-#: includes/ui/ui_view.inc:823
+#: includes/ui/ui_view.inc:982
 msgid "April"
 msgstr ""
 
-#: includes/ui/ui_view.inc:823
-msgid "May"
-msgstr ""
-
-#: includes/ui/ui_view.inc:823
+#: includes/ui/ui_view.inc:982
 msgid "June"
 msgstr ""
 
-#: includes/ui/ui_view.inc:823
+#: includes/ui/ui_view.inc:982
 msgid "July"
 msgstr ""
 
-#: includes/ui/ui_view.inc:823
+#: includes/ui/ui_view.inc:982
 msgid "August"
 msgstr ""
 
-#: includes/ui/ui_view.inc:823
+#: includes/ui/ui_view.inc:982
 msgid "September"
 msgstr ""
 
-#: includes/ui/ui_view.inc:823
+#: includes/ui/ui_view.inc:982
 msgid "October"
 msgstr ""
 
-#: includes/ui/ui_view.inc:823
+#: includes/ui/ui_view.inc:982
 msgid "November"
 msgstr ""
 
-#: includes/ui/ui_view.inc:823
+#: includes/ui/ui_view.inc:982
 msgid "December"
 msgstr ""
 
-#: includes/ui/ui_view.inc:824
+#: includes/ui/ui_view.inc:983
 msgid "Su"
 msgstr ""
 
-#: includes/ui/ui_view.inc:824
+#: includes/ui/ui_view.inc:983
 msgid "Mo"
 msgstr ""
 
-#: includes/ui/ui_view.inc:824
+#: includes/ui/ui_view.inc:983
 msgid "Tu"
 msgstr ""
 
-#: includes/ui/ui_view.inc:824
+#: includes/ui/ui_view.inc:983
 msgid "We"
 msgstr ""
 
-#: includes/ui/ui_view.inc:824
+#: includes/ui/ui_view.inc:983
 msgid "Th"
 msgstr ""
 
-#: includes/ui/ui_view.inc:824
+#: includes/ui/ui_view.inc:983
 msgid "Fr"
 msgstr ""
 
-#: includes/ui/ui_view.inc:824
+#: includes/ui/ui_view.inc:983
 msgid "Sa"
 msgstr ""
 
-#: includes/ui/ui_view.inc:825
+#: includes/ui/ui_view.inc:984
 msgid "W"
 msgstr ""
 
-#: includes/ui/view_package.php:7
-msgid "Package Details"
+#: inventory/adjustments.php:34
+msgid "Item Adjustments Note"
 msgstr ""
 
-#: includes/ui/view_package.php:14
-msgid ""
-"The script must be called with a valid package id to review the info for."
+#: inventory/adjustments.php:50
+msgid "Fixed Assets disposal has been processed"
 msgstr ""
 
-#: includes/ui/view_package.php:19
-msgid "Available version"
+#: inventory/adjustments.php:51
+msgid "&View this disposal"
 msgstr ""
 
-#: includes/ui/view_package.php:20
-msgid "Package type"
+#: inventory/adjustments.php:53
+msgid "View the GL &Postings for this Disposal"
 msgstr ""
 
-#: includes/ui/view_package.php:21
-msgid "Package content"
+#: inventory/adjustments.php:54
+msgid "Enter &Another Disposal"
 msgstr ""
 
-#: includes/ui/view_package.php:23
-msgid "Author"
+#: inventory/adjustments.php:57
+msgid "Items adjustment has been processed"
 msgstr ""
 
-#: includes/ui/view_package.php:24
-msgid "Home page"
+#: inventory/adjustments.php:58
+msgid "&View this adjustment"
 msgstr ""
 
-#: includes/ui/view_package.php:25
-msgid "Package maintainer"
+#: inventory/adjustments.php:60
+msgid "View the GL &Postings for this Adjustment"
 msgstr ""
 
-#: includes/ui/view_package.php:26
-msgid "Installation path"
+#: inventory/adjustments.php:62
+msgid "Enter &Another Adjustment"
 msgstr ""
 
-#: includes/ui/view_package.php:27
-msgid "Minimal software versions"
+#: inventory/adjustments.php:104 inventory/transfers.php:98
+#: sales/sales_order_entry.php:383
+msgid "You must enter at least one non empty item line."
 msgstr ""
 
-#: includes/ui/view_package.php:28
-msgid "Right to left"
+#: inventory/adjustments.php:117
+msgid "The entered date for the adjustment is invalid."
 msgstr ""
 
-#: includes/ui/view_package.php:29
-msgid "Charset encoding"
+#: inventory/adjustments.php:133
+msgid ""
+"The adjustment cannot be processed because it would cause negative inventory "
+"balance for marked items as of document date or later."
 msgstr ""
 
-#: includes/ui/view_package.php:34
-#, php-format
-msgid "Content information for package '%s'"
+#: inventory/adjustments.php:166
+msgid "The quantity entered is invalid."
 msgstr ""
 
-#: includes/ui/view_package.php:37
-msgid "Property"
+#: inventory/adjustments.php:173 manufacturing/work_order_issue.php:136
+msgid "The entered standard cost is negative or invalid."
 msgstr ""
 
-#: inventory/adjustments.php:28
-msgid "Item Adjustments Note"
+#: inventory/adjustments.php:228 inventory/cost_update.php:42
+#: inventory/transfers.php:216 sales/sales_order_entry.php:701
+msgid "There are no fixed assets defined in the system."
 msgstr ""
 
-#: inventory/adjustments.php:32
+#: inventory/adjustments.php:230
 msgid ""
 "There are no inventory items defined in the system which can be adjusted "
 "(Purchased or Manufactured)."
 msgstr ""
 
-#: inventory/adjustments.php:34 inventory/transfers.php:34
-msgid ""
-"There are no inventory movement types defined in the system. Please define "
-"at least one inventory adjustment type."
-msgstr ""
-
-#: inventory/adjustments.php:43
-msgid "Items adjustment has been processed"
-msgstr ""
-
-#: inventory/adjustments.php:44
-msgid "&View this adjustment"
-msgstr ""
-
-#: inventory/adjustments.php:46
-msgid "View the GL &Postings for this Adjustment"
-msgstr ""
-
-#: inventory/adjustments.php:48
-msgid "Enter &Another Adjustment"
-msgstr ""
-
-#: inventory/adjustments.php:90 inventory/transfers.php:87
-#: sales/sales_order_entry.php:352
-msgid "You must enter at least one non empty item line."
-msgstr ""
-
-#: inventory/adjustments.php:110 inventory/transfers.php:105
-msgid "The entered date for the adjustment is invalid."
-msgstr ""
-
-#: inventory/adjustments.php:124
-msgid ""
-"The adjustment cannot be processed because an adjustment item would cause a "
-"negative inventory balance :"
+#: inventory/adjustments.php:239
+msgid "Disposal Items"
 msgstr ""
 
-#: inventory/adjustments.php:154 manufacturing/work_order_issue.php:141
-msgid "The quantity entered is negative or invalid."
-msgstr ""
-
-#: inventory/adjustments.php:161 manufacturing/work_order_issue.php:148
-msgid "The entered standard cost is negative or invalid."
+#: inventory/adjustments.php:240
+msgid "Process Disposal"
 msgstr ""
 
-#: inventory/adjustments.php:230
+#: inventory/adjustments.php:242
 msgid "Adjustment Items"
 msgstr ""
 
-#: inventory/adjustments.php:236
+#: inventory/adjustments.php:243
 msgid "Process Adjustment"
 msgstr ""
 
-#: inventory/cost_update.php:26
+#: inventory/cost_update.php:32
+msgid "FA Revaluation"
+msgstr ""
+
+#: inventory/cost_update.php:35
 msgid "Inventory Item Cost Update"
 msgstr ""
 
-#: inventory/cost_update.php:30
+#: inventory/cost_update.php:44
 msgid ""
 "There are no costable inventory items defined in the system (Purchased or "
 "manufactured items)."
 msgstr ""
 
-#: inventory/cost_update.php:51
+#: inventory/cost_update.php:65
 msgid "The entered cost is not numeric."
 msgstr ""
 
-#: inventory/cost_update.php:57
+#: inventory/cost_update.php:71
 msgid "The new cost is the same as the old cost. Cost was not updated."
 msgstr ""
 
-#: inventory/cost_update.php:67
+#: inventory/cost_update.php:82
 msgid "Cost has been updated."
 msgstr ""
 
-#: inventory/cost_update.php:71
+#: inventory/cost_update.php:86
 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/inquiry/stock_movements.php:49
-#: inventory/inquiry/stock_status.php:41 inventory/manage/item_codes.php:105
-#: manufacturing/work_order_entry.php:396
-#: manufacturing/work_order_entry.php:401 purchasing/inquiry/po_search.php:74
-#: sales/inquiry/sales_deliveries_view.php:114
-#: sales/inquiry/sales_orders_view.php:233
+#: inventory/cost_update.php:110 inventory/prices.php:66
+#: inventory/purchasing_data.php:121 inventory/reorder_level.php:54
+#: inventory/inquiry/stock_movements.php:65
+#: inventory/inquiry/stock_movements.php:74
+#: inventory/inquiry/stock_status.php:45 inventory/manage/item_codes.php:108
+#: manufacturing/work_order_entry.php:376
+#: manufacturing/work_order_entry.php:381 purchasing/inquiry/po_search.php:74
+#: sales/inquiry/sales_deliveries_view.php:112
+#: sales/inquiry/sales_orders_view.php:229
 msgid "Item:"
 msgstr ""
 
-#: inventory/cost_update.php:105
-msgid "Standard Material Cost Per Unit"
+#: inventory/cost_update.php:133
+msgid "Unit cost"
 msgstr ""
 
-#: inventory/cost_update.php:108
+#: inventory/cost_update.php:137
 msgid "Standard Labour Cost Per Unit"
 msgstr ""
 
-#: inventory/cost_update.php:109
+#: inventory/cost_update.php:138
 msgid "Standard Overhead Cost Per Unit"
 msgstr ""
 
-#: inventory/prices.php:16
+#: inventory/cost_update.php:145
+msgid "Reference line:"
+msgstr ""
+
+#: inventory/prices.php:29
 msgid "Inventory Item Sales prices"
 msgstr ""
 
-#: inventory/prices.php:27 inventory/inquiry/stock_movements.php:30
-#: inventory/inquiry/stock_status.php:34 inventory/manage/sales_kits.php:24
+#: inventory/prices.php:33 inventory/inquiry/stock_movements.php:41
+#: inventory/inquiry/stock_status.php:36 inventory/manage/sales_kits.php:26
 #: manufacturing/inquiry/where_used_inquiry.php:21
 #: sales/credit_note_entry.php:49
 msgid "There are no items defined in the system."
 msgstr ""
 
-#: inventory/prices.php:29
+#: inventory/prices.php:35
 msgid ""
 "There are no sales types in the system. Please set up sales types befor "
 "entering pricing."
 msgstr ""
 
-#: inventory/prices.php:70
+#: inventory/prices.php:82
 msgid "The price entered must be numeric."
 msgstr ""
 
-#: inventory/prices.php:83
+#: inventory/prices.php:88
+msgid ""
+"The sales pricing for this item, sales type and currency has already been "
+"added."
+msgstr ""
+
+#: inventory/prices.php:101
 msgid "This price has been updated."
 msgstr ""
 
-#: inventory/prices.php:91
+#: inventory/prices.php:109
 msgid "The new price has been added."
 msgstr ""
 
-#: inventory/prices.php:105
+#: inventory/prices.php:123
 msgid "The selected price has been deleted."
 msgstr ""
 
-#: inventory/prices.php:133 reporting/rep104.php:116
-#: sales/customer_delivery.php:352 sales/customer_invoice.php:396
+#: inventory/prices.php:151 reporting/rep104.php:116
+#: sales/customer_delivery.php:343 sales/customer_invoice.php:453
 #: sales/view/view_credit.php:73 sales/view/view_dispatch.php:93
-#: sales/view/view_invoice.php:92 sales/includes/ui/sales_credit_ui.inc:102
+#: sales/view/view_invoice.php:93 sales/includes/ui/sales_credit_ui.inc:98
 msgid "Sales Type"
 msgstr ""
 
-#: inventory/prices.php:133 inventory/purchasing_data.php:129
-#: purchasing/includes/ui/invoice_ui.inc:483
+#: inventory/prices.php:151 inventory/purchasing_data.php:150
+#: purchasing/includes/ui/invoice_ui.inc:514
 #: purchasing/po_receive_items.php:63 purchasing/view/view_grn.php:41
 #: purchasing/view/view_po.php:45 reporting/rep104.php:109
-#: reporting/includes/doctext.inc:105 reporting/includes/doctext.inc:113
-#: sales/customer_credit_invoice.php:283 sales/customer_delivery.php:430
-#: sales/customer_invoice.php:449 sales/view/view_credit.php:91
-#: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:114
-#: sales/view/view_sales_order.php:202
-#: sales/includes/ui/sales_credit_ui.inc:168
+#: reporting/includes/doctext.inc:32 reporting/includes/doctext.inc:191
+#: sales/customer_credit_invoice.php:276 sales/customer_delivery.php:421
+#: sales/customer_invoice.php:519 sales/customer_invoice.php:522
+#: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113
+#: sales/view/view_invoice.php:116 sales/view/view_sales_order.php:220
+#: sales/includes/ui/sales_credit_ui.inc:163
 msgid "Price"
 msgstr ""
 
-#: inventory/prices.php:155
+#: inventory/prices.php:173
 msgid "There are no prices set up for this part."
 msgstr ""
 
-#: inventory/prices.php:174
-msgid "Currency:"
-msgstr ""
-
-#: inventory/prices.php:176
+#: inventory/prices.php:195
 msgid "Sales Type:"
 msgstr ""
 
-#: inventory/prices.php:184 inventory/purchasing_data.php:191
+#: inventory/prices.php:203 inventory/purchasing_data.php:213
 msgid "Price:"
 msgstr ""
 
-#: inventory/prices.php:184
+#: inventory/prices.php:203
 msgid "per"
 msgstr ""
 
-#: inventory/prices.php:188
+#: inventory/prices.php:207
 msgid "The price is calculated."
 msgstr ""
 
-#: inventory/purchasing_data.php:16
+#: inventory/purchasing_data.php:27
 msgid "Supplier Purchasing Data"
 msgstr ""
 
-#: inventory/purchasing_data.php:23 purchasing/po_entry_items.php:64
+#: inventory/purchasing_data.php:29 purchasing/po_entry_items.php:149
 msgid "There are no purchasable inventory items defined in the system."
 msgstr ""
 
-#: inventory/purchasing_data.php:24 purchasing/po_entry_items.php:62
-#: purchasing/supplier_credit.php:32 purchasing/supplier_invoice.php:32
-#: purchasing/supplier_payment.php:40 purchasing/supplier_payment.php.orig:40
+#: inventory/purchasing_data.php:30 purchasing/po_entry_items.php:73
+#: purchasing/supplier_credit.php:31 purchasing/supplier_invoice.php:30
+#: purchasing/supplier_payment.php:40
 msgid "There are no suppliers defined in the system."
 msgstr ""
 
-#: inventory/purchasing_data.php:38 inventory/manage/item_codes.php:35
+#: inventory/purchasing_data.php:48 inventory/manage/item_codes.php:38
 msgid "There is no item selected."
 msgstr ""
 
-#: inventory/purchasing_data.php:44
+#: inventory/purchasing_data.php:54
 msgid "The price entered was not numeric."
 msgstr ""
 
-#: inventory/purchasing_data.php:50
+#: inventory/purchasing_data.php:60
 msgid ""
 "The conversion factor entered was not numeric. The conversion factor is the "
 "number by which the price must be divided by to get the unit price in our "
 "unit of measure."
 msgstr ""
 
-#: inventory/purchasing_data.php:60
+#: inventory/purchasing_data.php:66
+msgid "The purchasing data for this supplier has already been added."
+msgstr ""
+
+#: inventory/purchasing_data.php:75
 msgid "This supplier purchasing data has been added."
 msgstr ""
 
-#: inventory/purchasing_data.php:66
+#: inventory/purchasing_data.php:81
 msgid "Supplier purchasing data has been updated."
 msgstr ""
 
-#: inventory/purchasing_data.php:77
+#: inventory/purchasing_data.php:92
 msgid "The purchasing data item has been sucessfully deleted."
 msgstr ""
 
-#: inventory/purchasing_data.php:114
+#: inventory/purchasing_data.php:135
 msgid "Entered item is not defined. Please re-enter."
 msgstr ""
 
-#: inventory/purchasing_data.php:123
+#: inventory/purchasing_data.php:144
 msgid "There is no purchasing data set up for the part selected"
 msgstr ""
 
-#: inventory/purchasing_data.php:130
+#: inventory/purchasing_data.php:151
 msgid "Supplier's Unit"
 msgstr ""
 
-#: inventory/purchasing_data.php:130
+#: inventory/purchasing_data.php:151
 msgid "Conversion Factor"
 msgstr ""
 
-#: inventory/purchasing_data.php:130
+#: inventory/purchasing_data.php:151
 msgid "Supplier's Description"
 msgstr ""
 
-#: inventory/purchasing_data.php:192
+#: inventory/purchasing_data.php:214
 msgid "Suppliers Unit of Measure:"
 msgstr ""
 
-#: inventory/purchasing_data.php:198
+#: inventory/purchasing_data.php:220
 msgid "Conversion Factor (to our UOM):"
 msgstr ""
 
-#: inventory/purchasing_data.php:200
+#: inventory/purchasing_data.php:221
 msgid "Supplier's Code or Description:"
 msgstr ""
 
-#: inventory/reorder_level.php:16
+#: inventory/reorder_level.php:28
 msgid "Reorder Levels"
 msgstr ""
 
-#: inventory/reorder_level.php:24 inventory/transfers.php:32
+#: inventory/reorder_level.php:30 inventory/transfers.php:42
+#: inventory/transfers.php:218
 msgid ""
 "There are no inventory items defined in the system (Purchased or "
 "manufactured items)."
 msgstr ""
 
-#: inventory/reorder_level.php:57 inventory/inquiry/stock_status.php:65
-#: inventory/inquiry/stock_status.php:69
-#: manufacturing/search_work_orders.php:162
+#: inventory/reorder_level.php:71 inventory/inquiry/stock_movements.php:107
+#: inventory/inquiry/stock_status.php:70 inventory/inquiry/stock_status.php:74
+#: manufacturing/search_work_orders.php:160
 #: manufacturing/inquiry/where_used_inquiry.php:45
-#: manufacturing/manage/bom_edit.php: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:106 reporting/rep302.php:130
-#: reporting/rep303.php:122 reporting/rep304.php:123
-#: reporting/reports_main.php:179 reporting/reports_main.php:185
-#: reporting/reports_main.php:190 reporting/reports_main.php:201
+#: manufacturing/manage/bom_edit.php:43
+#: purchasing/inquiry/po_search_completed.php:113
+#: purchasing/inquiry/po_search_completed.php:123
+#: purchasing/inquiry/po_search.php:120 purchasing/inquiry/po_search.php:131
+#: reporting/rep105.php:120 reporting/rep301.php:171 reporting/rep302.php:130
+#: reporting/rep303.php:133 reporting/rep304.php:136 reporting/rep306.php:150
+#: reporting/rep307.php:121 reporting/rep308.php:231 reporting/rep402.php:103
+#: reporting/rep402.php:109 reporting/rep451.php:87
+#: reporting/reports_main.php:212 reporting/reports_main.php:219
+#: reporting/reports_main.php:225 reporting/reports_main.php:238
+#: reporting/reports_main.php:254 reporting/reports_main.php:264
+#: reporting/reports_main.php:272 reporting/reports_main.php:294
 #: sales/manage/sales_points.php:84
 msgid "Location"
 msgstr ""
 
-#: inventory/reorder_level.php:57 inventory/inquiry/stock_movements.php:77
-#: inventory/inquiry/stock_status.php:69 purchasing/supplier_credit.php:203
-#: sales/sales_order_entry.php:493 sales/includes/ui/sales_order_ui.inc:175
+#: inventory/reorder_level.php:71 inventory/inquiry/stock_movements.php:109
+#: inventory/inquiry/stock_status.php:74 purchasing/supplier_credit.php:220
 msgid "Quantity On Hand"
 msgstr ""
 
-#: inventory/reorder_level.php: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:71 inventory/includes/inventory_db.inc:99
+#: inventory/inquiry/stock_status.php:74
 msgid "Re-Order Level"
 msgstr ""
 
-#: inventory/reorder_level.php:75
+#: inventory/reorder_level.php:89
 msgid "Reorder levels has been updated."
 msgstr ""
 
-#: inventory/transfers.php:28
+#: inventory/transfers.php:32
+msgid "Fixed Assets Location Transfers"
+msgstr ""
+
+#: inventory/transfers.php:35
 msgid "Inventory Location Transfers"
 msgstr ""
 
-#: inventory/transfers.php:43
+#: inventory/transfers.php:51
 msgid "Inventory transfer has been processed"
 msgstr ""
 
-#: inventory/transfers.php:44
+#: inventory/transfers.php:52
 msgid "&View this transfer"
 msgstr ""
 
-#: inventory/transfers.php:46
+#: inventory/transfers.php:57
+msgid "Enter &Another Fixed Assets Transfer"
+msgstr ""
+
+#: inventory/transfers.php:59
 msgid "Enter &Another Inventory Transfer"
 msgstr ""
 
-#: inventory/transfers.php:117
+#: inventory/transfers.php:109
+msgid "The entered transfer date is invalid."
+msgstr ""
+
+#: inventory/transfers.php:121
 msgid "The locations to transfer from and to must be different."
 msgstr ""
 
-#: inventory/transfers.php:127
+#: inventory/transfers.php:131
 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:161
 msgid "The quantity entered must be a positive number."
 msgstr ""
 
-#: inventory/transfers.php:237
+#: inventory/transfers.php:238
 msgid "Process Transfer"
 msgstr ""
 
-#: inventory/includes/item_adjustments_ui.inc:20
-#: inventory/includes/stock_transfers_ui.inc:20
-#: manufacturing/includes/work_order_issue_ui.inc:20
-#: sales/includes/ui/sales_order_ui.inc:60
-msgid "For Part :"
+#: inventory/includes/inventory_db.inc:96
+msgid "Stocks below Re-Order Level at "
 msgstr ""
 
-#: inventory/includes/item_adjustments_ui.inc:34
-#: manufacturing/work_order_entry.php:210 purchasing/inquiry/po_search.php:67
-#: sales/inquiry/sales_deliveries_view.php:107
-#: sales/inquiry/sales_orders_view.php:224
-msgid "Location:"
+#: inventory/includes/inventory_db.inc:99
+msgid "Below"
 msgstr ""
 
-#: inventory/includes/item_adjustments_ui.inc:43
-msgid "Detail:"
+#: inventory/includes/inventory_db.inc:100
+msgid "Please reorder"
 msgstr ""
 
-#: inventory/includes/item_adjustments_ui.inc:48
-msgid "Positive Adjustment"
+#: inventory/includes/item_adjustments_ui.inc:20
+#: inventory/includes/stock_transfers_ui.inc:20
+#: manufacturing/includes/work_order_issue_ui.inc:20
+#: sales/includes/ui/sales_order_ui.inc:59
+msgid "For Part :"
 msgstr ""
 
-#: inventory/includes/item_adjustments_ui.inc:48
-msgid "Negative Adjustment"
+#: inventory/includes/item_adjustments_ui.inc:34
+#: manufacturing/work_order_entry.php:200 purchasing/inquiry/po_search.php:67
+#: sales/inquiry/sales_deliveries_view.php:105
+#: sales/inquiry/sales_orders_view.php:220
+msgid "Location:"
 msgstr ""
 
-#: inventory/includes/item_adjustments_ui.inc:62
-#: inventory/includes/stock_transfers_ui.inc:60
+#: inventory/includes/item_adjustments_ui.inc:56
+#: inventory/includes/item_adjustments_ui.inc:59
+#: inventory/includes/stock_transfers_ui.inc:57
+#: inventory/inquiry/stock_list.php:53 inventory/view/view_adjustment.php:54
+#: inventory/view/view_transfer.php:50
 #: manufacturing/includes/work_order_issue_ui.inc:33
-#: purchasing/includes/ui/po_ui.inc:236 purchasing/po_receive_items.php:62
+#: purchasing/includes/ui/po_ui.inc:214 purchasing/po_receive_items.php:62
 #: purchasing/view/view_grn.php:40 purchasing/view/view_po.php:45
-#: reporting/includes/doctext.inc:104 reporting/includes/doctext.inc:107
-#: reporting/includes/doctext.inc:112 sales/customer_credit_invoice.php:282
-#: sales/customer_delivery.php:428 sales/customer_invoice.php:448
-#: sales/view/view_credit.php:90 sales/view/view_dispatch.php:112
-#: sales/view/view_invoice.php:113 sales/view/view_sales_order.php:201
-#: sales/includes/ui/sales_credit_ui.inc:167
-#: sales/includes/ui/sales_order_ui.inc:140
+#: reporting/includes/doctext.inc:31 reporting/includes/doctext.inc:190
+#: reporting/includes/doctext.inc:227 sales/customer_credit_invoice.php:275
+#: sales/customer_delivery.php:419 sales/customer_invoice.php:518
+#: sales/customer_invoice.php:521 sales/view/view_credit.php:90
+#: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:115
+#: sales/view/view_sales_order.php:219
+#: sales/includes/ui/sales_credit_ui.inc:162
+#: sales/includes/ui/sales_order_ui.inc:146
 msgid "Item Code"
 msgstr ""
 
-#: inventory/includes/item_adjustments_ui.inc:62
-#: inventory/includes/stock_transfers_ui.inc:60
+#: inventory/includes/item_adjustments_ui.inc:56
+#: inventory/includes/item_adjustments_ui.inc:59
+#: inventory/includes/stock_transfers_ui.inc:57
 #: manufacturing/includes/work_order_issue_ui.inc:33
-#: purchasing/includes/ui/po_ui.inc:236 purchasing/view/view_grn.php:40
-#: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:104
-#: reporting/includes/doctext.inc:107 reporting/includes/doctext.inc:112
-#: sales/customer_credit_invoice.php:282 sales/customer_delivery.php:428
-#: sales/customer_invoice.php:448 sales/view/view_credit.php:90
-#: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:113
-#: sales/view/view_sales_order.php:201
-#: sales/includes/ui/sales_credit_ui.inc:167
-#: sales/includes/ui/sales_order_ui.inc:140
+#: purchasing/includes/ui/po_ui.inc:214 purchasing/view/view_grn.php:40
+#: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:31
+#: reporting/includes/doctext.inc:190 reporting/includes/doctext.inc:227
+#: sales/customer_credit_invoice.php:275 sales/customer_delivery.php:419
+#: sales/customer_invoice.php:518 sales/customer_invoice.php:521
+#: sales/view/view_credit.php:90 sales/view/view_dispatch.php:112
+#: sales/view/view_invoice.php:115 sales/view/view_sales_order.php:219
+#: sales/includes/ui/sales_credit_ui.inc:162
+#: sales/includes/ui/sales_order_ui.inc:146
 msgid "Item Description"
 msgstr ""
 
-#: inventory/includes/item_adjustments_ui.inc:62
-#: inventory/includes/stock_transfers_ui.inc:60
-#: inventory/manage/item_codes.php:124 inventory/manage/sales_kits.php:40
-#: inventory/view/view_adjustment.php:56 inventory/view/view_transfer.php:56
-#: manufacturing/view/wo_issue_view.php:77
-#: manufacturing/manage/bom_edit.php:71
-#: manufacturing/includes/manufacturing_ui.inc:29
-#: manufacturing/includes/manufacturing_ui.inc:157
-#: manufacturing/includes/manufacturing_ui.inc:332
-#: manufacturing/includes/work_order_issue_ui.inc:33
-#: purchasing/includes/ui/invoice_ui.inc:483
-#: purchasing/includes/ui/po_ui.inc:236 purchasing/view/view_grn.php:40
-#: purchasing/view/view_po.php:45 reporting/rep301.php:100
-#: reporting/rep303.php:109 reporting/rep303.php:115 reporting/rep401.php:69
-#: reporting/includes/doctext.inc:49 reporting/includes/doctext.inc:105
-#: reporting/includes/doctext.inc:112 sales/view/view_credit.php:90
-#: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:113
-#: sales/view/view_sales_order.php:201
-#: sales/includes/ui/sales_credit_ui.inc:167
-#: sales/includes/ui/sales_order_ui.inc:140
-msgid "Quantity"
-msgstr ""
-
-#: inventory/includes/item_adjustments_ui.inc:63
-#: inventory/includes/stock_transfers_ui.inc:60
+#: inventory/includes/item_adjustments_ui.inc:57
+#: inventory/includes/item_adjustments_ui.inc:60
+#: inventory/includes/stock_transfers_ui.inc:57
 #: inventory/manage/item_units.php:94
 #: manufacturing/includes/work_order_issue_ui.inc:34
-#: purchasing/includes/ui/po_ui.inc:237 purchasing/view/view_grn.php:41
-#: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:105
-#: reporting/includes/doctext.inc:113 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/includes/ui/sales_credit_ui.inc:167
-#: sales/includes/ui/sales_order_ui.inc:142
+#: purchasing/includes/ui/po_ui.inc:215 purchasing/view/view_grn.php:41
+#: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:32
+#: reporting/includes/doctext.inc:191 sales/view/view_credit.php:91
+#: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:116
+#: sales/view/view_sales_order.php:219
+#: sales/includes/ui/sales_credit_ui.inc:162
+#: sales/includes/ui/sales_order_ui.inc:148
 msgid "Unit"
 msgstr ""
 
-#: inventory/includes/item_adjustments_ui.inc:63
-#: inventory/view/view_adjustment.php:57
+#: inventory/includes/item_adjustments_ui.inc:57
+#: inventory/includes/item_adjustments_ui.inc:60
+#: inventory/view/view_adjustment.php:55
+#: manufacturing/view/wo_issue_view.php:76
 #: manufacturing/includes/manufacturing_ui.inc:29
-#: manufacturing/includes/work_order_issue_ui.inc:34 reporting/rep301.php:100
+#: manufacturing/includes/work_order_issue_ui.inc:34 reporting/rep301.php:164
 msgid "Unit Cost"
 msgstr ""
 
+#: inventory/includes/item_adjustments_ui.inc:57
+#: inventory/manage/items.php:526
+msgid "Initial Value"
+msgstr ""
+
+#: inventory/includes/item_adjustments_ui.inc:118
+msgid ""
+"Marked items have insufficient quantities in stock as on day of adjustment."
+msgstr ""
+
 #: inventory/includes/stock_transfers_ui.inc:35
-#: inventory/inquiry/stock_movements.php:56
-#: manufacturing/includes/work_order_issue_ui.inc:164
+#: inventory/inquiry/stock_movements.php:83
+#: manufacturing/includes/work_order_issue_ui.inc:158
 msgid "From Location:"
 msgstr ""
 
@@ -7309,359 +8700,479 @@ msgstr ""
 msgid "To Location:"
 msgstr ""
 
-#: inventory/includes/stock_transfers_ui.inc:46
-msgid "Transfer Type:"
+#: inventory/includes/stock_transfers_ui.inc:98
+msgid ""
+"Marked items have insufficient quantities in stock as on day of transfer."
 msgstr ""
 
-#: inventory/includes/db/items_db.inc:119
+#: inventory/includes/db/items_db.inc:139
 msgid ""
 "Cannot delete this item because there are stock movements that refer to this "
 "item."
 msgstr ""
 
-#: inventory/includes/db/items_db.inc:122
+#: inventory/includes/db/items_db.inc:142
 msgid ""
 "Cannot delete this item record because there are bills of material that "
 "require this part as a component."
 msgstr ""
 
-#: inventory/includes/db/items_db.inc:125
-#: inventory/includes/db/items_db.inc:128
+#: inventory/includes/db/items_db.inc:145
+#: inventory/includes/db/items_db.inc:148
 msgid ""
 "Cannot delete this item because there are existing purchase order items for "
 "it."
 msgstr ""
 
-#: inventory/includes/db/items_db.inc:146
+#: inventory/includes/db/items_db.inc:166
 msgid ""
 "This item cannot be deleted because some code aliases \n"
 "\t\t\t\tor foreign codes was entered for it, or there are kits defined \n"
 "\t\t\t\tusing this item as component"
 msgstr ""
 
-#: inventory/inquiry/stock_movements.php:27
+#: inventory/includes/db/items_trans_db.inc:63
+#, php-format
+msgid "Cost was %s changed to %s x quantity on hand of %s"
+msgstr ""
+
+#: inventory/inquiry/stock_movements.php:30
+msgid "Fixed Assets Movement"
+msgstr ""
+
+#: inventory/inquiry/stock_movements.php:32
 msgid "Inventory Item Movement"
 msgstr ""
 
-#: inventory/inquiry/stock_movements.php:61
+#: inventory/inquiry/stock_movements.php:39
+msgid "There are no fixed asset defined in the system."
+msgstr ""
+
+#: inventory/inquiry/stock_movements.php:88
 msgid "Show Movements"
 msgstr ""
 
-#: inventory/inquiry/stock_movements.php:61
-#: purchasing/includes/ui/invoice_ui.inc:452
+#: inventory/inquiry/stock_movements.php:88
+#: purchasing/includes/ui/invoice_ui.inc:483
 #: purchasing/inquiry/supplier_allocation_inquiry.php:57
-#: purchasing/inquiry/supplier_inquiry.php:54
-#: purchasing/inquiry/supplier_inquiry.php.orig:54
+#: purchasing/inquiry/supplier_inquiry.php:147
 #: sales/inquiry/customer_allocation_inquiry.php:51
-#: sales/inquiry/customer_inquiry.php:54
+#: sales/inquiry/customer_inquiry.php:164
 msgid "Refresh Inquiry"
 msgstr ""
 
-#: inventory/inquiry/stock_movements.php:76
+#: inventory/inquiry/stock_movements.php:109
 msgid "Detail"
 msgstr ""
 
-#: inventory/inquiry/stock_movements.php:77
+#: inventory/inquiry/stock_movements.php:109 reporting/rep307.php:114
 msgid "Quantity In"
 msgstr ""
 
-#: inventory/inquiry/stock_movements.php:77
+#: inventory/inquiry/stock_movements.php:109 reporting/rep307.php:114
 msgid "Quantity Out"
 msgstr ""
 
-#: inventory/inquiry/stock_movements.php:92
+#: inventory/inquiry/stock_movements.php:119
 msgid "Quantity on hand before"
 msgstr ""
 
-#: inventory/inquiry/stock_movements.php:180
+#: inventory/inquiry/stock_movements.php:184
 msgid "Quantity on hand after"
 msgstr ""
 
-#: inventory/inquiry/stock_status.php:18 inventory/inquiry/stock_status.php:20
+#: inventory/inquiry/stock_status.php:23
 msgid "Inventory Item Status"
 msgstr ""
 
-#: inventory/inquiry/stock_status.php:55
+#: inventory/inquiry/stock_status.php:60
 msgid ""
 "This is a service and cannot have a stock holding, only the total quantity "
 "on outstanding sales orders is shown."
 msgstr ""
 
-#: inventory/inquiry/stock_status.php:65 inventory/inquiry/stock_status.php:70
-#: reporting/rep303.php:109 reporting/rep303.php:115
+#: inventory/inquiry/stock_status.php:70 inventory/inquiry/stock_status.php:75
+#: reporting/rep303.php:120 reporting/rep303.php:126
 msgid "Demand"
 msgstr ""
 
-#: inventory/inquiry/stock_status.php:70 reporting/rep303.php:109
-#: reporting/rep303.php:115
+#: inventory/inquiry/stock_status.php:75 reporting/rep303.php:120
+#: reporting/rep303.php:126
 msgid "On Order"
 msgstr ""
 
-#: inventory/manage/item_categories.php:16
-msgid "Item Categories"
-msgstr ""
-
-#: inventory/manage/item_categories.php:34
+#: inventory/manage/item_categories.php:47
 msgid "The item category description cannot be empty."
 msgstr ""
 
-#: inventory/manage/item_categories.php:48
+#: inventory/manage/item_categories.php:61
 msgid "Selected item category has been updated"
 msgstr ""
 
-#: inventory/manage/item_categories.php:58
+#: inventory/manage/item_categories.php:71
 msgid "New item category has been added"
 msgstr ""
 
-#: inventory/manage/item_categories.php:72
+#: inventory/manage/item_categories.php:85
 msgid ""
 "Cannot delete this item category because items have been created using this "
 "item category."
 msgstr ""
 
-#: inventory/manage/item_categories.php:77
-msgid "Selected item category has been deleted"
+#: inventory/manage/item_categories.php:90
+msgid "Selected item category has been deleted"
+msgstr ""
+
+#: inventory/manage/item_categories.php:117
+#: inventory/manage/item_categories.php:121
+msgid "Tax type"
+msgstr ""
+
+#: inventory/manage/item_categories.php:117
+#: inventory/manage/item_categories.php:121
+#: inventory/manage/item_codes.php:126 inventory/manage/sales_kits.php:36
+#: inventory/view/view_adjustment.php:55 inventory/view/view_transfer.php:50
+#: manufacturing/view/wo_issue_view.php:76
+#: manufacturing/manage/bom_edit.php:44 purchasing/po_receive_items.php:62
+#: sales/customer_credit_invoice.php:275 sales/customer_delivery.php:420
+#: sales/customer_invoice.php:518 sales/customer_invoice.php:521
+msgid "Units"
+msgstr ""
+
+#: inventory/manage/item_categories.php:117
+#: inventory/manage/item_categories.php:121
+msgid "Sales Act"
 msgstr ""
 
-#: inventory/manage/item_categories.php:98
-msgid "Tax type"
+#: inventory/manage/item_categories.php:118
+msgid "Asset Account"
 msgstr ""
 
-#: inventory/manage/item_categories.php:98 inventory/manage/item_codes.php:124
-#: inventory/manage/sales_kits.php:40 inventory/view/view_adjustment.php:57
-#: inventory/view/view_transfer.php:56 manufacturing/view/wo_issue_view.php:77
-#: manufacturing/manage/bom_edit.php:71 purchasing/po_receive_items.php:62
-#: sales/customer_credit_invoice.php:282 sales/customer_delivery.php:429
-#: sales/customer_invoice.php:448
-msgid "Units"
+#: inventory/manage/item_categories.php:118
+msgid "Deprecation Cost Account"
 msgstr ""
 
-#: inventory/manage/item_categories.php:98
-msgid "Sales Act"
+#: inventory/manage/item_categories.php:119
+msgid "Depreciation/Disposal Account"
 msgstr ""
 
-#: inventory/manage/item_categories.php:99
+#: inventory/manage/item_categories.php:122
 msgid "Inventory Account"
 msgstr ""
 
-#: inventory/manage/item_categories.php:99
+#: inventory/manage/item_categories.php:122
 msgid "COGS Account"
 msgstr ""
 
-#: inventory/manage/item_categories.php:99
+#: inventory/manage/item_categories.php:122
 msgid "Adjustment Account"
 msgstr ""
 
-#: inventory/manage/item_categories.php:100
+#: inventory/manage/item_categories.php:123
 msgid "Assembly Account"
 msgstr ""
 
-#: inventory/manage/item_categories.php:180
+#: inventory/manage/item_categories.php:208
 msgid "Category Name:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:182
+#: inventory/manage/item_categories.php:210
 msgid "Default values for new items"
 msgstr ""
 
-#: inventory/manage/item_categories.php:184 inventory/manage/items.php:336
+#: inventory/manage/item_categories.php:212 inventory/manage/items.php:395
 msgid "Item Tax Type:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:186 inventory/manage/items.php:338
+#: inventory/manage/item_categories.php:217 inventory/manage/items.php:398
 msgid "Item Type:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:188 inventory/manage/items.php:340
+#: inventory/manage/item_categories.php:219 inventory/manage/items.php:400
 msgid "Units of Measure:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:190 inventory/manage/items.php:344
+#: inventory/manage/item_categories.php:224 inventory/manage/items.php:407
 msgid "Exclude from sales:"
 msgstr ""
 
-#: inventory/manage/item_codes.php:16
+#: inventory/manage/item_categories.php:226 inventory/manage/items.php:409
+msgid "Exclude from purchases:"
+msgstr ""
+
+#: inventory/manage/item_categories.php:238 inventory/manage/items.php:472
+msgid "Asset account:"
+msgstr ""
+
+#: inventory/manage/item_categories.php:239 inventory/manage/items.php:473
+msgid "Depreciation cost account:"
+msgstr ""
+
+#: inventory/manage/item_categories.php:240 inventory/manage/items.php:474
+msgid "Depreciation/Disposal account:"
+msgstr ""
+
+#: inventory/manage/item_categories.php:251
+msgid "Item Assembly Costs Account:"
+msgstr ""
+
+#: inventory/manage/item_codes.php:20
 msgid "Foreign Item Codes"
 msgstr ""
 
-#: inventory/manage/item_codes.php:23 sales/sales_order_entry.php:660
+#: inventory/manage/item_codes.php:26 sales/sales_order_entry.php:703
 msgid "There are no inventory items defined in the system."
 msgstr ""
 
-#: inventory/manage/item_codes.php:41
-msgid "The price entered was not positive number."
+#: inventory/manage/item_codes.php:44
+msgid "The quantity entered was not positive number."
 msgstr ""
 
-#: inventory/manage/item_codes.php:47 inventory/manage/sales_kits.php:78
+#: inventory/manage/item_codes.php:50 inventory/manage/sales_kits.php:74
 msgid "Item code description cannot be empty."
 msgstr ""
 
-#: inventory/manage/item_codes.php:55 inventory/manage/items.php:150
-#: inventory/manage/sales_kits.php:88
+#: inventory/manage/item_codes.php:58 inventory/manage/items.php:194
+#: inventory/manage/sales_kits.php:89
 msgid "This item code is already assigned to stock item or sale kit."
 msgstr ""
 
-#: inventory/manage/item_codes.php:67
+#: inventory/manage/item_codes.php:70
 msgid "New item code has been added."
 msgstr ""
 
-#: inventory/manage/item_codes.php:73
+#: inventory/manage/item_codes.php:76
 msgid "Item code has been updated."
 msgstr ""
 
-#: inventory/manage/item_codes.php:85
+#: inventory/manage/item_codes.php:88
 msgid "Item code has been sucessfully deleted."
 msgstr ""
 
-#: inventory/manage/item_codes.php:124
+#: inventory/manage/item_codes.php:126
 msgid "EAN/UPC Code"
 msgstr ""
 
-#: inventory/manage/item_codes.php:125 reporting/rep104.php:115
-#: reporting/rep105.php:117 reporting/rep301.php:100 reporting/rep301.php:105
-#: reporting/rep302.php:122 reporting/rep302.php:129 reporting/rep303.php:121
-#: reporting/rep304.php:114 reporting/rep304.php:122
-msgid "Category"
-msgstr ""
-
-#: inventory/manage/item_codes.php:178
+#: inventory/manage/item_codes.php:180
 msgid "UPC/EAN code:"
 msgstr ""
 
-#: inventory/manage/item_codes.php:179 inventory/manage/sales_kits.php:245
-#: manufacturing/work_order_add_finished.php:206
-#: manufacturing/work_order_entry.php:424
-#: manufacturing/manage/bom_edit.php:228
+#: inventory/manage/item_codes.php:181 inventory/manage/sales_kits.php:243
+#: manufacturing/work_order_add_finished.php:194
+#: manufacturing/work_order_entry.php:404
+#: manufacturing/manage/bom_edit.php:204
 msgid "Quantity:"
 msgstr ""
 
-#: inventory/manage/item_codes.php:180 inventory/manage/items.php:311
-#: inventory/manage/movement_types.php:129 inventory/manage/sales_kits.php:206
-#: inventory/manage/sales_kits.php:232
+#: inventory/manage/item_codes.php:182 inventory/manage/items.php:368
+#: inventory/manage/sales_kits.php:206 inventory/manage/sales_kits.php:230
 #: manufacturing/manage/work_centres.php:138
-#: sales/manage/credit_status.php:145 sales/manage/recurrent_invoices.php:165
-#: taxes/item_tax_types.php:173 taxes/tax_groups.php:167
-#: taxes/tax_types.php:158
+#: sales/create_recurrent_invoices.php:179 sales/manage/credit_status.php:145
+#: sales/manage/recurrent_invoices.php:191 taxes/item_tax_types.php:173
+#: taxes/tax_groups.php:165 taxes/tax_types.php:158
 msgid "Description:"
 msgstr ""
 
-#: inventory/manage/item_codes.php:181 inventory/manage/items.php:313
-#: inventory/manage/sales_kits.php:207 inventory/manage/sales_kits.php:233
+#: inventory/manage/item_codes.php:183 inventory/manage/items.php:370
+#: inventory/manage/sales_kits.php:207 inventory/manage/sales_kits.php:231
 msgid "Category:"
 msgstr ""
 
-#: inventory/manage/items.php:69
-msgid "Only jpg files are supported - a file extension of .jpg is expected"
+#: inventory/manage/items.php:87
+msgid "Error uploading file."
+msgstr ""
+
+#: inventory/manage/items.php:104
+msgid ""
+"Only graphics files are supported - a file extension of .jpg, .png or .gif "
+"is expected"
+msgstr ""
+
+#: inventory/manage/items.php:136
+msgid ""
+"There are no fixed asset categories defined in the system. At least one "
+"fixed asset category is required to add a fixed asset."
+msgstr ""
+
+#: inventory/manage/items.php:137
+msgid ""
+"There are no fixed asset classes defined in the system. At least one fixed "
+"asset class is required to add a fixed asset."
 msgstr ""
 
-#: inventory/manage/items.php:100
+#: inventory/manage/items.php:139
 msgid ""
 "There are no item categories defined in the system. At least one item "
 "category is required to add a item."
 msgstr ""
 
-#: inventory/manage/items.php:102
+#: inventory/manage/items.php:141
 msgid ""
 "There are no item tax types defined in the system. At least one item tax "
 "type is required to add a item."
 msgstr ""
 
-#: inventory/manage/items.php:129
+#: inventory/manage/items.php:173
 msgid "The item name must be entered."
 msgstr ""
 
-#: inventory/manage/items.php:135
+#: inventory/manage/items.php:179
 msgid "The item code cannot be empty"
 msgstr ""
 
-#: inventory/manage/items.php:143
+#: inventory/manage/items.php:187
 msgid ""
 "The item code cannot contain any of the following characters -  & + OR a "
 "space OR quotes"
 msgstr ""
 
-#: inventory/manage/items.php:179
+#: inventory/manage/items.php:207
+msgid "The depracation cannot start before the fixed asset purchase date"
+msgstr ""
+
+#: inventory/manage/items.php:239
 msgid "Item has been updated."
 msgstr ""
 
-#: inventory/manage/items.php:192
+#: inventory/manage/items.php:254
 msgid "A new item has been added."
 msgstr ""
 
-#: inventory/manage/items.php:234
+#: inventory/manage/items.php:297
 msgid "Selected item has been deleted."
 msgstr ""
 
-#: inventory/manage/items.php:250
-msgid "Select an item:"
+#: inventory/manage/items.php:314
+msgid "General Settings"
 msgstr ""
 
-#: inventory/manage/items.php:251
-msgid "New item"
+#: inventory/manage/items.php:319 inventory/manage/items.php:360
+msgid "Item Code:"
 msgstr ""
 
-#: inventory/manage/items.php:268 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
-msgid "Item"
+#: inventory/manage/items.php:402
+msgid "Editable description:"
 msgstr ""
 
-#: inventory/manage/items.php:273 inventory/manage/items.php:304
-msgid "Item Code:"
+#: inventory/manage/items.php:414
+msgid "Fixed Asset Class"
 msgstr ""
 
-#: inventory/manage/items.php:342
-msgid "Editable description:"
+#: inventory/manage/items.php:416
+msgid "Depreciation Method"
 msgstr ""
 
-#: inventory/manage/items.php:362 sales/manage/customer_branches.php:248
-msgid "GL Accounts"
+#: inventory/manage/items.php:427 inventory/manage/items.php:436
+msgid "Depreciation Rate"
 msgstr ""
 
-#: inventory/manage/items.php:385
+#: inventory/manage/items.php:431
+msgid "Depreciation Years"
+msgstr ""
+
+#: inventory/manage/items.php:431
+msgid "years"
+msgstr ""
+
+#: inventory/manage/items.php:434
+msgid "Base Rate"
+msgstr ""
+
+#: inventory/manage/items.php:439
+msgid "Rate multiplier"
+msgstr ""
+
+#: inventory/manage/items.php:443 inventory/manage/items.php:446
+msgid "Depreciation Start"
+msgstr ""
+
+#: inventory/manage/items.php:447
+msgid "Last Depreciation"
+msgstr ""
+
+#: inventory/manage/items.php:495
 msgid "Other"
 msgstr ""
 
-#: inventory/manage/items.php:388
+#: inventory/manage/items.php:498
 msgid "Image File (.jpg)"
 msgstr ""
 
-#: inventory/manage/items.php:403
+#: inventory/manage/items.php:513
 msgid "No image"
 msgstr ""
 
-#: inventory/manage/items.php:408
+#: inventory/manage/items.php:518
 msgid "Delete Image:"
 msgstr ""
 
-#: inventory/manage/items.php:410
+#: inventory/manage/items.php:520
 msgid "Item status:"
 msgstr ""
 
-#: inventory/manage/items.php:416
+#: inventory/manage/items.php:522
+msgid "Values"
+msgstr ""
+
+#: inventory/manage/items.php:527 reporting/rep451.php:80
+msgid "Depreciations"
+msgstr ""
+
+#: inventory/manage/items.php:528
+msgid "Current Value"
+msgstr ""
+
+#: inventory/manage/items.php:537
 msgid "Insert New Item"
 msgstr ""
 
-#: inventory/manage/items.php:420
+#: inventory/manage/items.php:541
 msgid "Update Item"
 msgstr ""
 
-#: inventory/manage/items.php:423
+#: inventory/manage/items.php:544
 msgid "Select this items and return to document entry."
 msgstr ""
 
-#: inventory/manage/items.php:424
+#: inventory/manage/items.php:545
 msgid "Clone This Item"
 msgstr ""
 
-#: inventory/manage/items.php:425
+#: inventory/manage/items.php:546
 msgid "Delete This Item"
 msgstr ""
 
+#: inventory/manage/items.php:561
+msgid "Select an item:"
+msgstr ""
+
+#: inventory/manage/items.php:562
+msgid "New item"
+msgstr ""
+
+#: inventory/manage/items.php:586 inventory/manage/items.php:589
+#: purchasing/manage/suppliers.php:311 sales/manage/customer_branches.php:310
+#: sales/manage/customers.php:351
+msgid "&General settings"
+msgstr ""
+
+#: inventory/manage/items.php:587 inventory/manage/items.php:595
+#: purchasing/manage/suppliers.php:313 sales/manage/customers.php:353
+msgid "&Transactions"
+msgstr ""
+
+#: inventory/manage/items.php:590
+msgid "S&ales Pricing"
+msgstr ""
+
+#: inventory/manage/items.php:591
+msgid "&Purchasing Pricing"
+msgstr ""
+
+#: inventory/manage/items.php:596
+msgid "&Status"
+msgstr ""
+
 #: inventory/manage/item_units.php:16
 msgid "Units of Measure"
 msgstr ""
@@ -7716,156 +9227,126 @@ msgstr ""
 msgid "Decimal Places:"
 msgstr ""
 
-#: inventory/manage/locations.php:16
-msgid "Inventory Locations"
-msgstr ""
-
-#: inventory/manage/locations.php:39
+#: inventory/manage/locations.php:46
 msgid ""
 "The location code must be five characters or less long (including converted "
 "special chars)."
 msgstr ""
 
-#: inventory/manage/locations.php:45
+#: inventory/manage/locations.php:52
 msgid "The location name must be entered."
 msgstr ""
 
-#: inventory/manage/locations.php:56
+#: inventory/manage/locations.php:63
 msgid "Selected location has been updated"
 msgstr ""
 
-#: inventory/manage/locations.php:65
+#: inventory/manage/locations.php:72
 msgid "New location has been added"
 msgstr ""
 
-#: inventory/manage/locations.php:76
+#: inventory/manage/locations.php:83
 msgid ""
 "Cannot delete this location because item movements have been created using "
 "this location."
 msgstr ""
 
-#: inventory/manage/locations.php:82
+#: inventory/manage/locations.php:89
 msgid ""
 "Cannot delete this location because it is used by some work orders records."
 msgstr ""
 
-#: inventory/manage/locations.php:88
+#: inventory/manage/locations.php:95
 msgid ""
 "Cannot delete this location because it is used by some branch records as the "
 "default location to deliver from."
 msgstr ""
 
-#: inventory/manage/locations.php:94 inventory/manage/locations.php:100
-#: inventory/manage/locations.php:105 inventory/manage/locations.php:110
-#: inventory/manage/locations.php:115
+#: inventory/manage/locations.php:101 inventory/manage/locations.php:107
+#: inventory/manage/locations.php:112 inventory/manage/locations.php:117
+#: inventory/manage/locations.php:122
 msgid ""
 "Cannot delete this location because it is used by some related records in "
 "other tables."
 msgstr ""
 
-#: inventory/manage/locations.php:129
+#: inventory/manage/locations.php:136
 msgid "Selected location has been deleted"
 msgstr ""
 
-#: inventory/manage/locations.php:146
+#: inventory/manage/locations.php:155
 msgid "Location Code"
 msgstr ""
 
-#: inventory/manage/locations.php:146
+#: inventory/manage/locations.php:155
 msgid "Location Name"
 msgstr ""
 
-#: inventory/manage/locations.php:192 inventory/manage/locations.php:196
+#: inventory/manage/locations.php:202 inventory/manage/locations.php:206
 msgid "Location Code:"
 msgstr ""
 
-#: inventory/manage/locations.php:199
+#: inventory/manage/locations.php:209
 msgid "Location Name:"
 msgstr ""
 
-#: inventory/manage/locations.php:200
+#: inventory/manage/locations.php:210
 msgid "Contact for deliveries:"
 msgstr ""
 
-#: inventory/manage/locations.php:204
+#: inventory/manage/locations.php:214
 msgid "Telephone No:"
 msgstr ""
 
-#: inventory/manage/locations.php:206
+#: inventory/manage/locations.php:216
 msgid "Facsimile No:"
 msgstr ""
 
-#: inventory/manage/movement_types.php:16
-msgid "Inventory Movement Types"
-msgstr ""
-
-#: inventory/manage/movement_types.php:34
-msgid "The inventory movement type name cannot be empty."
-msgstr ""
-
-#: inventory/manage/movement_types.php:43
-msgid "Selected movement type has been updated"
-msgstr ""
-
-#: inventory/manage/movement_types.php:48
-msgid "New movement type has been added"
-msgstr ""
-
-#: inventory/manage/movement_types.php:61
-msgid ""
-"Cannot delete this inventory movement type because item transactions have "
-"been created referring to it."
-msgstr ""
-
-#: inventory/manage/movement_types.php:76
-msgid "Selected movement type has been deleted"
-msgstr ""
-
-#: inventory/manage/sales_kits.php:16
+#: inventory/manage/sales_kits.php:20
 msgid "Sales Kits & Alias Codes"
 msgstr ""
 
-#: inventory/manage/sales_kits.php:40
+#: inventory/manage/sales_kits.php:36
 msgid "Stock Item"
 msgstr ""
 
-#: inventory/manage/sales_kits.php:54
+#: inventory/manage/sales_kits.php:50
 msgid "kit"
 msgstr ""
 
-#: inventory/manage/sales_kits.php:72 manufacturing/manage/bom_edit.php:101
+#: inventory/manage/sales_kits.php:68 manufacturing/manage/bom_edit.php:74
 msgid "The quantity entered must be numeric and greater than zero."
 msgstr ""
 
-#: inventory/manage/sales_kits.php:93
+#: inventory/manage/sales_kits.php:82
 msgid "Kit/alias code cannot be empty."
 msgstr ""
 
-#: inventory/manage/sales_kits.php:101
+#: inventory/manage/sales_kits.php:97
 msgid ""
 "The selected component contains directly or on any lower level the kit under "
 "edition. Recursive kits are not allowed."
 msgstr ""
 
-#: inventory/manage/sales_kits.php:108
+#: inventory/manage/sales_kits.php:104
 msgid ""
 "The selected component is already in this kit. You can modify it's quantity "
 "but it cannot appear more than once in the same kit."
 msgstr ""
 
-#: inventory/manage/sales_kits.php:116
+#: inventory/manage/sales_kits.php:111
 msgid "New alias code has been created."
 msgstr ""
 
-#: inventory/manage/sales_kits.php:119
+#: inventory/manage/sales_kits.php:114
 msgid "New component has been added to selected kit."
 msgstr ""
 
-#: inventory/manage/sales_kits.php:129
+#: inventory/manage/sales_kits.php:124
 msgid "Component of selected kit has been updated."
 msgstr ""
 
-#: inventory/manage/sales_kits.php:139
+#: inventory/manage/sales_kits.php:136
 msgid "Kit common properties has been updated"
 msgstr ""
 
@@ -7875,7 +9356,7 @@ msgid ""
 "following kits"
 msgstr ""
 
-#: inventory/manage/sales_kits.php:168 manufacturing/manage/bom_edit.php:153
+#: inventory/manage/sales_kits.php:168 manufacturing/manage/bom_edit.php:126
 msgid "The component item has been deleted from this bom"
 msgstr ""
 
@@ -7895,12 +9376,12 @@ msgstr ""
 msgid "Update kit/alias name"
 msgstr ""
 
-#: inventory/manage/sales_kits.php:223 manufacturing/manage/bom_edit.php:204
-#: manufacturing/manage/bom_edit.php:211
+#: inventory/manage/sales_kits.php:223 manufacturing/manage/bom_edit.php:180
+#: manufacturing/manage/bom_edit.php:187
 msgid "Component:"
 msgstr ""
 
-#: inventory/manage/sales_kits.php:237
+#: inventory/manage/sales_kits.php:235
 msgid "kits"
 msgstr ""
 
@@ -7908,15 +9389,11 @@ msgstr ""
 msgid "View Inventory Adjustment"
 msgstr ""
 
-#: inventory/view/view_adjustment.php:43
+#: inventory/view/view_adjustment.php:42
 msgid "At Location"
 msgstr ""
 
-#: inventory/view/view_adjustment.php:46 inventory/view/view_transfer.php:46
-msgid "Adjustment Type"
-msgstr ""
-
-#: inventory/view/view_adjustment.php:73
+#: inventory/view/view_adjustment.php:71
 msgid "This adjustment has been voided."
 msgstr ""
 
@@ -7924,10 +9401,10 @@ msgstr ""
 msgid "View Inventory Transfer"
 msgstr ""
 
-#: inventory/view/view_transfer.php:40 manufacturing/view/wo_issue_view.php:44
+#: inventory/view/view_transfer.php:40 manufacturing/view/wo_issue_view.php:43
 #: manufacturing/includes/manufacturing_ui.inc:29
-#: manufacturing/includes/manufacturing_ui.inc:83
-#: reporting/includes/doctext.inc:108
+#: manufacturing/includes/manufacturing_ui.inc:100
+#: reporting/includes/doctext.inc:228
 msgid "From Location"
 msgstr ""
 
@@ -7943,405 +9420,438 @@ msgstr ""
 msgid "Search Work Orders"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:69
+#: manufacturing/search_work_orders.php:67
+#: purchasing/inquiry/po_search_completed.php:80
+#: purchasing/inquiry/po_search.php:62
+#: sales/inquiry/sales_deliveries_view.php:101
+#: sales/inquiry/sales_orders_view.php:213
+msgid "#:"
+msgstr ""
+
+#: manufacturing/search_work_orders.php:70
 msgid "at Location:"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:76
-#: purchasing/inquiry/po_search_completed.php:72
+#: manufacturing/search_work_orders.php:82
+#: purchasing/inquiry/po_search_completed.php:92
 msgid "for item:"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:78
-#: purchasing/inquiry/po_search_completed.php:74
-#: purchasing/inquiry/po_search.php:76
+#: manufacturing/search_work_orders.php:84
+#: purchasing/inquiry/po_search_completed.php:99
+#: purchasing/inquiry/po_search.php:78
 #: sales/inquiry/sales_deliveries_view.php:116
-#: sales/inquiry/sales_orders_view.php:238
+#: sales/inquiry/sales_orders_view.php:236
 msgid "Select documents"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:117
+#: manufacturing/search_work_orders.php:122
 msgid "Release"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:120
+#: manufacturing/search_work_orders.php:125
 msgid "Issue"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:127
+#: manufacturing/search_work_orders.php:132
 msgid "Produce"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:140
-msgid "Costs"
-msgstr ""
-
-#: manufacturing/search_work_orders.php:164
+#: manufacturing/search_work_orders.php:162 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:46 sales/inquiry/sales_orders_view.php:259
+#: manufacturing/search_work_orders.php:165
+#: manufacturing/includes/manufacturing_ui.inc:292
+#: manufacturing/includes/manufacturing_ui.inc:296 reporting/rep402.php:103
+#: reporting/includes/doctext.inc:226 sales/inquiry/sales_orders_view.php:258
 msgid "Required By"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:176
+#: manufacturing/search_work_orders.php:174
 msgid "Marked orders are overdue."
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:29
+#: manufacturing/work_order_add_finished.php:28
 msgid "Produce or Unassemble Finished Items From Work Order"
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:44
+#: manufacturing/work_order_add_finished.php:43
 msgid "The manufacturing process has been entered."
 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_add_finished.php:45
+#: manufacturing/work_order_costs.php:44 manufacturing/work_order_entry.php:55
+#: manufacturing/work_order_issue.php:40
+#: manufacturing/work_order_release.php:74
 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_add_finished.php:47
+#: manufacturing/work_order_costs.php:46 manufacturing/work_order_entry.php:63
+#: manufacturing/work_order_issue.php:42
 msgid "View the GL Journal Entries for this Work Order"
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:50
-#: manufacturing/work_order_entry.php:67
+#: manufacturing/work_order_add_finished.php:49
+#: manufacturing/work_order_entry.php:66
 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_add_finished.php:51
+#: manufacturing/work_order_costs.php:50 manufacturing/work_order_issue.php:44
 msgid "Select another &Work Order to Process"
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:65
-#: manufacturing/work_order_costs.php:64
-#: manufacturing/work_order_entry.php:341
-#: manufacturing/includes/db/work_order_issues_db.inc:30
-#: manufacturing/includes/db/work_order_produce_items_db.inc:27
+#: manufacturing/work_order_add_finished.php:64
+#: manufacturing/work_order_costs.php:63
+#: manufacturing/work_order_entry.php:323
 msgid "The order number sent is not valid."
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:91
+#: manufacturing/work_order_add_finished.php:82
 msgid "The quantity entered is not a valid number or less then zero."
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:110
+#: manufacturing/work_order_add_finished.php:101
 msgid ""
 "The production date cannot be before the release date of the work order."
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:117
+#: manufacturing/work_order_add_finished.php:108
 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:117
 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:135
 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:192
 msgid "Produce Finished Items"
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:204
+#: manufacturing/work_order_add_finished.php:192
 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:200
+#: purchasing/allocations/supplier_allocate.php:75
+#: sales/allocations/customer_allocate.php:78
 msgid "Process"
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:215
+#: manufacturing/work_order_add_finished.php:201
 msgid "Process And Close Order"
 msgstr ""
 
-#: manufacturing/work_order_costs.php:29
+#: manufacturing/work_order_costs.php:28
 msgid "Work Order Additional Costs"
 msgstr ""
 
-#: manufacturing/work_order_costs.php:43
+#: manufacturing/work_order_costs.php:42
 msgid "The additional cost has been entered."
 msgstr ""
 
-#: manufacturing/work_order_costs.php:49
+#: manufacturing/work_order_costs.php:48
 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:159
+#: manufacturing/work_order_costs.php:145
 msgid "Additional Costs:"
 msgstr ""
 
-#: manufacturing/work_order_costs.php:160
-msgid "Debit Account"
-msgstr ""
-
-#: manufacturing/work_order_costs.php:167
+#: manufacturing/work_order_costs.php:152
 msgid "Process Additional Cost"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:29
+#: manufacturing/work_order_entry.php:28
 msgid "Work Order Entry"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:32
+#: manufacturing/work_order_entry.php:31
 msgid "There are no manufacturable items defined in the system."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:54
+#: manufacturing/work_order_entry.php:53
 msgid "The work order been added."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:62
-msgid "Print this Work Order"
+#: manufacturing/work_order_entry.php:61
+msgid "&Print This Work Order"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:64
-msgid "Email this Work Order"
+#: manufacturing/work_order_entry.php:62
+msgid "&Email This Work Order"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:80
+#: manufacturing/work_order_entry.php:79
 msgid "The work order been updated."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:90
+#: manufacturing/work_order_entry.php:89
 msgid "Work order has been deleted."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:100
+#: manufacturing/work_order_entry.php:99
 msgid ""
 "This work order has been closed. There can be no more issues against it."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:110
+#: manufacturing/work_order_entry.php:109
 msgid "Enter a new work order"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:111
+#: manufacturing/work_order_entry.php:110
 msgid "Select an existing work order"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:147
+#: manufacturing/work_order_entry.php:138
 msgid "The quantity entered is invalid or less than zero."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:169
+#: manufacturing/work_order_entry.php:160
 msgid "The selected item to manufacture does not have a bom."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:178
+#: manufacturing/work_order_entry.php:169
 msgid "The labour cost entered is invalid or less than zero."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:186
+#: manufacturing/work_order_entry.php:177
 msgid "The cost entered is invalid or less than zero."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:209
+#: manufacturing/work_order_entry.php:199
 msgid ""
 "The work order cannot be processed because there is an insufficient quantity "
 "for component:"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:223
+#: manufacturing/work_order_entry.php:212
 msgid ""
 "The selected item cannot be unassembled because there is insufficient stock."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:249
+#: manufacturing/work_order_entry.php:231
 msgid ""
 "The quantity cannot be changed to be less than the quantity already "
 "manufactured for this order."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:298
+#: manufacturing/work_order_entry.php:280
 msgid ""
 "This work order cannot be deleted because it has already been processed."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:349
+#: manufacturing/work_order_entry.php:331
 msgid "This work order is closed and cannot be edited."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:397
-#: manufacturing/work_order_entry.php:405
+#: manufacturing/work_order_entry.php:377
+#: manufacturing/work_order_entry.php:385
 msgid "Destination Location:"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:416
+#: manufacturing/work_order_entry.php:396
 msgid "Quantity Required:"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:418
+#: manufacturing/work_order_entry.php:398
 msgid "Quantity Manufactured:"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:437
+#: manufacturing/work_order_entry.php:420
 msgid "Credit Labour Account"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:444
+#: manufacturing/work_order_entry.php:422
 msgid "Credit Overhead Account"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:449
+#: manufacturing/work_order_entry.php:427
 msgid "Released On:"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:459
+#: manufacturing/work_order_entry.php:437
 msgid "Save changes to work order"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:462
+#: manufacturing/work_order_entry.php:440
 msgid "Close This Work Order"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:464
+#: manufacturing/work_order_entry.php:442
 msgid "Delete This Work Order"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:470
+#: manufacturing/work_order_entry.php:448
 msgid "Add Workorder"
 msgstr ""
 
-#: manufacturing/work_order_issue.php:29
+#: manufacturing/work_order_issue.php:31
 msgid "Issue Items to Work Order"
 msgstr ""
 
-#: manufacturing/work_order_issue.php:36
+#: manufacturing/work_order_issue.php:38
 msgid "The work order issue has been entered."
 msgstr ""
 
-#: manufacturing/work_order_issue.php:79
+#: manufacturing/work_order_issue.php:76
 msgid "The entered date for the issue is invalid."
 msgstr ""
 
-#: manufacturing/work_order_issue.php:106
+#: manufacturing/work_order_issue.php:95
 msgid ""
-"The issue cannot be processed because an entered item would cause a negative "
-"inventory balance :"
+"The issue cannot be processed because it would cause negative inventory "
+"balance for marked items as of document date or later."
 msgstr ""
 
-#: manufacturing/work_order_issue.php:124
+#: manufacturing/work_order_issue.php:112
 msgid ""
 "The process cannot be completed because there is an insufficient total "
 "quantity for a component."
 msgstr ""
 
-#: manufacturing/work_order_issue.php:125
+#: manufacturing/work_order_issue.php:113
 msgid "Component is :"
 msgstr ""
 
-#: manufacturing/work_order_issue.php:126
+#: manufacturing/work_order_issue.php:114
 msgid "From location :"
 msgstr ""
 
-#: manufacturing/work_order_issue.php:219
+#: manufacturing/work_order_issue.php:129
+msgid "The quantity entered is negative or invalid."
+msgstr ""
+
+#: manufacturing/work_order_issue.php:207
 msgid "Items to Issue"
 msgstr ""
 
-#: manufacturing/work_order_issue.php:225
+#: manufacturing/work_order_issue.php:213
 msgid "Process Issue"
 msgstr ""
 
-#: manufacturing/work_order_release.php:27
+#: manufacturing/work_order_release.php:26
 msgid "Work Order Release to Manufacturing"
 msgstr ""
 
-#: manufacturing/work_order_release.php:49
+#: manufacturing/work_order_release.php:48
 msgid "This work order has already been released."
 msgstr ""
 
-#: manufacturing/work_order_release.php:57
+#: manufacturing/work_order_release.php:59
 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:72
 msgid "The work order has been released to manufacturing."
 msgstr ""
 
-#: manufacturing/work_order_release.php:74
+#: manufacturing/work_order_release.php:76
 msgid "Select another &work order"
 msgstr ""
 
-#: manufacturing/work_order_release.php:95
+#: manufacturing/work_order_release.php:97
 msgid "Work Order #:"
 msgstr ""
 
-#: manufacturing/work_order_release.php:96
+#: manufacturing/work_order_release.php:98
 msgid "Work Order Reference:"
 msgstr ""
 
-#: manufacturing/work_order_release.php:98
-#: manufacturing/includes/manufacturing_ui.inc:278
+#: manufacturing/work_order_release.php:100
+#: manufacturing/includes/manufacturing_ui.inc:293
 msgid "Released Date"
 msgstr ""
 
-#: manufacturing/work_order_release.php:104
+#: manufacturing/work_order_release.php:106
 msgid "Release Work Order"
 msgstr ""
 
+#: manufacturing/view/wo_costs_view.php:20
+msgid "View Work Order Costs"
+msgstr ""
+
+#: manufacturing/view/wo_costs_view.php:60
+msgid "Transaction"
+msgstr ""
+
+#: manufacturing/view/wo_costs_view.php:66
+msgid "Finished Product Requirements"
+msgstr ""
+
+#: manufacturing/view/wo_costs_view.php:69
+msgid "Additional Material Issues"
+msgstr ""
+
+#: manufacturing/view/wo_costs_view.php:72
+#: manufacturing/view/work_order_view.php:66
+#: manufacturing/view/work_order_view.php:73
+msgid "Additional Costs"
+msgstr ""
+
+#: manufacturing/view/wo_costs_view.php:75
+msgid "Finished Product Receival"
+msgstr ""
+
+#: manufacturing/view/wo_costs_view.php:80
+#, php-format
+msgid "Production Costs for Work Order # %d"
+msgstr ""
+
 #: manufacturing/view/wo_issue_view.php:19
 msgid "View Work Order Issue"
 msgstr ""
 
-#: manufacturing/view/wo_issue_view.php:43
+#: manufacturing/view/wo_issue_view.php:42
 msgid "Issue #"
 msgstr ""
 
-#: manufacturing/view/wo_issue_view.php:43
-#: manufacturing/view/wo_production_view.php:44
+#: manufacturing/view/wo_issue_view.php:42
+#: manufacturing/view/wo_production_view.php:43
 msgid "For Work Order #"
 msgstr ""
 
-#: manufacturing/view/wo_issue_view.php:44
+#: manufacturing/view/wo_issue_view.php:43
 msgid "To Work Centre"
 msgstr ""
 
-#: manufacturing/view/wo_issue_view.php:44
+#: manufacturing/view/wo_issue_view.php:43
 msgid "Date of Issue"
 msgstr ""
 
-#: manufacturing/view/wo_issue_view.php:61
+#: manufacturing/view/wo_issue_view.php:60
 msgid "This issue has been voided."
 msgstr ""
 
-#: manufacturing/view/wo_issue_view.php:72
+#: manufacturing/view/wo_issue_view.php:71
 msgid "There are no items for this issue."
 msgstr ""
 
-#: manufacturing/view/wo_issue_view.php:77
+#: manufacturing/view/wo_issue_view.php:76
 #: manufacturing/includes/manufacturing_ui.inc:28
-#: manufacturing/includes/manufacturing_ui.inc:83 reporting/rep401.php:69
-#: reporting/rep401.php:74
+#: manufacturing/includes/manufacturing_ui.inc:100 reporting/rep401.php:71
+#: reporting/rep401.php:76
 msgid "Component"
 msgstr ""
 
@@ -8353,58 +9863,53 @@ msgstr ""
 msgid "View Work Order Production"
 msgstr ""
 
-#: manufacturing/view/wo_production_view.php:44
+#: manufacturing/view/wo_production_view.php:43
 msgid "Production #"
 msgstr ""
 
-#: manufacturing/view/wo_production_view.php:45
+#: manufacturing/view/wo_production_view.php:44
 msgid "Quantity Manufactured"
 msgstr ""
 
-#: manufacturing/view/wo_production_view.php:61
+#: manufacturing/view/wo_production_view.php:60
 msgid "This production has been voided."
 msgstr ""
 
-#: manufacturing/view/work_order_view.php:26
+#: manufacturing/view/work_order_view.php:25
 msgid "View Work Order"
 msgstr ""
 
-#: manufacturing/view/work_order_view.php:51
+#: manufacturing/view/work_order_view.php:50
 msgid "BOM for item:"
 msgstr ""
 
-#: manufacturing/view/work_order_view.php:56 reporting/rep409.php:93
+#: manufacturing/view/work_order_view.php:55 reporting/rep409.php:86
 msgid "Work Order Requirements"
 msgstr ""
 
-#: manufacturing/view/work_order_view.php:61
+#: manufacturing/view/work_order_view.php:60
 msgid "Issues"
 msgstr ""
 
-#: manufacturing/view/work_order_view.php:64
+#: manufacturing/view/work_order_view.php:63
 msgid "Productions"
 msgstr ""
 
-#: manufacturing/view/work_order_view.php:67
-#: manufacturing/view/work_order_view.php:74
-msgid "Additional Costs"
-msgstr ""
-
-#: manufacturing/view/work_order_view.php:82
+#: manufacturing/view/work_order_view.php:81
 msgid "This work order has been voided."
 msgstr ""
 
-#: manufacturing/inquiry/bom_cost_inquiry.php:24
-#: manufacturing/manage/bom_edit.php:24
+#: manufacturing/inquiry/bom_cost_inquiry.php:23
+#: manufacturing/manage/bom_edit.php:22
 msgid "There are no manufactured or kit items defined in the system."
 msgstr ""
 
-#: manufacturing/inquiry/bom_cost_inquiry.php:35
-#: manufacturing/manage/bom_edit.php:170
+#: manufacturing/inquiry/bom_cost_inquiry.php:34
+#: manufacturing/manage/bom_edit.php:143
 msgid "Select a manufacturable item:"
 msgstr ""
 
-#: manufacturing/inquiry/bom_cost_inquiry.php:38
+#: manufacturing/inquiry/bom_cost_inquiry.php:37
 msgid "All Costs Are In:"
 msgstr ""
 
@@ -8421,16 +9926,16 @@ msgid "Parent Item"
 msgstr ""
 
 #: manufacturing/inquiry/where_used_inquiry.php:44
-#: manufacturing/manage/bom_edit.php:71
+#: manufacturing/manage/bom_edit.php:44
 #: manufacturing/includes/manufacturing_ui.inc:28
-#: manufacturing/includes/manufacturing_ui.inc:83
-#: reporting/includes/doctext.inc:108
+#: manufacturing/includes/manufacturing_ui.inc:100
+#: reporting/includes/doctext.inc:228
 msgid "Work Centre"
 msgstr ""
 
 #: manufacturing/inquiry/where_used_inquiry.php:46
-#: manufacturing/includes/manufacturing_ui.inc:277
-#: manufacturing/includes/manufacturing_ui.inc:281
+#: manufacturing/includes/manufacturing_ui.inc:292
+#: manufacturing/includes/manufacturing_ui.inc:296
 msgid "Quantity Required"
 msgstr ""
 
@@ -8438,42 +9943,42 @@ msgstr ""
 msgid "Bill Of Materials"
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:26
+#: manufacturing/manage/bom_edit.php:24
 msgid ""
 "There are no work centres defined in the system. BOMs require at least one "
 "work centre be defined."
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:70 reporting/rep105.php:112
+#: manufacturing/manage/bom_edit.php:43 reporting/rep105.php:114
 msgid "Code"
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:110
+#: manufacturing/manage/bom_edit.php:83
 msgid "Selected component has been updated"
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:130
+#: manufacturing/manage/bom_edit.php:103
 msgid ""
 "A new component part has been added to the bill of material for this item."
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:136
+#: manufacturing/manage/bom_edit.php:109
 msgid ""
 "The selected component is already on this bom. You can modify it's quantity "
 "but it cannot appear more than once on the same bom."
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:142
+#: manufacturing/manage/bom_edit.php:115
 msgid ""
 "The selected component is a parent of the current item. Recursive BOMs are "
 "not allowed."
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:224
+#: manufacturing/manage/bom_edit.php:200
 msgid "Location to Draw From:"
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:225
+#: manufacturing/manage/bom_edit.php:201
 msgid "Work Centre Added:"
 msgstr ""
 
@@ -8517,672 +10022,711 @@ msgstr ""
 msgid "The bill of material for this item is empty."
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:29
-#: manufacturing/includes/manufacturing_ui.inc:61
+#: manufacturing/includes/manufacturing_ui.inc:29 reporting/rep304.php:127
+msgid "Cost"
+msgstr ""
+
+#: manufacturing/includes/manufacturing_ui.inc:66
+msgid "Standard Labour Cost"
+msgstr ""
+
+#: manufacturing/includes/manufacturing_ui.inc:74
+msgid "Standard Overhead Cost"
+msgstr ""
+
+#: manufacturing/includes/manufacturing_ui.inc:78
 msgid "Total Cost"
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:77
+#: manufacturing/includes/manufacturing_ui.inc:94
 msgid "There are no Requirements for this Order."
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:84
-#: reporting/includes/doctext.inc:108
+#: manufacturing/includes/manufacturing_ui.inc:101
+#: reporting/includes/doctext.inc:228
 msgid "Unit Quantity"
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:84
-#: reporting/includes/doctext.inc:108
+#: manufacturing/includes/manufacturing_ui.inc:101
+#: reporting/includes/doctext.inc:228
 msgid "Total Quantity"
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:84
-#: reporting/includes/doctext.inc:108
+#: manufacturing/includes/manufacturing_ui.inc:101
+#: reporting/includes/doctext.inc:228
 msgid "Units Issued"
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:84
+#: manufacturing/includes/manufacturing_ui.inc:101
 msgid "On Hand"
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:138
+#: manufacturing/includes/manufacturing_ui.inc:155
 msgid "Marked items have insufficient quantities in stock."
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:152
+#: manufacturing/includes/manufacturing_ui.inc:169
 msgid "There are no Productions for this Order."
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:195
+#: manufacturing/includes/manufacturing_ui.inc:212
 msgid "There are no Issues for this Order."
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:231
+#: manufacturing/includes/manufacturing_ui.inc:248
 msgid "There are no additional costs for this Order."
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:269
-#: manufacturing/includes/manufacturing_ui.inc:325
+#: manufacturing/includes/manufacturing_ui.inc:284
+#: manufacturing/includes/manufacturing_ui.inc:340
 msgid "The work order number sent is not valid."
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:276
-#: manufacturing/includes/manufacturing_ui.inc:280
-#: manufacturing/includes/manufacturing_ui.inc:331
-#: reporting/includes/doctext.inc:45
+#: manufacturing/includes/manufacturing_ui.inc:291
+#: manufacturing/includes/manufacturing_ui.inc:295
+#: manufacturing/includes/manufacturing_ui.inc:346
+#: reporting/includes/doctext.inc:222
 msgid "Manufactured Item"
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:277
-#: manufacturing/includes/manufacturing_ui.inc:281
-#: manufacturing/includes/manufacturing_ui.inc:332
-#: reporting/includes/doctext.inc:48
+#: manufacturing/includes/manufacturing_ui.inc:292
+#: manufacturing/includes/manufacturing_ui.inc:296
+#: manufacturing/includes/manufacturing_ui.inc:347
+#: reporting/includes/doctext.inc:223
 msgid "Into Location"
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:311
-#: manufacturing/includes/manufacturing_ui.inc:356
+#: manufacturing/includes/manufacturing_ui.inc:326
+#: manufacturing/includes/manufacturing_ui.inc:371
 msgid "This work order is closed."
 msgstr ""
 
-#: manufacturing/includes/work_order_issue_ui.inc:162
-msgid "Return Items to Location"
+#: manufacturing/includes/work_order_issue_ui.inc:78
+msgid "Marked items have insufficient quantities in stock as on day of issue."
 msgstr ""
 
-#: manufacturing/includes/work_order_issue_ui.inc:162
-msgid "Issue Items to Work order"
+#: manufacturing/includes/work_order_issue_ui.inc:157
+msgid "Issue Date:"
 msgstr ""
 
-#: manufacturing/includes/work_order_issue_ui.inc:165
+#: manufacturing/includes/work_order_issue_ui.inc:159
 msgid "To Work Centre:"
 msgstr ""
 
 #: manufacturing/includes/work_order_issue_ui.inc:167
-msgid "Issue Date:"
+msgid "Return Items to Location"
 msgstr ""
 
-#: manufacturing/includes/db/work_order_issues_db.inc:81
-msgid "Issue of"
+#: manufacturing/includes/work_order_issue_ui.inc:167
+msgid "Issue Items to Work order"
 msgstr ""
 
-#: manufacturing/includes/db/work_order_issues_db.inc:90
-msgid "Issue to"
+#: manufacturing/includes/db/work_order_costing_db.inc:98
+#, php-format
+msgid "COGS changed from %s to %s for %d %s of '%s'"
 msgstr ""
 
-#: manufacturing/includes/db/work_order_issues_db.inc:208
-msgid "Reversed the issue of"
+#: manufacturing/includes/db/work_order_costing_db.inc:235
+#, php-format
+msgid "Voided WO #%s"
 msgstr ""
 
-#: manufacturing/includes/db/work_order_issues_db.inc:220
-msgid "Reversed the issue to"
+#: manufacturing/includes/db/work_order_issues_db.inc:66
+msgid "Issue of"
 msgstr ""
 
-#: manufacturing/includes/db/work_order_produce_items_db.inc:74
-msgid "Production."
+#: manufacturing/includes/db/work_order_issues_db.inc:74
+msgid "Issue to"
 msgstr ""
 
-#: manufacturing/includes/db/work_order_produce_items_db.inc:158
-msgid "Reversed the production "
+#: manufacturing/includes/db/work_order_produce_items_db.inc:95
+msgid "Production."
 msgstr ""
 
-#: manufacturing/includes/db/work_orders_db.inc:278
-#: purchasing/includes/db/po_db.inc:116
-#: sales/includes/db/cust_trans_db.inc:109
-#: sales/includes/db/sales_order_db.inc:249
+#: manufacturing/includes/db/work_orders_db.inc:95
+#: purchasing/includes/db/po_db.inc:153
+#: sales/includes/db/cust_trans_db.inc:115
+#: sales/includes/db/sales_order_db.inc:211
 msgid "Updated."
 msgstr ""
 
-#: manufacturing/includes/db/work_orders_db.inc:297
+#: manufacturing/includes/db/work_orders_db.inc:114
 msgid "Canceled."
 msgstr ""
 
-#: manufacturing/includes/db/work_orders_db.inc:373
+#: manufacturing/includes/db/work_orders_db.inc:195
 msgid "Released."
 msgstr ""
 
-#: manufacturing/includes/db/work_orders_db.inc:445
-#: manufacturing/includes/db/work_orders_db.inc:461
-msgid "Voiding Work Order Trans # "
-msgstr ""
-
-#: manufacturing/includes/db/work_orders_quick_db.inc:106
-msgid "Quick production."
-msgstr ""
-
-#: manufacturing/includes/db/work_orders_quick_db.inc:220
-msgid "Produced"
+#: purchasing/includes/purchasing_db.inc:216
+msgid "Payment for:"
 msgstr ""
 
-#: purchasing/includes/db/invoice_db.inc:282
+#: purchasing/includes/db/invoice_db.inc:339
 msgid "Supplier invoice adjustment for zero inventory of "
 msgstr ""
 
-#: purchasing/includes/db/invoice_db.inc:282 reporting/rep106.php:81
-#: sales/inquiry/sales_deliveries_view.php:166
-#: sales/inquiry/sales_orders_view.php:142
+#: purchasing/includes/db/invoice_db.inc:339 reporting/rep106.php:89
+#: sales/inquiry/sales_deliveries_view.php:154
+#: sales/inquiry/sales_orders_view.php:134
 msgid "Invoice"
 msgstr ""
 
-#: purchasing/includes/db/invoice_db.inc:682
-#: purchasing/includes/db/invoice_db.inc:684
+#: 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:74
+#: purchasing/includes/ui/grn_ui.inc:23 purchasing/includes/ui/grn_ui.inc:55
+#: purchasing/includes/ui/po_ui.inc:303 sales/view/view_sales_order.php:74
 msgid "Order Currency"
 msgstr ""
 
-#: purchasing/includes/ui/grn_ui.inc:25
+#: 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:67
+#: purchasing/includes/ui/grn_ui.inc:28 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:318 purchasing/includes/ui/po_ui.inc:323
 msgid "Deliver Into Location"
 msgstr ""
 
-#: purchasing/includes/ui/grn_ui.inc:46
-msgid "Date Items Received"
+#: purchasing/includes/ui/grn_ui.inc:38 purchasing/includes/ui/grn_ui.inc:79
+#: purchasing/includes/ui/po_ui.inc:332 sales/view/view_sales_order.php:92
+msgid "Delivery Address"
 msgstr ""
 
-#: purchasing/includes/ui/grn_ui.inc:49 purchasing/includes/ui/grn_ui.inc:55
+#: purchasing/includes/ui/grn_ui.inc:41 purchasing/includes/ui/grn_ui.inc:82
 #: purchasing/includes/ui/po_ui.inc:344
-#: 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/inquiry/supplier_inquiry.php.orig:166
-msgid "Supplier's Reference"
+msgid "Order Comments"
 msgstr ""
 
-#: purchasing/includes/ui/grn_ui.inc:62 purchasing/includes/ui/po_ui.inc:348
-#: sales/view/view_sales_order.php:79
-msgid "Delivery Address"
+#: purchasing/includes/ui/grn_ui.inc:74
+msgid "Date Items Received"
 msgstr ""
 
-#: purchasing/includes/ui/grn_ui.inc:65 purchasing/includes/ui/po_ui.inc:352
-msgid "Order Comments"
+#: purchasing/includes/ui/invoice_ui.inc:121
+msgid "Source Invoices:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:96
-#: purchasing/includes/ui/invoice_ui.inc:99
+#: purchasing/includes/ui/invoice_ui.inc:123
 msgid "Supplier's Ref.:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:114
+#: purchasing/includes/ui/invoice_ui.inc:137
 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:143
+#: purchasing/includes/ui/po_ui.inc:174
+msgid "Dimension 2"
+msgstr ""
+
+#: purchasing/includes/ui/invoice_ui.inc:155
+#: purchasing/manage/suppliers.php:100 purchasing/manage/suppliers.php:105
 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:159
+#: purchasing/manage/suppliers.php:107 sales/manage/customer_branches.php:238
+#: sales/manage/customers.php:299
 msgid "Tax Group:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:145
+#: purchasing/includes/ui/invoice_ui.inc:177
 msgid "Sub-total:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:153
+#: purchasing/includes/ui/invoice_ui.inc:185
 msgid "Invoice Total:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:156
-#: sales/customer_credit_invoice.php:332
-#: sales/includes/ui/sales_credit_ui.inc:233
+#: purchasing/includes/ui/invoice_ui.inc:188
+#: sales/customer_credit_invoice.php:325
+#: sales/includes/ui/sales_credit_ui.inc:228
 msgid "Credit Note Total"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:187
+#: purchasing/includes/ui/invoice_ui.inc:220
 msgid "Add GL Line"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:188
+#: purchasing/includes/ui/invoice_ui.inc:221
 msgid "Reset"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:189
-#: purchasing/po_receive_items.php:334
+#: purchasing/includes/ui/invoice_ui.inc:222
+#: purchasing/po_receive_items.php:326
 msgid "Clear all GL entry fields"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:207
+#: purchasing/includes/ui/invoice_ui.inc:240
 msgid "GL Items for this Invoice"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:209
+#: purchasing/includes/ui/invoice_ui.inc:242
 msgid "GL Items for this Credit Note"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:219
+#: purchasing/includes/ui/invoice_ui.inc:252
 msgid "Quick Entry:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:391
+#: purchasing/includes/ui/invoice_ui.inc:421
 msgid "Add to Invoice"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:393
+#: purchasing/includes/ui/invoice_ui.inc:423
 msgid "Add to Credit Note"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:395 sales/customer_invoice.php:503
+#: purchasing/includes/ui/invoice_ui.inc:425 sales/customer_invoice.php:581
 msgid "Remove"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:395
-#: purchasing/includes/ui/invoice_ui.inc:430
+#: purchasing/includes/ui/invoice_ui.inc:425
+#: purchasing/includes/ui/invoice_ui.inc:460
 msgid ""
 "WARNING! Be careful with removal. The operation is executed immediately and "
 "cannot be undone !!!"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:397
+#: purchasing/includes/ui/invoice_ui.inc:427
+#, php-format
 msgid ""
-"You are about to remove all yet non-invoiced items from selected delivery "
-"line. This operation also irreversibly changes related order line. Do you "
-"want to continue ?"
+"You are about to remove all yet non-invoiced items from delivery line #%d. "
+"This operation also irreversibly changes related order line. Do you want to "
+"continue ?"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:428
+#: purchasing/includes/ui/invoice_ui.inc:458
 msgid "Items Received Yet to be Invoiced"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:433
+#: purchasing/includes/ui/invoice_ui.inc:463
 msgid "Delivery Item Selected For Adding To A Supplier Credit Note"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:438
+#: purchasing/includes/ui/invoice_ui.inc:468
 msgid "Received Items Charged on this Invoice"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:440
+#: purchasing/includes/ui/invoice_ui.inc:470
 msgid "Received Items Credited on this Note"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:450
+#: purchasing/includes/ui/invoice_ui.inc:480
 msgid "Received between"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:461
+#: purchasing/includes/ui/invoice_ui.inc:492
 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:501
+#: purchasing/includes/ui/invoice_ui.inc:513 reporting/rep308.php:223
+#: sales/inquiry/sales_orders_view.php:142
 msgid "Delivery"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:470
+#: purchasing/includes/ui/invoice_ui.inc:501
 msgid "P.O."
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:471
+#: purchasing/includes/ui/invoice_ui.inc:502
 msgid "Received On"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:471 purchasing/view/view_po.php:46
+#: purchasing/includes/ui/invoice_ui.inc:502 purchasing/view/view_po.php:46
 msgid "Quantity Received"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:471 purchasing/view/view_grn.php:41
+#: purchasing/includes/ui/invoice_ui.inc:502 purchasing/view/view_grn.php:41
 #: purchasing/view/view_po.php:46
 msgid "Quantity Invoiced"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:472
+#: purchasing/includes/ui/invoice_ui.inc:503
 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:503
+#: purchasing/includes/ui/po_ui.inc:216
+#: sales/includes/ui/sales_order_ui.inc:148
 msgid "Price after Tax"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:472
-#: purchasing/includes/ui/po_ui.inc:238
-#: sales/includes/ui/sales_order_ui.inc:142
+#: purchasing/includes/ui/invoice_ui.inc:503
+#: purchasing/includes/ui/po_ui.inc:216
+#: sales/includes/ui/sales_order_ui.inc:148
 msgid "Price before Tax"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:478
+#: purchasing/includes/ui/invoice_ui.inc:509
 msgid "Qty Yet To Credit"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:483
+#: purchasing/includes/ui/invoice_ui.inc:514
 msgid "Line Value"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:550
+#: purchasing/includes/ui/invoice_ui.inc:582
 msgid ""
 "There are no outstanding items received from this supplier that have not "
 "been invoiced by them."
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:553
+#: purchasing/includes/ui/invoice_ui.inc:585
 msgid ""
 "There are no received items for the selected supplier that have been "
 "invoiced."
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:554
+#: purchasing/includes/ui/invoice_ui.inc:586
 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:684
+#: purchasing/includes/ui/po_ui.inc:135 sales/sales_order_entry.php:727
 msgid "Order Date:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:179 sales/sales_order_entry.php:671
+#: purchasing/includes/ui/po_ui.inc:136 sales/sales_order_entry.php:714
 msgid "Delivery Date:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:179 sales/sales_order_entry.php:665
+#: purchasing/includes/ui/po_ui.inc:136 sales/sales_order_entry.php:708
 msgid "Invoice Date:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:190
+#: purchasing/includes/ui/po_ui.inc:149
+msgid "Supplier Currency:"
+msgstr ""
+
+#: purchasing/includes/ui/po_ui.inc:167
 msgid "Due Date:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:192
+#: purchasing/includes/ui/po_ui.inc:169
 msgid "Supplier's Reference:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:193
+#: purchasing/includes/ui/po_ui.inc:175
 msgid "Receive Into:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:218
+#: purchasing/includes/ui/po_ui.inc:196
 msgid ""
 "The default stock location set up for this user is not a currently defined "
 "stock location. Your system administrator needs to amend your user record."
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:222
+#: purchasing/includes/ui/po_ui.inc:200
 msgid "Deliver to:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:231
+#: purchasing/includes/ui/po_ui.inc:209
 msgid "Order Items"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:237 purchasing/po_receive_items.php:62
+#: purchasing/includes/ui/po_ui.inc:215 purchasing/po_receive_items.php:62
 msgid "Received"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:238
-#: sales/includes/ui/sales_order_ui.inc:610
+#: purchasing/includes/ui/po_ui.inc:216
+#: sales/includes/ui/sales_order_ui.inc:603
 msgid "Required Delivery Date"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:238 purchasing/view/view_grn.php:41
+#: purchasing/includes/ui/po_ui.inc:216 purchasing/view/view_grn.php:41
 #: purchasing/view/view_po.php:46
 msgid "Line Total"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:289 purchasing/po_receive_items.php:114
-#: reporting/includes/doctext.inc:149 sales/customer_credit_invoice.php:324
-#: sales/customer_delivery.php:498 sales/customer_invoice.php:544
-#: sales/view/view_dispatch.php:146 sales/view/view_invoice.php:148
-#: sales/includes/ui/sales_credit_ui.inc:217
-#: sales/includes/ui/sales_order_ui.inc:229
+#: purchasing/includes/ui/po_ui.inc:272 purchasing/po_receive_items.php:114
+#: reporting/rep107.php:232 reporting/rep109.php:154 reporting/rep110.php:156
+#: reporting/rep111.php:151 reporting/rep113.php:145 reporting/rep209.php:166
+#: sales/customer_credit_invoice.php:317 sales/customer_delivery.php:505
+#: sales/customer_invoice.php:625 sales/view/view_dispatch.php:146
+#: sales/view/view_invoice.php:150 sales/includes/ui/sales_credit_ui.inc:212
+#: sales/includes/ui/sales_order_ui.inc:223
 msgid "Sub-total"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:298 purchasing/po_receive_items.php:122
+#: purchasing/includes/ui/po_ui.inc:281 purchasing/po_receive_items.php:122
 #: purchasing/view/view_grn.php:79 purchasing/view/view_po.php:93
-#: sales/customer_delivery.php:505 sales/view/view_sales_order.php:244
-#: sales/includes/ui/sales_order_ui.inc:236
+#: sales/customer_delivery.php:512 sales/view/view_sales_order.php:263
+#: sales/includes/ui/sales_order_ui.inc:230
 msgid "Amount Total"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc: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:283
+#: purchasing/allocations/supplier_allocate.php:74
+#: sales/allocations/customer_allocate.php:77
+#: sales/includes/ui/sales_order_ui.inc:231
 msgid "Refresh"
 msgstr ""
 
-#: purchasing/po_entry_items.php:38
+#: purchasing/includes/ui/po_ui.inc:338 sales/view/view_sales_order.php:83
+msgid "Required Pre-Payment"
+msgstr ""
+
+#: purchasing/includes/ui/po_ui.inc:339
+msgid "Pre-Payments Allocated"
+msgstr ""
+
+#: purchasing/includes/ui/po_ui.inc:461 purchasing/po_entry_items.php:483
+#: sales/customer_invoice.php:439 sales/includes/ui/sales_order_ui.inc:396
+#: sales/includes/ui/sales_order_ui.inc:398
+msgid "Payment:"
+msgstr ""
+
+#: purchasing/includes/ui/po_ui.inc:461 purchasing/po_entry_items.php:483
+msgid "Delayed"
+msgstr ""
+
+#: purchasing/includes/ui/po_ui.inc:463
+#: sales/includes/ui/sales_order_ui.inc:614
+#: sales/includes/ui/sales_order_ui.inc:616
+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:60
+msgid "Fixed Asset Purchase Invoice Entry"
+msgstr ""
+
+#: purchasing/po_entry_items.php:63
 msgid "Direct Purchase Invoice Entry"
 msgstr ""
 
-#: purchasing/po_entry_items.php:74
+#: purchasing/po_entry_items.php:83
 msgid "Purchase Order has been entered"
 msgstr ""
 
-#: purchasing/po_entry_items.php:76
+#: purchasing/po_entry_items.php:85
 msgid "Purchase Order has been updated"
 msgstr ""
 
-#: purchasing/po_entry_items.php:77
+#: purchasing/po_entry_items.php:86
 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:88 sales/sales_order_entry.php:129
+#: sales/sales_order_entry.php:149
 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:90 sales/sales_order_entry.php:130
+#: sales/sales_order_entry.php:150
 msgid "&Email This Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:83
+#: purchasing/po_entry_items.php:92
 msgid "&Receive Items on this Purchase Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:85
+#: purchasing/po_entry_items.php:95
 msgid "Enter &Another Purchase Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:87
+#: purchasing/po_entry_items.php:97
 msgid "Select An &Outstanding Purchase Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:96
+#: purchasing/po_entry_items.php:106
 msgid "Direct GRN has been entered"
 msgstr ""
 
-#: purchasing/po_entry_items.php:98
+#: purchasing/po_entry_items.php:108
 msgid "&View this GRN"
 msgstr ""
 
-#: purchasing/po_entry_items.php:102 purchasing/po_receive_items.php:40
+#: purchasing/po_entry_items.php:112 purchasing/po_receive_items.php:40
 msgid "View the GL Journal Entries for this Delivery"
 msgstr ""
 
-#: purchasing/po_entry_items.php:107 purchasing/po_receive_items.php:42
+#: purchasing/po_entry_items.php:115 purchasing/po_receive_items.php:42
 msgid "Entry purchase &invoice for this receival"
 msgstr ""
 
-#: purchasing/po_entry_items.php:112
+#: purchasing/po_entry_items.php:120
 msgid "Enter &Another GRN"
 msgstr ""
 
-#: purchasing/po_entry_items.php:121
+#: purchasing/po_entry_items.php:129
 msgid "Direct Purchase Invoice has been entered"
 msgstr ""
 
-#: purchasing/po_entry_items.php:123
+#: purchasing/po_entry_items.php:131
 msgid "&View this Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:128 purchasing/supplier_invoice.php:46
+#: purchasing/po_entry_items.php:133 purchasing/supplier_invoice.php:69
 msgid "View the GL Journal Entries for this Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:130 purchasing/supplier_invoice.php:48
+#: purchasing/po_entry_items.php:135 purchasing/supplier_invoice.php:71
 msgid "Entry supplier &payment for this invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:136
-msgid "Enter &Another Direct Invoice"
+#: purchasing/po_entry_items.php:141
+msgid "Enter &Another Direct Invoice"
+msgstr ""
+
+#: purchasing/po_entry_items.php:147
+msgid "There are no purchasable fixed assets defined in the system."
 msgstr ""
 
-#: purchasing/po_entry_items.php:168
+#: purchasing/po_entry_items.php:178
 msgid ""
 "This item cannot be deleted because some of it has already been received."
 msgstr ""
 
-#: purchasing/po_entry_items.php:183
+#: purchasing/po_entry_items.php:193
 msgid ""
 "This order cannot be cancelled because some of it has already been received."
 msgstr ""
 
-#: purchasing/po_entry_items.php:184
+#: purchasing/po_entry_items.php:194
 msgid ""
 "The line item quantities may be modified to quantities more than already "
 "received. prices cannot be altered for lines that have already been received "
 "and quantities cannot be reduced below the quantity already received."
 msgstr ""
 
-#: purchasing/po_entry_items.php:199
+#: purchasing/po_entry_items.php:214
 msgid "This purchase order has been cancelled."
 msgstr ""
 
-#: purchasing/po_entry_items.php:201
+#: purchasing/po_entry_items.php:216
 msgid "Enter a new purchase order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:213 sales/sales_order_entry.php:465
+#: purchasing/po_entry_items.php:228 sales/sales_order_entry.php:518
 msgid "Item description cannot be empty."
 msgstr ""
 
-#: purchasing/po_entry_items.php:223
+#: purchasing/po_entry_items.php:238
 msgid "The quantity of the order item must be numeric and not less than "
 msgstr ""
 
-#: purchasing/po_entry_items.php:230
+#: purchasing/po_entry_items.php:245
 msgid "The price entered must be numeric and not less than zero."
 msgstr ""
 
-#: purchasing/po_entry_items.php:254
+#: purchasing/po_entry_items.php:269
 msgid ""
 "You are attempting to make the quantity ordered a quantity less than has "
 "already been invoiced or received.  This is prohibited."
 msgstr ""
 
-#: purchasing/po_entry_items.php:255
+#: purchasing/po_entry_items.php:270
 msgid ""
 "The quantity received can only be modified by entering a negative receipt "
 "and the quantity invoiced can only be reduced by entering a credit note "
 "against this item."
 msgstr ""
 
-#: purchasing/po_entry_items.php:283
+#: purchasing/po_entry_items.php:298
 msgid "The selected item is already on this order."
 msgstr ""
 
-#: purchasing/po_entry_items.php:310
+#: purchasing/po_entry_items.php:324
 msgid ""
 "The selected item does not exist or it is a kit part and therefore cannot be "
 "purchased."
 msgstr ""
 
-#: purchasing/po_entry_items.php:326 purchasing/supplier_invoice.php:343
-#: purchasing/supplier_payment.php:117
-#: purchasing/supplier_payment.php.orig:114
+#: purchasing/po_entry_items.php:338 purchasing/supplier_invoice.php:382
+#: purchasing/supplier_payment.php:132
 msgid "There is no supplier selected."
 msgstr ""
 
-#: purchasing/po_entry_items.php:333
+#: purchasing/po_entry_items.php:345
 msgid "The entered order date is invalid."
 msgstr ""
 
-#: purchasing/po_entry_items.php:340 purchasing/po_receive_items.php:181
-#: sales/sales_order_entry.php:347
-msgid "The entered date is not in fiscal year"
-msgstr ""
-
-#: purchasing/po_entry_items.php:347
+#: purchasing/po_entry_items.php:358
 msgid "The entered due date is invalid."
 msgstr ""
 
-#: purchasing/po_entry_items.php:356
-msgid "There is no reference entered for this purchase order."
+#: purchasing/po_entry_items.php:374 purchasing/supplier_credit.php:199
+#: purchasing/supplier_invoice.php:208
+msgid "You must enter a supplier's invoice reference."
 msgstr ""
 
-#: purchasing/po_entry_items.php:371 purchasing/supplier_invoice.php:161
-msgid "You must enter a supplier's invoice reference."
+#: purchasing/po_entry_items.php:381 purchasing/supplier_credit.php:206
+#: purchasing/supplier_invoice.php:215
+msgid ""
+"This invoice number has already been entered. It cannot be entered again."
 msgstr ""
 
-#: purchasing/po_entry_items.php:377
+#: purchasing/po_entry_items.php:387
 msgid "There is no delivery address specified."
 msgstr ""
 
-#: purchasing/po_entry_items.php:383
+#: purchasing/po_entry_items.php:393
 msgid "There is no location specified to move any items into."
 msgstr ""
 
-#: purchasing/po_entry_items.php:390
+#: purchasing/po_entry_items.php:401
 msgid ""
 "The order cannot be placed because there are no lines entered on this order."
 msgstr ""
 
-#: purchasing/po_entry_items.php:516 sales/sales_order_entry.php:688
+#: purchasing/po_entry_items.php:406
+msgid "Required prepayment is greater than total invoice value."
+msgstr ""
+
+#: purchasing/po_entry_items.php:491 sales/sales_order_entry.php:731
 msgid "Place Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:517
+#: purchasing/po_entry_items.php:492
 msgid "Update Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:518 sales/sales_order_entry.php:687
+#: purchasing/po_entry_items.php:493 sales/sales_order_entry.php:730
 msgid "Cancel Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:520
+#: purchasing/po_entry_items.php:495
 msgid "Process GRN"
 msgstr ""
 
-#: purchasing/po_entry_items.php:521
+#: purchasing/po_entry_items.php:496
 msgid "Update GRN"
 msgstr ""
 
-#: purchasing/po_entry_items.php:522
+#: purchasing/po_entry_items.php:497
 msgid "Cancel GRN"
 msgstr ""
 
-#: purchasing/po_entry_items.php:525 sales/customer_invoice.php:563
+#: purchasing/po_entry_items.php:500 sales/customer_invoice.php:664
 msgid "Process Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:526
+#: purchasing/po_entry_items.php:501
 msgid "Update Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:527 sales/sales_order_entry.php:668
+#: purchasing/po_entry_items.php:502 sales/sales_order_entry.php:711
 msgid "Cancel Invoice"
 msgstr ""
 
@@ -9208,39 +10752,39 @@ msgid ""
 "select a purchase order first."
 msgstr ""
 
-#: purchasing/po_receive_items.php:62 reporting/rep105.php:112
-#: sales/customer_delivery.php:429
+#: purchasing/po_receive_items.php:62 reporting/rep105.php:114
+#: sales/customer_delivery.php:420
 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:119
+#: purchasing/po_receive_items.php:63 reporting/rep101.php:133
+#: reporting/rep105.php:115 reporting/rep105.php:166 reporting/rep201.php:108
+#: reporting/includes/doctext.inc:246
 msgid "Outstanding"
 msgstr ""
 
-#: purchasing/po_receive_items.php:63 sales/customer_delivery.php:430
+#: purchasing/po_receive_items.php:63 sales/customer_delivery.php:421
 msgid "This Delivery"
 msgstr ""
 
-#: purchasing/po_receive_items.php:168 purchasing/po_receive_items.php:224
+#: purchasing/po_receive_items.php:168 purchasing/po_receive_items.php:214
 msgid ""
 "There is nothing to process. Please enter valid quantities greater than zero."
 msgstr ""
 
-#: purchasing/po_receive_items.php:229
+#: purchasing/po_receive_items.php:219
 msgid ""
 "Entered quantities cannot be greater than the quantity entered on the "
 "purchase order including the allowed over-receive percentage"
 msgstr ""
 
-#: purchasing/po_receive_items.php:231
+#: purchasing/po_receive_items.php:221
 msgid ""
 "Modify the ordered items on the purchase order if you wish to increase the "
 "quantities."
 msgstr ""
 
-#: purchasing/po_receive_items.php:249
+#: purchasing/po_receive_items.php:239
 msgid ""
 "This order has been changed or invoiced since this delivery was started to "
 "be actioned. Processing halted. To enter a delivery against this purchase "
@@ -9248,158 +10792,139 @@ msgid ""
 "by the other user."
 msgstr ""
 
-#: purchasing/po_receive_items.php:252
+#: purchasing/po_receive_items.php:242
 msgid "Select a different purchase order for receiving goods against"
 msgstr ""
 
-#: purchasing/po_receive_items.php:255
+#: purchasing/po_receive_items.php:245
 msgid "Re-Read the updated purchase order for receiving goods against"
 msgstr ""
 
-#: purchasing/po_receive_items.php:329
+#: purchasing/po_receive_items.php:321
 msgid "Items to Receive"
 msgstr ""
 
-#: purchasing/po_receive_items.php:334
+#: purchasing/po_receive_items.php:326
 msgid "Process Receive Items"
 msgstr ""
 
-#: purchasing/supplier_credit.php:43
+#: purchasing/supplier_credit.php:76
 msgid "Supplier credit note has been processed."
 msgstr ""
 
-#: purchasing/supplier_credit.php:44
+#: purchasing/supplier_credit.php:77
 msgid "View this Credit Note"
 msgstr ""
 
-#: purchasing/supplier_credit.php:46
+#: purchasing/supplier_credit.php:79
 msgid "View the GL Journal Entries for this Credit Note"
 msgstr ""
 
-#: purchasing/supplier_credit.php:48
+#: purchasing/supplier_credit.php:81
 msgid "Enter Another Credit Note"
 msgstr ""
 
-#: purchasing/supplier_credit.php:102 purchasing/supplier_invoice.php:102
+#: purchasing/supplier_credit.php:126 purchasing/supplier_invoice.php:137
 msgid ""
 "The account code entered is not a valid code, this line cannot be added to "
 "the transaction."
 msgstr ""
 
-#: purchasing/supplier_credit.php:112 purchasing/supplier_invoice.php:112
+#: purchasing/supplier_credit.php:136 purchasing/supplier_invoice.php:147
 msgid ""
 "The amount entered is not numeric. This line cannot be added to the "
 "transaction."
 msgstr ""
 
-#: purchasing/supplier_credit.php:142
+#: purchasing/supplier_credit.php:167
 msgid ""
 "The credit note cannot be processed because the there are no items or values "
 "on the invoice.  Credit notes are expected to have a charge."
 msgstr ""
 
-#: purchasing/supplier_credit.php:149
-msgid "You must enter an credit note reference."
-msgstr ""
-
-#: purchasing/supplier_credit.php:163
-msgid "You must enter a supplier's credit note reference."
-msgstr ""
-
-#: purchasing/supplier_credit.php:170
+#: purchasing/supplier_credit.php:180
 msgid ""
 "The credit note as entered cannot be processed because the date entered is "
 "not valid."
 msgstr ""
 
-#: purchasing/supplier_credit.php:182 purchasing/supplier_invoice.php:180
+#: purchasing/supplier_credit.php:192 purchasing/supplier_invoice.php:201
 msgid ""
 "The invoice as entered cannot be processed because the due date is in an "
 "incorrect format."
 msgstr ""
 
-#: purchasing/supplier_credit.php:189
-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:218
 msgid ""
 "The return cannot be processed because there is an insufficient quantity for "
 "item:"
 msgstr ""
 
-#: purchasing/supplier_credit.php:245
+#: purchasing/supplier_credit.php:262
 msgid "The quantity to credit must be numeric and greater than zero."
 msgstr ""
 
-#: purchasing/supplier_credit.php:252
+#: purchasing/supplier_credit.php:269
 msgid "The price is either not numeric or negative."
 msgstr ""
 
-#: purchasing/supplier_credit.php:354
+#: purchasing/supplier_credit.php:372
 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: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
-msgid "You must enter an invoice reference."
-msgstr ""
-
-#: purchasing/supplier_invoice.php:168
+#: purchasing/supplier_invoice.php:189
 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:253
 msgid "The quantity to invoice must be numeric and greater than zero."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:231
+#: purchasing/supplier_invoice.php:260
 msgid "The price is not numeric."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:244
+#: purchasing/supplier_invoice.php:273
 msgid ""
 "The price being invoiced is more than the purchase order price by more than "
 "the allowed over-charge percentage. The system is set up to prohibit this. "
 "See the system administrator to modify the set up parameters if necessary."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:245 purchasing/supplier_invoice.php:258
+#: purchasing/supplier_invoice.php:274 purchasing/supplier_invoice.php:287
 msgid "The over-charge percentage allowance is :"
 msgstr ""
 
-#: purchasing/supplier_invoice.php:257
+#: purchasing/supplier_invoice.php:286
 msgid ""
 "The quantity being invoiced is more than the outstanding quantity by more "
 "than the allowed over-charge percentage. The system is set up to prohibit "
@@ -9407,96 +10932,103 @@ msgid ""
 "necessary."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:325
+#: purchasing/supplier_invoice.php:364
 #, php-format
 msgid "All yet non-invoiced items on delivery line # %d has been removed."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:367
+#: purchasing/supplier_invoice.php:406
 msgid "Enter Invoice"
 msgstr ""
 
-#: purchasing/supplier_payment.php:31 purchasing/supplier_payment.php.orig:31
+#: purchasing/supplier_payment.php:31
 msgid "Supplier Payment Entry"
 msgstr ""
 
-#: purchasing/supplier_payment.php:88 purchasing/supplier_payment.php.orig:85
+#: purchasing/supplier_payment.php:90
 msgid "Invalid purchase invoice number."
 msgstr ""
 
-#: purchasing/supplier_payment.php:95 purchasing/supplier_payment.php.orig:92
+#: purchasing/supplier_payment.php:96
 msgid "Payment has been sucessfully entered"
 msgstr ""
 
-#: purchasing/supplier_payment.php:97 purchasing/supplier_payment.php.orig:94
+#: purchasing/supplier_payment.php:98
 msgid "&Print This Remittance"
 msgstr ""
 
-#: purchasing/supplier_payment.php:98 purchasing/supplier_payment.php.orig:95
+#: purchasing/supplier_payment.php:99
 msgid "&Email This Remittance"
 msgstr ""
 
-#: purchasing/supplier_payment.php:100 purchasing/supplier_payment.php.orig:97
+#: purchasing/supplier_payment.php:101
+msgid "View this Payment"
+msgstr ""
+
+#: purchasing/supplier_payment.php:102
 msgid "View the GL &Journal Entries for this Payment"
 msgstr ""
 
 #: purchasing/supplier_payment.php:104
-#: purchasing/supplier_payment.php.orig:101
 msgid "Enter another supplier &payment"
 msgstr ""
 
-#: purchasing/supplier_payment.php:151
-#: purchasing/supplier_payment.php.orig:148 sales/customer_payments.php:139
-#: sales/customer_payments.php.orig:139
-msgid "The exchange rate must be numeric and greater than zero."
+#: purchasing/supplier_payment.php:105 sales/customer_payments.php:107
+msgid "Enter Other &Payment"
 msgstr ""
 
-#: purchasing/supplier_payment.php:163
-#: purchasing/supplier_payment.php.orig:160
-msgid "The entered discount is invalid or less than zero."
+#: purchasing/supplier_payment.php:106
+msgid "Enter &Customer Payment"
+msgstr ""
+
+#: purchasing/supplier_payment.php:107 sales/customer_payments.php:105
+msgid "Enter Other &Deposit"
+msgstr ""
+
+#: purchasing/supplier_payment.php:108 sales/customer_payments.php:108
+msgid "Bank Account &Transfer"
 msgstr ""
 
 #: purchasing/supplier_payment.php:171
-#: purchasing/supplier_payment.php.orig:168
+msgid "The entered discount is invalid or less than zero."
+msgstr ""
+
+#: purchasing/supplier_payment.php:179
 msgid ""
 "The total of the amount and the discount is zero or negative. Please enter "
 "positive values."
 msgstr ""
 
-#: purchasing/supplier_payment.php:272
-#: purchasing/supplier_payment.php.orig:269
+#: purchasing/supplier_payment.php:186
+msgid "The entered bank amount is zero or negative."
+msgstr ""
+
+#: purchasing/supplier_payment.php:276
 msgid "Payment To:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:279
-#: purchasing/supplier_payment.php.orig:281
+#: purchasing/supplier_payment.php:294
 msgid "From Bank Account:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:287
-#: purchasing/supplier_payment.php.orig:289
+#: purchasing/supplier_payment.php:300
 #: purchasing/view/view_supp_payment.php:55
 msgid "Date Paid"
 msgstr ""
 
-#: purchasing/supplier_payment.php:311
-#: purchasing/supplier_payment.php.orig:312 sales/customer_payments.php:288
-#: sales/customer_payments.php.orig:289
-msgid "Amount of Discount:"
+#: purchasing/supplier_payment.php:316
+msgid "Bank Amount:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:312
-#: purchasing/supplier_payment.php.orig:313
-msgid "Amount of Payment:"
+#: purchasing/supplier_payment.php:329 sales/customer_payments.php:374
+msgid "Amount of Discount:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:318
-#: purchasing/supplier_payment.php.orig:319
-msgid "The amount and discount are in the bank account's currency."
+#: purchasing/supplier_payment.php:330
+msgid "Amount of Payment:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:321
-#: purchasing/supplier_payment.php.orig:322
+#: purchasing/supplier_payment.php:334
 msgid "Enter Payment"
 msgstr ""
 
@@ -9510,20 +11042,20 @@ msgid ""
 msgstr ""
 
 #: purchasing/view/view_grn.php:37 purchasing/view/view_po.php:41
-#: sales/view/view_sales_order.php:198
+#: 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:105
-#: sales/inquiry/sales_deliveries_view.php:186
+#: purchasing/view/view_grn.php:40 reporting/includes/doctext.inc:76
+#: reporting/includes/doctext.inc:191 reporting/includes/doctext.inc:243
+#: sales/inquiry/sales_deliveries_view.php:175
 msgid "Delivery Date"
 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 sales/view/view_credit.php:136
-#: sales/view/view_sales_order.php:234
+#: purchasing/view/view_supp_invoice.php:66 sales/view/view_credit.php:135
+#: sales/view/view_sales_order.php:253
 msgid "Sub Total"
 msgstr ""
 
@@ -9544,17 +11076,16 @@ msgid "Requested By"
 msgstr ""
 
 #: purchasing/view/view_po.php:100
-#: purchasing/inquiry/supplier_allocation_inquiry.php:147
-#: purchasing/inquiry/supplier_inquiry.php:187
-#: purchasing/inquiry/supplier_inquiry.php.orig: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:309
+#: purchasing/inquiry/supplier_allocation_inquiry.php:158
+#: purchasing/inquiry/supplier_inquiry.php:199
+#: sales/inquiry/customer_allocation_inquiry.php:167
+#: sales/inquiry/customer_inquiry.php:219
+#: sales/inquiry/sales_deliveries_view.php:195
+#: sales/inquiry/sales_orders_view.php:311
 msgid "Marked items are overdue."
 msgstr ""
 
-#: purchasing/view/view_po.php:113 sales/view/view_invoice.php:97
+#: purchasing/view/view_po.php:113 sales/view/view_invoice.php:98
 #: sales/view/view_sales_order.php:51
 msgid "Deliveries"
 msgstr ""
@@ -9576,8 +11107,8 @@ msgid "SUPPLIER CREDIT NOTE"
 msgstr ""
 
 #: purchasing/view/view_supp_credit.php:47
-#: purchasing/view/view_supp_invoice.php:50
-#: sales/customer_credit_invoice.php:270 sales/view/view_invoice.php:95
+#: purchasing/view/view_supp_invoice.php:51 reporting/includes/doctext.inc:140
+#: sales/customer_credit_invoice.php:263 sales/view/view_invoice.php:100
 msgid "Invoice Date"
 msgstr ""
 
@@ -9585,24 +11116,24 @@ msgstr ""
 msgid "TOTAL CREDIT NOTE"
 msgstr ""
 
-#: purchasing/view/view_supp_credit.php:71 sales/view/view_credit.php:147
+#: purchasing/view/view_supp_credit.php:71 sales/view/view_credit.php:150
 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:153
-#: sales/view/view_invoice.php:164
+#: purchasing/view/view_supp_invoice.php:73 reporting/rep107.php:285
+#: reporting/rep107.php:291 sales/view/view_invoice.php:168
 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:175
 msgid "This invoice has been voided."
 msgstr ""
 
@@ -9618,205 +11149,216 @@ msgstr ""
 msgid "To Supplier"
 msgstr ""
 
-#: purchasing/view/view_supp_payment.php:59 sales/view/view_receipt.php:43
+#: purchasing/view/view_supp_payment.php:59
 msgid "Payment Currency"
 msgstr ""
 
-#: purchasing/view/view_supp_payment.php:66
+#: purchasing/view/view_supp_payment.php:62 reporting/rep112.php:155
+#: reporting/rep210.php:164 sales/customer_delivery.php:421
+#: sales/customer_invoice.php:519 sales/customer_invoice.php:522
+#: sales/view/view_receipt.php:45 sales/view/view_sales_order.php:220
+msgid "Discount"
+msgstr ""
+
+#: purchasing/view/view_supp_payment.php:69
 msgid "Supplier's Currency"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:21 sales/manage/customer_branches.php:33
+#: purchasing/manage/suppliers.php:27 sales/manage/customer_branches.php:37
+#: sales/manage/recurrent_invoices.php:42
 msgid ""
 "There are no tax groups defined in the system. At least one tax group is "
 "required before proceeding."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:83
+#: purchasing/manage/suppliers.php:90
 msgid "Basic Data"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:85
+#: purchasing/manage/suppliers.php:92
 msgid "Supplier Name:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:86
+#: purchasing/manage/suppliers.php:93
 msgid "Supplier Short Name:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:89
+#: purchasing/manage/suppliers.php:96
 msgid "Website:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:100
+#: purchasing/manage/suppliers.php:108
 msgid "Our Customer No:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:103
-msgid "Contact Data"
-msgstr ""
-
-#: purchasing/manage/suppliers.php:109
-msgid "System default"
-msgstr ""
-
-#: purchasing/manage/suppliers.php:111
+#: purchasing/manage/suppliers.php:110
 msgid "Purchasing"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:112
+#: purchasing/manage/suppliers.php:111
 msgid "Bank Name/Account:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:113 sales/manage/customers.php:228
+#: purchasing/manage/suppliers.php:112 sales/manage/customers.php:269
 msgid "Credit Limit:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:114 sales/manage/customers.php:230
+#: purchasing/manage/suppliers.php:113 sales/manage/customers.php:271
 msgid "Payment Terms:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:120 purchasing/manage/suppliers.php:123
+#: purchasing/manage/suppliers.php:119 purchasing/manage/suppliers.php:122
 msgid "Prices contain tax included:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:125 reporting/rep704.php:91
-#: reporting/rep704.php:101 reporting/rep704.php:109
+#: purchasing/manage/suppliers.php:127 reporting/rep704.php:95
+#: reporting/rep704.php:105 reporting/rep704.php:113
 msgid "Accounts"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:126
+#: purchasing/manage/suppliers.php:128
 msgid "Accounts Payable Account:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:127
+#: purchasing/manage/suppliers.php:129
 msgid "Purchase Account:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:128
+#: purchasing/manage/suppliers.php:130
 msgid "Use Item Inventory/COGS Account"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:146 sales/manage/customer_branches.php:266
+#: purchasing/manage/suppliers.php:133 purchasing/manage/suppliers.php:137
+msgid "Contact Data"
+msgstr ""
+
+#: purchasing/manage/suppliers.php:140
+msgid "System default"
+msgstr ""
+
+#: purchasing/manage/suppliers.php:159 sales/manage/customer_branches.php:259
 msgid "Addresses"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:147 sales/manage/customer_branches.php:267
+#: purchasing/manage/suppliers.php:160 reporting/rep205.php:93
+#: sales/manage/customer_branches.php:260
 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 reporting/rep205.php:170
+#: sales/manage/customer_branches.php:262 sales/manage/customers.php:292
 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:173
 msgid "Update Supplier"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:161
+#: purchasing/manage/suppliers.php:174
 msgid "Update supplier data"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:162
+#: purchasing/manage/suppliers.php:175
 msgid "Select this supplier and return to document entry."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:163
+#: purchasing/manage/suppliers.php:176
 msgid "Delete Supplier"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:164
+#: purchasing/manage/suppliers.php:177
 msgid "Delete supplier data if have been never used"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:168
+#: purchasing/manage/suppliers.php:181
 msgid "Add New Supplier Details"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:187
+#: purchasing/manage/suppliers.php:200
 msgid "The supplier name must be entered."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:194
+#: purchasing/manage/suppliers.php:207
 msgid "The supplier short name must be entered."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:214
+#: purchasing/manage/suppliers.php:227
 msgid "Supplier has been updated."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:232
+#: purchasing/manage/suppliers.php:245
 msgid "A new supplier has been added."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:250
+#: purchasing/manage/suppliers.php:263
 msgid ""
 "Cannot delete this supplier because there are transactions that refer to "
 "this supplier."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:258
+#: purchasing/manage/suppliers.php:271
 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:282
+msgid "Supplier has been deleted."
+msgstr ""
+
+#: purchasing/manage/suppliers.php:292
+#: purchasing/inquiry/po_search_completed.php:95
+#: purchasing/inquiry/po_search.php:76
 #: purchasing/inquiry/supplier_allocation_inquiry.php:48
 msgid "Select a supplier: "
 msgstr ""
 
-#: purchasing/manage/suppliers.php:280
+#: purchasing/manage/suppliers.php:293
 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:312 sales/manage/customer_branches.php:311
+#: sales/manage/customers.php:352
+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:314
+msgid "Purchase &Orders"
 msgstr ""
 
-#: purchasing/inquiry/po_search_completed.php:24
+#: purchasing/inquiry/po_search_completed.php:25
 msgid "Search Purchase Orders"
 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
-msgid "#:"
+#: purchasing/inquiry/po_search_completed.php:85
+msgid "into location:"
 msgstr ""
 
-#: purchasing/inquiry/po_search_completed.php:65
-msgid "into location:"
+#: purchasing/inquiry/po_search_completed.php:97
+msgid "Also closed:"
 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:115
+#: purchasing/inquiry/po_search.php:122 reporting/includes/doctext.inc:187
+#: sales/inquiry/sales_orders_view.php:257
 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:117
+#: purchasing/inquiry/po_search.php:124
+#: sales/inquiry/sales_orders_view.php:260
 msgid "Order Total"
 msgstr ""
 
@@ -9824,11 +11366,11 @@ msgstr ""
 msgid "Search Outstanding Purchase Orders"
 msgstr ""
 
-#: purchasing/inquiry/po_search.php:98
+#: purchasing/inquiry/po_search.php:99
 msgid "Receive"
 msgstr ""
 
-#: purchasing/inquiry/po_search.php:148
+#: purchasing/inquiry/po_search.php:135
 msgid "Marked orders have overdue items."
 msgstr ""
 
@@ -9841,121 +11383,112 @@ msgstr ""
 msgid "show settled:"
 msgstr ""
 
-#: purchasing/inquiry/supplier_allocation_inquiry.php:129
+#: purchasing/inquiry/supplier_allocation_inquiry.php:108
+#: sales/inquiry/customer_allocation_inquiry.php:118
+msgid "Payment"
+msgstr ""
+
+#: purchasing/inquiry/supplier_allocation_inquiry.php:140
 msgid "Supp Reference"
 msgstr ""
 
-#: purchasing/inquiry/supplier_allocation_inquiry.php:135
-#: reporting/rep101.php:131 reporting/rep201.php:119
-#: reporting/includes/doctext.inc:119
-#: sales/inquiry/customer_allocation_inquiry.php:151
+#: purchasing/inquiry/supplier_allocation_inquiry.php:146
+#: reporting/rep101.php:133 reporting/rep201.php:108
+#: reporting/includes/doctext.inc:246
+#: sales/inquiry/customer_allocation_inquiry.php:156
 msgid "Allocated"
 msgstr ""
 
 #: purchasing/inquiry/supplier_inquiry.php:25
-#: purchasing/inquiry/supplier_inquiry.php.orig:25
 msgid "Supplier Inquiry"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:47
-#: purchasing/inquiry/supplier_inquiry.php.orig:47
-msgid "Select a supplier:"
-msgstr ""
-
-#: purchasing/inquiry/supplier_inquiry.php:66
-#: purchasing/inquiry/supplier_inquiry.php:67
-#: purchasing/inquiry/supplier_inquiry.php:68
-#: purchasing/inquiry/supplier_inquiry.php.orig:66
-#: purchasing/inquiry/supplier_inquiry.php.orig:67
-#: purchasing/inquiry/supplier_inquiry.php.orig:68 reporting/rep102.php:120
-#: reporting/rep102.php:121 reporting/rep102.php:122 reporting/rep102.php:242
-#: reporting/rep202.php:122 reporting/rep202.php:123 reporting/rep202.php:124
-#: reporting/rep202.php:154 reporting/rep202.php:155 reporting/rep202.php:156
-#: reporting/rep202.php:248 reporting/includes/doctext.inc:181
-#: sales/create_recurrent_invoices.php:115
-#: sales/manage/recurrent_invoices.php:102
-#: sales/inquiry/customer_inquiry.php:71 sales/inquiry/customer_inquiry.php:72
-#: sales/inquiry/customer_inquiry.php:73
-msgid "Days"
-msgstr ""
-
-#: purchasing/inquiry/supplier_inquiry.php:68
-#: purchasing/inquiry/supplier_inquiry.php.orig:68 reporting/rep102.php:122
-#: reporting/rep202.php:124 reporting/rep202.php:156
-#: reporting/includes/doctext.inc:182 sales/inquiry/customer_inquiry.php:73
+#: purchasing/inquiry/supplier_inquiry.php:46 reporting/rep102.php:118
+#: reporting/rep108.php:153 reporting/rep202.php:124 reporting/rep202.php:158
+#: sales/inquiry/customer_inquiry.php:118
 msgid "Over"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:72
-#: purchasing/inquiry/supplier_inquiry.php.orig:72
-#: sales/inquiry/customer_inquiry.php:76
+#: purchasing/inquiry/supplier_inquiry.php:50
+#: sales/inquiry/customer_inquiry.php:121
 msgid "Terms"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:72
-#: purchasing/inquiry/supplier_inquiry.php.orig:72 reporting/rep102.php:125
-#: reporting/rep102.php:240 reporting/rep202.php:128 reporting/rep202.php:246
-#: reporting/includes/doctext.inc:177 sales/inquiry/customer_inquiry.php:76
+#: purchasing/inquiry/supplier_inquiry.php:50 reporting/rep102.php:121
+#: reporting/rep102.php:239 reporting/rep108.php:155 reporting/rep202.php:128
+#: reporting/rep202.php:247 reporting/rep451.php:80
+#: sales/inquiry/customer_inquiry.php:121
 msgid "Current"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:73
-#: purchasing/inquiry/supplier_inquiry.php.orig:73 reporting/rep102.php:126
-#: reporting/rep202.php:129 reporting/includes/doctext.inc:178
-#: sales/inquiry/customer_inquiry.php:77
+#: purchasing/inquiry/supplier_inquiry.php:51 reporting/rep102.php:122
+#: reporting/rep108.php:155 reporting/rep202.php:129
+#: sales/inquiry/customer_inquiry.php:122
 msgid "Total Balance"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:127
-#: purchasing/inquiry/supplier_inquiry.php.orig:127
-#: sales/inquiry/customer_inquiry.php:158
+#: purchasing/inquiry/supplier_inquiry.php:94
+#: sales/inquiry/customer_inquiry.php:74
 msgid "Credit This"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:149
-#: purchasing/inquiry/supplier_inquiry.php.orig:149
+#: purchasing/inquiry/supplier_inquiry.php:109
 msgid "Print Remittance"
 msgstr ""
 
+#: purchasing/inquiry/supplier_inquiry.php:137
+msgid "Select a supplier:"
+msgstr ""
+
+#: purchasing/inquiry/suppliers_list.php:53
+#: sales/inquiry/customers_list.php:54
+msgid "Tax ID"
+msgstr ""
+
 #: purchasing/allocations/supplier_allocate.php:29
 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:60
 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:64
+msgid "Amount ot be settled:"
+msgstr ""
+
+#: purchasing/allocations/supplier_allocate.php:74
+#: sales/allocations/customer_allocate.php:77
 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:78
 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:79
+#: sales/allocations/customer_allocate.php:85
 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:79
+#: sales/allocations/customer_allocate.php:86
 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:83
 msgid "There are no unsettled transactions to allocate."
 msgstr ""
 
@@ -9973,168 +11506,181 @@ msgid "Show Settled Items:"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocation_main.php:70
-#: sales/allocations/customer_allocation_main.php:74
+#: sales/allocations/customer_allocation_main.php:68
 msgid "Allocate"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocation_main.php:111
-#: sales/allocations/customer_allocation_main.php:110
+#: sales/allocations/customer_allocation_main.php:109
 msgid "Marked items are settled."
 msgstr ""
 
-#: reporting/rep101.php:120 reporting/rep102.php:108 reporting/rep114.php:103
-#: reporting/rep202.php:110 reporting/rep203.php:81
+#: reporting/rep101.php:122 reporting/rep102.php:104 reporting/rep114.php:108
+#: reporting/rep202.php:110 reporting/rep203.php:78
 msgid "Balances in Home Currency"
 msgstr ""
 
-#: reporting/rep101.php:130 reporting/rep201.php:118 reporting/rep203.php:91
-#: reporting/rep709.php:109 reporting/includes/doctext.inc:110
-#: reporting/includes/doctext.inc:118
+#: reporting/rep101.php:132 reporting/rep201.php:107 reporting/rep203.php:88
+#: reporting/rep709.php:116 reporting/includes/doctext.inc:166
+#: reporting/includes/doctext.inc:207 reporting/includes/doctext.inc:245
 msgid "Trans Type"
 msgstr ""
 
-#: reporting/rep101.php:130 reporting/rep201.php:118
-#: reporting/includes/doctext.inc:118
+#: reporting/rep101.php:132 reporting/rep201.php:107
+#: reporting/includes/doctext.inc:245
 msgid "Charges"
 msgstr ""
 
-#: reporting/rep101.php:130 reporting/rep201.php:119
-#: reporting/includes/doctext.inc:119
+#: reporting/rep101.php:132 reporting/rep201.php:108
+#: reporting/includes/doctext.inc:246
 msgid "Credits"
 msgstr ""
 
-#: reporting/rep101.php:139 reporting/rep102.php:136 reporting/rep201.php:127
-#: reporting/rep202.php:139 reporting/rep203.php:100 reporting/rep303.php:124
-#: reporting/reports_main.php:38 reporting/reports_main.php:47
-#: reporting/reports_main.php:138 reporting/reports_main.php:147
-#: reporting/reports_main.php:155 reporting/reports_main.php:194
+#: reporting/rep101.php:143 reporting/rep102.php:132 reporting/rep201.php:118
+#: reporting/rep202.php:139 reporting/rep203.php:97 reporting/rep303.php:135
+#: reporting/reports_main.php:41 reporting/reports_main.php:51
+#: reporting/reports_main.php:158 reporting/reports_main.php:168
+#: reporting/reports_main.php:177 reporting/reports_main.php:229
 msgid "Suppress Zeros"
 msgstr ""
 
-#: reporting/rep101.php:141
+#: reporting/rep101.php:145
 msgid "Customer Balances"
 msgstr ""
 
-#: reporting/rep101.php:244 reporting/rep102.php:226 reporting/rep106.php:177
-#: reporting/rep201.php:231 reporting/rep202.php:231 reporting/rep203.php:177
-#: reporting/rep204.php:144 reporting/rep301.php:172 reporting/rep304.php:193
-#: reporting/rep305.php:181
+#: reporting/rep101.php:262 reporting/rep102.php:226 reporting/rep106.php:181
+#: reporting/rep201.php:232 reporting/rep202.php:233 reporting/rep203.php:176
+#: reporting/rep204.php:148 reporting/rep301.php:249 reporting/rep304.php:212
+#: reporting/rep305.php:193 reporting/rep306.php:293 reporting/rep309.php:157
+#: reporting/rep451.php:164
 msgid "Grand Total"
 msgstr ""
 
-#: reporting/rep102.php:102 reporting/rep106.php:91 reporting/rep202.php:104
-#: reporting/rep709.php:93 reporting/reports_main.php:46
-#: reporting/reports_main.php:84 reporting/reports_main.php:146
-#: reporting/reports_main.php:180 reporting/reports_main.php:392
+#: reporting/rep102.php:98 reporting/rep106.php:99 reporting/rep202.php:104
+#: reporting/rep709.php:100 reporting/reports_main.php:50
+#: reporting/reports_main.php:93 reporting/reports_main.php:167
+#: reporting/reports_main.php:213 reporting/reports_main.php:313
+#: reporting/reports_main.php:509
 msgid "Summary Only"
 msgstr ""
 
-#: reporting/rep102.php:104 reporting/rep202.php:106 reporting/rep709.php:95
+#: reporting/rep102.php:100 reporting/rep202.php:106 reporting/rep709.php:102
 msgid "Detailed Report"
 msgstr ""
 
-#: reporting/rep102.php:131 reporting/rep202.php:134 reporting/rep203.php:97
-#: reporting/reports_main.php:35 reporting/reports_main.php:42
-#: reporting/reports_main.php:61 reporting/reports_main.php:75
-#: reporting/reports_main.php:83 reporting/reports_main.php:135
-#: reporting/reports_main.php:142 reporting/reports_main.php:152
-#: reporting/reports_main.php:199 reporting/reports_main.php:207
-#: reporting/reports_main.php:239 reporting/reports_main.php:250
-#: reporting/reports_main.php:261 reporting/reports_main.php:277
-#: reporting/reports_main.php:287 reporting/reports_main.php:298
-#: reporting/reports_main.php:310 reporting/reports_main.php:324
-#: reporting/reports_main.php:333 reporting/reports_main.php:343
-#: reporting/reports_main.php:354 reporting/reports_main.php:366
-#: reporting/reports_main.php:374 reporting/reports_main.php:383
-#: reporting/reports_main.php:391 reporting/reports_main.php:397
+#: reporting/rep102.php:127 reporting/rep202.php:134 reporting/rep203.php:94
+#: reporting/rep301.php:169 reporting/rep451.php:85
+#: reporting/reports_main.php:37 reporting/reports_main.php:46
+#: reporting/reports_main.php:67 reporting/reports_main.php:83
+#: reporting/reports_main.php:92 reporting/reports_main.php:154
+#: reporting/reports_main.php:163 reporting/reports_main.php:174
+#: reporting/reports_main.php:210 reporting/reports_main.php:236
+#: reporting/reports_main.php:246 reporting/reports_main.php:252
+#: reporting/reports_main.php:262 reporting/reports_main.php:270
+#: reporting/reports_main.php:278 reporting/reports_main.php:310
+#: reporting/reports_main.php:333 reporting/reports_main.php:341
+#: reporting/reports_main.php:353 reporting/reports_main.php:363
+#: reporting/reports_main.php:381 reporting/reports_main.php:392
+#: reporting/reports_main.php:404 reporting/reports_main.php:417
+#: reporting/reports_main.php:433 reporting/reports_main.php:443
+#: reporting/reports_main.php:454 reporting/reports_main.php:466
+#: reporting/reports_main.php:480 reporting/reports_main.php:489
+#: reporting/reports_main.php:499 reporting/reports_main.php:508
+#: reporting/reports_main.php:515
 msgid "End Date"
 msgstr ""
 
-#: reporting/rep102.php:135 reporting/rep202.php:138
-#: reporting/reports_main.php:45 reporting/reports_main.php:110
-#: reporting/reports_main.php:145
+#: reporting/rep102.php:131 reporting/rep202.php:138
+#: reporting/reports_main.php:49 reporting/reports_main.php:125
+#: reporting/reports_main.php:166
 msgid "Show Also Allocated"
 msgstr ""
 
-#: reporting/rep102.php:140
+#: reporting/rep102.php:136
 msgid "Aged Customer Analysis"
 msgstr ""
 
-#: reporting/rep103.php:115
+#: reporting/rep103.php:131
 msgid "All Areas"
 msgstr ""
 
-#: reporting/rep103.php:119
+#: reporting/rep103.php:135
 msgid "All Sales Folk"
 msgstr ""
 
-#: reporting/rep103.php:123
+#: reporting/rep103.php:139 reporting/rep205.php:80
 msgid "Greater than "
 msgstr ""
 
-#: reporting/rep103.php:127
+#: reporting/rep103.php:143 reporting/rep205.php:84
 msgid "Less than "
 msgstr ""
 
-#: reporting/rep103.php:136
+#: reporting/rep103.php:152
 msgid "Customer Postal Address"
 msgstr ""
 
-#: reporting/rep103.php:136
+#: reporting/rep103.php:152
 msgid "Price/Turnover"
 msgstr ""
 
-#: reporting/rep103.php:136
+#: reporting/rep103.php:152
 msgid "Branch Contact Information"
 msgstr ""
 
-#: reporting/rep103.php:137
+#: reporting/rep103.php:153
 msgid "Branch Delivery Address"
 msgstr ""
 
-#: reporting/rep103.php:142 reporting/reports_main.php:52
+#: reporting/rep103.php:158 reporting/rep205.php:99
+#: reporting/reports_main.php:57 reporting/reports_main.php:187
 msgid "Activity Since"
 msgstr ""
 
-#: reporting/rep103.php:143 reporting/reports_main.php:53
+#: reporting/rep103.php:159 reporting/reports_main.php:58
 #: sales/manage/sales_areas.php:16
 msgid "Sales Areas"
 msgstr ""
 
-#: reporting/rep103.php:144 reporting/reports_main.php:54
+#: reporting/rep103.php:160 reporting/reports_main.php:59
 msgid "Sales Folk"
 msgstr ""
 
-#: reporting/rep103.php:145
+#: reporting/rep103.php:161 reporting/rep205.php:100
 msgid "Activity"
 msgstr ""
 
-#: reporting/rep103.php:147
+#: reporting/rep103.php:163
 msgid "Customer Details Listing"
 msgstr ""
 
-#: reporting/rep103.php:175
+#: reporting/rep103.php:194
 msgid "Customers in"
 msgstr ""
 
-#: reporting/rep103.php:196 sales/includes/ui/sales_order_ui.inc:413
+#: reporting/rep103.php:215
 msgid "Price List"
 msgstr ""
 
-#: reporting/rep103.php:207
-msgid "Turnover"
+#: reporting/rep103.php:243 reporting/rep205.php:155
+msgid "Ph"
 msgstr ""
 
-#: reporting/rep103.php:216
-msgid "Ph"
+#: reporting/rep103.php:258
+msgid "Gereral Notes:"
+msgstr ""
+
+#: reporting/rep103.php:267 reporting/rep205.php:93 reporting/rep205.php:179
+msgid "Turnover"
 msgstr ""
 
 #: reporting/rep104.php:109
 msgid "Category/Items"
 msgstr ""
 
-#: reporting/rep104.php:109 reporting/rep301.php:100 reporting/rep303.php:109
-#: reporting/rep303.php:115
+#: reporting/rep104.php:109 reporting/rep301.php:164 reporting/rep303.php:120
+#: reporting/rep303.php:126 reporting/rep307.php:114 reporting/rep308.php:223
+#: reporting/rep451.php:80
 msgid "UOM"
 msgstr ""
 
@@ -10142,7 +11688,7 @@ msgstr ""
 msgid "GP %"
 msgstr ""
 
-#: reporting/rep104.php:117 reporting/reports_main.php:70
+#: reporting/rep104.php:117 reporting/reports_main.php:77
 msgid "Show GP %"
 msgstr ""
 
@@ -10150,165 +11696,222 @@ msgstr ""
 msgid "Price Listing"
 msgstr ""
 
-#: reporting/rep104.php:191
+#: reporting/rep104.php:193
 msgid "Sales Kits"
 msgstr ""
 
-#: reporting/rep105.php:101
+#: reporting/rep105.php:103
 msgid "All Orders"
 msgstr ""
 
-#: reporting/rep105.php:103 reporting/reports_main.php:78
+#: reporting/rep105.php:105 reporting/reports_main.php:86
 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:149
+#: sales/inquiry/customer_inquiry.php:195
 msgid "Order"
 msgstr ""
 
-#: reporting/rep105.php:107 reporting/rep106.php:81
-#: reporting/includes/doctext.inc:165 sales/create_recurrent_invoices.php:115
-#: sales/customer_credit_invoice.php:238 sales/customer_delivery.php:336
-#: sales/customer_invoice.php:375 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
-msgid "Branch"
-msgstr ""
-
-#: reporting/rep105.php:107 reporting/rep106.php:81
+#: reporting/rep105.php:109 reporting/rep106.php:89
 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:429
-#: sales/customer_invoice.php:448
-msgid "Invoiced"
+#: reporting/rep105.php:114 sales/customer_delivery.php:420
+#: sales/customer_invoice.php:521 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:82
+#: reporting/rep106.php:90
 msgid "Inv Date"
 msgstr ""
 
-#: reporting/rep106.php:82 reporting/rep106.php:86 reporting/rep106.php:87
+#: reporting/rep106.php:90 reporting/rep106.php:94 reporting/rep106.php:95
 #: 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:94
 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 sales/manage/sales_people.php:99
+#: reporting/rep106.php:95 sales/manage/sales_people.php:99
 msgid "Break Pt."
 msgstr ""
 
-#: reporting/rep106.php:96
+#: reporting/rep106.php:103
 msgid "Salesman Listing"
 msgstr ""
 
-#: reporting/rep107.php:66 reporting/rep107.php:91 reporting/rep107.php:96
-#: reporting/includes/doctext.inc:94
+#: reporting/rep107.php:88 reporting/rep107.php:114
+#: reporting/includes/doctext.inc:117
 msgid "INVOICE"
 msgstr ""
 
-#: reporting/rep108.php:84 reporting/rep108.php:115
-#: reporting/includes/doctext.inc:117
+#: reporting/rep107.php:197
+msgid "Prepayments invoiced to this order up to day:"
+msgstr ""
+
+#: reporting/rep107.php:204
+msgid "Invoice reference"
+msgstr ""
+
+#: reporting/rep107.php:221
+msgid "Total payments:"
+msgstr ""
+
+#: reporting/rep107.php:238 reporting/rep109.php:160 reporting/rep110.php:162
+#: reporting/rep111.php:157 reporting/rep113.php:151
+#: sales/view/view_credit.php:140 sales/view/view_dispatch.php:155
+#: sales/view/view_invoice.php:160 sales/view/view_sales_order.php:246
+#: sales/includes/ui/sales_credit_ui.inc:217
+msgid "Shipping"
+msgstr ""
+
+#: reporting/rep107.php:285 reporting/rep109.php:212 reporting/rep111.php:209
+msgid "TOTAL ORDER VAT INCL."
+msgstr ""
+
+#: reporting/rep107.php:291
+msgid "THIS INVOICE"
+msgstr ""
+
+#: reporting/rep108.php:81 reporting/rep108.php:109
+#: reporting/includes/doctext.inc:237
 msgid "STATEMENT"
 msgstr ""
 
-#: reporting/rep109.php:65 reporting/rep109.php:93 reporting/rep109.php:99
-#: reporting/includes/doctext.inc:92
+#: reporting/rep108.php:126
+msgid "Outstanding Transactions"
+msgstr ""
+
+#: reporting/rep108.php:170
+msgid "Statement"
+msgstr ""
+
+#: reporting/rep108.php:170
+msgid "as of"
+msgstr ""
+
+#: reporting/rep109.php:64 reporting/rep109.php:95 reporting/rep109.php:100
+#: reporting/includes/doctext.inc:64
 msgid "SALES ORDER"
 msgstr ""
 
-#: reporting/rep109.php:67 reporting/rep109.php:88 reporting/rep109.php:99
-#: reporting/includes/doctext.inc:92
+#: reporting/rep109.php:66 reporting/rep109.php:90 reporting/rep109.php:100
+#: reporting/includes/doctext.inc:64
 msgid "QUOTE"
 msgstr ""
 
+#: reporting/rep109.php:166 reporting/rep111.php:163
+msgid "TOTAL ORDER EX VAT"
+msgstr ""
+
 #: reporting/rep110.php:68
 msgid "DELIVERY"
 msgstr ""
 
-#: reporting/rep110.php:70 reporting/rep110.php:97
-#: reporting/includes/doctext.inc:90
+#: reporting/rep110.php:70 reporting/rep110.php:91
+#: reporting/includes/doctext.inc:81
 msgid "PACKING SLIP"
 msgstr ""
 
-#: reporting/rep110.php:92 reporting/rep110.php:103
-#: reporting/includes/doctext.inc:90
+#: reporting/rep110.php:86 reporting/includes/doctext.inc:81
 msgid "DELIVERY NOTE"
 msgstr ""
 
-#: reporting/rep111.php:61 reporting/rep111.php:86
-#: reporting/includes/doctext.inc:86
+#: reporting/rep110.php:207
+msgid "TOTAL DELIVERY INCL. VAT"
+msgstr ""
+
+#: reporting/rep111.php:64 reporting/includes/doctext.inc:49
 msgid "SALES QUOTATION"
 msgstr ""
 
-#: reporting/rep112.php:92 reporting/rep112.php:112
-#: reporting/includes/doctext.inc:100
+#: reporting/rep112.php:85 reporting/includes/doctext.inc:197
 msgid "RECEIPT"
 msgstr ""
 
-#: reporting/rep113.php:66 reporting/rep113.php:91 reporting/rep113.php:96
+#: reporting/rep112.php:119 reporting/rep210.php:127
+msgid "As advance / full / part / payment towards:"
+msgstr ""
+
+#: reporting/rep112.php:160
+msgid "TOTAL RECEIPT"
+msgstr ""
+
+#: reporting/rep112.php:171
+msgid "Received / Sign"
+msgstr ""
+
+#: reporting/rep112.php:173
+msgid "By Cash / Cheque* / Draft No."
+msgstr ""
+
+#: reporting/rep112.php:175
+msgid "Dated"
+msgstr ""
+
+#: reporting/rep112.php:178
+msgid "Drawn on Bank"
+msgstr ""
+
+#: reporting/rep113.php:67 reporting/rep113.php:89
 #: reporting/includes/doctext.inc:102
 msgid "CREDIT NOTE"
 msgstr ""
 
-#: reporting/rep114.php:85
+#: reporting/rep113.php:196 sales/view/view_credit.php:146
+msgid "TOTAL CREDIT"
+msgstr ""
+
+#: reporting/rep114.php:87
 msgid "Sales Summary Report"
 msgstr ""
 
-#: reporting/rep114.php:89 reporting/reports_main.php:62
+#: reporting/rep114.php:91 reporting/reports_main.php:68
 msgid "Tax Id Only"
 msgstr ""
 
-#: reporting/rep114.php:93
+#: reporting/rep114.php:95
 msgid "Tax Id"
 msgstr ""
 
-#: reporting/rep114.php:93
+#: reporting/rep114.php:95
 msgid "Total ex. Tax"
 msgstr ""
 
-#: reporting/rep114.php:93 reporting/rep709.php:110 taxes/tax_groups.php:177
+#: reporting/rep114.php:95 reporting/rep709.php:117 taxes/tax_groups.php:174
 msgid "Tax"
 msgstr ""
 
-#: reporting/rep201.php:108
+#: reporting/rep201.php:97
 msgid "Balances in Home currency"
 msgstr ""
 
-#: reporting/rep201.php:129
+#: reporting/rep201.php:120
 msgid "Supplier Balances"
 msgstr ""
 
@@ -10320,37 +11923,61 @@ msgstr ""
 msgid "Aged Supplier Analysis"
 msgstr ""
 
-#: reporting/rep203.php:102
+#: reporting/rep203.php:99
 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:88
+#: reporting/rep205.php:93
+msgid "Contact Information"
+msgstr ""
+
+#: reporting/rep205.php:94
+msgid "Physical Address"
+msgstr ""
+
+#: reporting/rep205.php:102
+msgid "Supplier Details Listing"
+msgstr ""
+
+#: reporting/rep205.php:130
+msgid "Tax_Id"
+msgstr ""
+
+#: reporting/rep209.php:88 reporting/rep209.php:104
+#: reporting/includes/doctext.inc:170
 msgid "PURCHASE ORDER"
 msgstr ""
 
-#: reporting/rep210.php:94 reporting/rep210.php:121 reporting/rep210.php:126
-#: reporting/includes/doctext.inc:98
+#: reporting/rep209.php:213
+msgid "TOTAL PO"
+msgstr ""
+
+#: reporting/rep210.php:86 reporting/rep210.php:111
+#: reporting/includes/doctext.inc:150
 msgid "REMITTANCE"
 msgstr ""
 
-#: reporting/rep301.php:108
+#: reporting/rep210.php:170
+msgid "TOTAL REMITTANCE"
+msgstr ""
+
+#: reporting/rep301.php:173
 msgid "Inventory Valuation Report"
 msgstr ""
 
@@ -10374,774 +12001,902 @@ msgstr ""
 msgid "Inventory Planning Report"
 msgstr ""
 
-#: reporting/rep303.php:97
+#: reporting/rep303.php:108
 msgid "Shortage"
 msgstr ""
 
-#: reporting/rep303.php:109 reporting/rep303.php:115 reporting/rep305.php:95
+#: reporting/rep303.php:120 reporting/rep303.php:126 reporting/rep305.php:106
 msgid "Stock ID"
 msgstr ""
 
-#: reporting/rep303.php:109
+#: reporting/rep303.php:120
 msgid "Check"
 msgstr ""
 
-#: reporting/rep303.php:123
+#: reporting/rep303.php:134
 msgid "Only Shortage"
 msgstr ""
 
-#: reporting/rep303.php:131
+#: reporting/rep303.php:137
 msgid "Stock Check Sheets"
 msgstr ""
 
-#: reporting/rep304.php:114 reporting/rep305.php:95
+#: reporting/rep304.php:127 reporting/rep305.php:106 reporting/rep306.php:141
+#: reporting/rep309.php:99
 msgid "Qty"
 msgstr ""
 
-#: reporting/rep304.php:114 sales/manage/customer_branches.php:240
-#: sales/manage/customers.php:224
-msgid "Sales"
-msgstr ""
-
-#: reporting/rep304.php:114
-msgid "Cost"
+#: reporting/rep304.php:127
+msgid "Contribution"
 msgstr ""
 
-#: reporting/rep304.php:114
-msgid "Contribution"
+#: reporting/rep304.php:138 reporting/reports_main.php:240
+msgid "Show Service Items"
 msgstr ""
 
-#: reporting/rep304.php:126
+#: reporting/rep304.php:140
 msgid "Inventory Sales Report"
 msgstr ""
 
-#: reporting/rep305.php:95
+#: reporting/rep305.php:106
 msgid "PO No"
 msgstr ""
 
-#: reporting/rep305.php:95
+#: reporting/rep305.php:106
 msgid "Inv"
 msgstr ""
 
-#: reporting/rep305.php:95
+#: reporting/rep305.php:106
 msgid "Inv Price"
 msgstr ""
 
-#: reporting/rep305.php:95
+#: reporting/rep305.php:106
 msgid "PO Price"
 msgstr ""
 
-#: reporting/rep305.php:102
+#: reporting/rep305.php:113
 msgid "GRN Valuation Report"
 msgstr ""
 
-#: reporting/rep401.php:69
+#: reporting/rep306.php:141 reporting/rep309.php:99
+msgid "Unit Price"
+msgstr ""
+
+#: reporting/rep306.php:154
+msgid "Inventory Purchasing Report"
+msgstr ""
+
+#: reporting/rep307.php:114
+msgid "Opening"
+msgstr ""
+
+#: reporting/rep307.php:123
+msgid "Inventory Movements"
+msgstr ""
+
+#: reporting/rep308.php:223
+msgid "OpeningStock"
+msgstr ""
+
+#: reporting/rep308.php:223
+msgid "StockIn"
+msgstr ""
+
+#: reporting/rep308.php:223
+msgid "ClosingStock"
+msgstr ""
+
+#: reporting/rep308.php:224
+msgid "QTY"
+msgstr ""
+
+#: reporting/rep308.php:224 reporting/rep709.php:117
+#: taxes/item_tax_types.php:185
+msgid "Rate"
+msgstr ""
+
+#: reporting/rep308.php:233
+msgid "Costed Inventory Movements"
+msgstr ""
+
+#: reporting/rep309.php:99
+msgid "Item/Category"
+msgstr ""
+
+#: reporting/rep309.php:99
+msgid "Remark"
+msgstr ""
+
+#: reporting/rep309.php:107
+msgid "Item Sales Summary Report"
+msgstr ""
+
+#: reporting/rep309.php:146
+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:96
+#: reporting/rep402.php:110
+msgid "Open Only"
+msgstr ""
+
+#: reporting/rep402.php:112
+msgid "Work Order Listing"
+msgstr ""
+
+#: reporting/rep409.php:59 reporting/rep409.php:71
+#: reporting/includes/doctext.inc:213
 msgid "WORK ORDER"
 msgstr ""
 
-#: reporting/rep409.php:134
-msgid "Insufficient stock"
+#: reporting/rep451.php:80
+msgid "Initial"
 msgstr ""
 
-#: reporting/rep409.php:147 reporting/includes/doctext.inc:138
-msgid "Work Order No."
+#: reporting/rep451.php:89
+msgid "Fixed Assets Valuation Report"
 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:72
+#: reporting/rep601.php:86 reporting/rep602.php:87
+#: reporting/includes/doctext.inc:259
 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:269 reporting/reports_main.php:317
-#: reporting/reports_main.php:360
+#: reporting/rep705.php:244 reporting/rep705.php:257 reporting/rep705.php:268
+#: reporting/reports_main.php:372 reporting/reports_main.php:425
+#: reporting/reports_main.php:473
 msgid "Year"
 msgstr ""
 
-#: reporting/rep705.php: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:250 reporting/rep705.php:261 reporting/rep705.php:270
+#: reporting/rep706.php:198 reporting/rep706.php:206 reporting/rep706.php:212
+#: reporting/rep707.php:222 reporting/rep707.php:230 reporting/rep707.php:236
 msgid "Tags"
 msgstr ""
 
-#: reporting/rep705.php:250 reporting/rep705.php:261 reporting/rep705.php:270
+#: reporting/rep705.php:251 reporting/rep705.php:262 reporting/rep705.php:271
 msgid "Amounts in thousands"
 msgstr ""
 
-#: reporting/rep705.php:274
+#: reporting/rep705.php:275
 msgid "Annual Expense Breakdown"
 msgstr ""
 
-#: reporting/rep706.php:182
+#: reporting/rep706.php:186
 msgid "Close Balance"
 msgstr ""
 
-#: reporting/rep707.php:254
+#: reporting/rep707.php:260
 msgid "Profit and Loss Statement"
 msgstr ""
 
-#: reporting/rep709.php:91
+#: reporting/rep709.php:98
 msgid "Tax Report"
 msgstr ""
 
-#: reporting/rep709.php:109
+#: reporting/rep709.php:116
 msgid "Branch Name"
 msgstr ""
 
-#: reporting/rep709.php:110
+#: reporting/rep709.php:117
 msgid "Net"
 msgstr ""
 
-#: reporting/rep709.php:110 taxes/item_tax_types.php:185
-msgid "Rate"
-msgstr ""
-
-#: reporting/rep709.php:172
+#: reporting/rep709.php:189
 msgid "Tax Rate"
 msgstr ""
 
-#: reporting/rep709.php:172
+#: reporting/rep709.php:189
 msgid "Net Tax"
 msgstr ""
 
-#: reporting/rep710.php:75
+#: reporting/rep709.php:207
+msgid "Exempt"
+msgstr ""
+
+#: 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:395
+#: reporting/rep710.php:89 reporting/reports_main.php:513
 msgid "Audit Trail"
 msgstr ""
 
-#: reporting/rep710.php:107
+#: reporting/rep710.php:111
 msgid "Changed"
 msgstr ""
 
-#: reporting/reports_main.php:26
+#: reporting/reports_main.php:28
 msgid "Reports and Analysis"
 msgstr ""
 
-#: reporting/reports_main.php:33
-msgid "Customer &Balances"
+#: reporting/reports_main.php:35
+msgid "Customer &Balances"
+msgstr ""
+
+#: reporting/reports_main.php:39 reporting/reports_main.php:156
+#: reporting/reports_main.php:324
+msgid "Show Balance"
 msgstr ""
 
-#: reporting/reports_main.php:37 reporting/reports_main.php:44
-#: reporting/reports_main.php:66 reporting/reports_main.php:90
-#: reporting/reports_main.php:97 reporting/reports_main.php:109
-#: reporting/reports_main.php:116 reporting/reports_main.php:123
-#: reporting/reports_main.php:129 reporting/reports_main.php:137
-#: reporting/reports_main.php:144 reporting/reports_main.php:154
-#: reporting/reports_main.php:165 reporting/reports_main.php:171
+#: reporting/reports_main.php:40 reporting/reports_main.php:48
+#: reporting/reports_main.php:73 reporting/reports_main.php:100
+#: reporting/reports_main.php:110 reporting/reports_main.php:124
+#: reporting/reports_main.php:132 reporting/reports_main.php:140
+#: reporting/reports_main.php:147 reporting/reports_main.php:157
+#: reporting/reports_main.php:165 reporting/reports_main.php:176
+#: reporting/reports_main.php:196 reporting/reports_main.php:203
 msgid "Currency Filter"
 msgstr ""
 
-#: reporting/reports_main.php:40 reporting/reports_main.php:50
-#: reporting/reports_main.php:58 reporting/reports_main.php:64
-#: reporting/reports_main.php:72 reporting/reports_main.php:80
-#: reporting/reports_main.php:86 reporting/reports_main.php:140
-#: reporting/reports_main.php:150 reporting/reports_main.php:157
-#: reporting/reports_main.php:161 reporting/reports_main.php:182
-#: reporting/reports_main.php:187 reporting/reports_main.php:196
-#: reporting/reports_main.php:204 reporting/reports_main.php:209
-#: reporting/reports_main.php:216 reporting/reports_main.php:230
-#: reporting/reports_main.php:241 reporting/reports_main.php:247
-#: reporting/reports_main.php:253 reporting/reports_main.php:267
-#: reporting/reports_main.php:274 reporting/reports_main.php:284
-#: reporting/reports_main.php:295 reporting/reports_main.php:304
-#: reporting/reports_main.php:315 reporting/reports_main.php:321
-#: reporting/reports_main.php:330 reporting/reports_main.php:340
-#: reporting/reports_main.php:348 reporting/reports_main.php:358
-#: reporting/reports_main.php:363 reporting/reports_main.php:371
-#: reporting/reports_main.php:380 reporting/reports_main.php:387
-#: reporting/reports_main.php:394 reporting/reports_main.php:401
+#: reporting/reports_main.php:43 reporting/reports_main.php:54
+#: reporting/reports_main.php:63 reporting/reports_main.php:70
+#: reporting/reports_main.php:79 reporting/reports_main.php:88
+#: reporting/reports_main.php:95 reporting/reports_main.php:105
+#: reporting/reports_main.php:114 reporting/reports_main.php:121
+#: reporting/reports_main.php:128 reporting/reports_main.php:136
+#: reporting/reports_main.php:143 reporting/reports_main.php:149
+#: reporting/reports_main.php:160 reporting/reports_main.php:171
+#: reporting/reports_main.php:179 reporting/reports_main.php:184
+#: reporting/reports_main.php:191 reporting/reports_main.php:199
+#: reporting/reports_main.php:206 reporting/reports_main.php:215
+#: reporting/reports_main.php:221 reporting/reports_main.php:232
+#: reporting/reports_main.php:242 reporting/reports_main.php:248
+#: reporting/reports_main.php:258 reporting/reports_main.php:266
+#: reporting/reports_main.php:274 reporting/reports_main.php:281
+#: reporting/reports_main.php:290 reporting/reports_main.php:297
+#: reporting/reports_main.php:304 reporting/reports_main.php:315
+#: reporting/reports_main.php:326 reporting/reports_main.php:336
+#: reporting/reports_main.php:349 reporting/reports_main.php:356
+#: reporting/reports_main.php:369 reporting/reports_main.php:377
+#: reporting/reports_main.php:388 reporting/reports_main.php:400
+#: reporting/reports_main.php:410 reporting/reports_main.php:422
+#: reporting/reports_main.php:429 reporting/reports_main.php:439
+#: reporting/reports_main.php:450 reporting/reports_main.php:459
+#: reporting/reports_main.php:470 reporting/reports_main.php:476
+#: reporting/reports_main.php:485 reporting/reports_main.php:495
+#: reporting/reports_main.php:503 reporting/reports_main.php:511
+#: reporting/reports_main.php:519
+msgid "Orientation"
+msgstr ""
+
+#: reporting/reports_main.php:44 reporting/reports_main.php:55
+#: reporting/reports_main.php:64 reporting/reports_main.php:71
+#: reporting/reports_main.php:80 reporting/reports_main.php:89
+#: reporting/reports_main.php:96 reporting/reports_main.php:161
+#: reporting/reports_main.php:172 reporting/reports_main.php:180
+#: reporting/reports_main.php:185 reporting/reports_main.php:192
+#: reporting/reports_main.php:216 reporting/reports_main.php:222
+#: reporting/reports_main.php:233 reporting/reports_main.php:243
+#: reporting/reports_main.php:249 reporting/reports_main.php:259
+#: reporting/reports_main.php:267 reporting/reports_main.php:275
+#: reporting/reports_main.php:282 reporting/reports_main.php:291
+#: reporting/reports_main.php:298 reporting/reports_main.php:316
+#: reporting/reports_main.php:327 reporting/reports_main.php:337
+#: reporting/reports_main.php:343 reporting/reports_main.php:350
+#: reporting/reports_main.php:357 reporting/reports_main.php:370
+#: reporting/reports_main.php:378 reporting/reports_main.php:389
+#: reporting/reports_main.php:401 reporting/reports_main.php:411
+#: reporting/reports_main.php:423 reporting/reports_main.php:430
+#: reporting/reports_main.php:440 reporting/reports_main.php:451
+#: reporting/reports_main.php:460 reporting/reports_main.php:471
+#: reporting/reports_main.php:477 reporting/reports_main.php:486
+#: reporting/reports_main.php:496 reporting/reports_main.php:504
+#: reporting/reports_main.php:512 reporting/reports_main.php:520
 msgid "Destination"
 msgstr ""
 
-#: reporting/reports_main.php:41
+#: reporting/reports_main.php:45
 msgid "&Aged Customer Analysis"
 msgstr ""
 
-#: reporting/reports_main.php:48 reporting/reports_main.php:148
-#: reporting/reports_main.php:282 reporting/reports_main.php:293
-#: reporting/reports_main.php:328 reporting/reports_main.php:338
-#: reporting/reports_main.php:369 reporting/reports_main.php:378
+#: reporting/reports_main.php:52 reporting/reports_main.php:169
+#: reporting/reports_main.php:386 reporting/reports_main.php:398
+#: reporting/reports_main.php:437 reporting/reports_main.php:448
+#: reporting/reports_main.php:483 reporting/reports_main.php:493
 msgid "Graphics"
 msgstr ""
 
-#: reporting/reports_main.php:51
+#: reporting/reports_main.php:56
 msgid "Customer &Detail Listing"
 msgstr ""
 
-#: reporting/reports_main.php:55
+#: reporting/reports_main.php:60 reporting/reports_main.php:188
 msgid "Activity Greater Than"
 msgstr ""
 
-#: reporting/reports_main.php:56
+#: reporting/reports_main.php:61 reporting/reports_main.php:189
 msgid "Activity Less Than"
 msgstr ""
 
-#: reporting/reports_main.php:59
+#: reporting/reports_main.php:65
 msgid "Sales &Summary Report"
 msgstr ""
 
-#: reporting/reports_main.php:65
+#: reporting/reports_main.php:72
 msgid "&Price Listing"
 msgstr ""
 
-#: reporting/reports_main.php:67 reporting/reports_main.php:76
-#: reporting/reports_main.php:178 reporting/reports_main.php:184
-#: reporting/reports_main.php:189 reporting/reports_main.php:200
+#: reporting/reports_main.php:74 reporting/reports_main.php:84
+#: reporting/reports_main.php:211 reporting/reports_main.php:218
+#: reporting/reports_main.php:224 reporting/reports_main.php:237
+#: reporting/reports_main.php:253 reporting/reports_main.php:263
+#: reporting/reports_main.php:271 reporting/reports_main.php:279
 msgid "Inventory Category"
 msgstr ""
 
-#: reporting/reports_main.php:68 sales/manage/sales_types.php:16
+#: reporting/reports_main.php:75 sales/manage/sales_types.php:16
 msgid "Sales Types"
 msgstr ""
 
-#: reporting/reports_main.php:69 reporting/reports_main.php:191
+#: reporting/reports_main.php:76 reporting/reports_main.php:226
 msgid "Show Pictures"
 msgstr ""
 
-#: reporting/reports_main.php:73
+#: reporting/reports_main.php:81
 msgid "&Order Status Listing"
 msgstr ""
 
-#: reporting/reports_main.php:77
+#: reporting/reports_main.php:85
 msgid "Stock Location"
 msgstr ""
 
-#: reporting/reports_main.php:81
+#: reporting/reports_main.php:90
 msgid "&Salesman Listing"
 msgstr ""
 
-#: reporting/reports_main.php:87
+#: reporting/reports_main.php:97
 msgid "Print &Invoices"
 msgstr ""
 
-#: reporting/reports_main.php:91 reporting/reports_main.php:98
-#: reporting/reports_main.php:104
+#: reporting/reports_main.php:101 reporting/reports_main.php:111
+#: reporting/reports_main.php:118
 msgid "email Customers"
 msgstr ""
 
-#: reporting/reports_main.php:92 reporting/reports_main.php:99
+#: reporting/reports_main.php:102 reporting/reports_main.php:112
 msgid "Payment Link"
 msgstr ""
 
-#: reporting/reports_main.php:94
+#: reporting/reports_main.php:107
 msgid "Print &Credit Notes"
 msgstr ""
 
-#: reporting/reports_main.php:101
+#: reporting/reports_main.php:115
 msgid "Print &Deliveries"
 msgstr ""
 
-#: reporting/reports_main.php:105
+#: reporting/reports_main.php:119
 msgid "Print as Packing Slip"
 msgstr ""
 
-#: reporting/reports_main.php:107
+#: reporting/reports_main.php:122
 msgid "Print &Statements"
 msgstr ""
 
-#: reporting/reports_main.php:111 reporting/reports_main.php:117
-#: reporting/reports_main.php:124 reporting/reports_main.php:166
-#: reporting/reports_main.php:172
+#: reporting/reports_main.php:126 reporting/reports_main.php:133
+#: reporting/reports_main.php:141
 msgid "Email Customers"
 msgstr ""
 
-#: reporting/reports_main.php:113
+#: reporting/reports_main.php:129
 msgid "&Print Sales Orders"
 msgstr ""
 
-#: reporting/reports_main.php:118
+#: reporting/reports_main.php:134
 msgid "Print as Quote"
 msgstr ""
 
-#: reporting/reports_main.php:120
+#: reporting/reports_main.php:137
 msgid "&Print Sales Quotations"
 msgstr ""
 
-#: reporting/reports_main.php:126
+#: reporting/reports_main.php:144
 msgid "Print Receipts"
 msgstr ""
 
-#: reporting/reports_main.php:133
+#: reporting/reports_main.php:152
 msgid "Supplier &Balances"
 msgstr ""
 
-#: reporting/reports_main.php:141
+#: reporting/reports_main.php:162
 msgid "&Aged Supplier Analyses"
 msgstr ""
 
-#: reporting/reports_main.php:151
+#: reporting/reports_main.php:173
 msgid "&Payment Report"
 msgstr ""
 
-#: reporting/reports_main.php:158
+#: reporting/reports_main.php:181
 msgid "Outstanding &GRNs Report"
 msgstr ""
 
-#: reporting/reports_main.php:162
+#: reporting/reports_main.php:186
+msgid "Supplier &Detail Listing"
+msgstr ""
+
+#: reporting/reports_main.php:193
 msgid "Print Purchase &Orders"
 msgstr ""
 
-#: reporting/reports_main.php:168
-msgid "Print Remittances"
+#: reporting/reports_main.php:197 reporting/reports_main.php:204
+msgid "Email Suppliers"
 msgstr ""
 
-#: reporting/reports_main.php:177
+#: reporting/reports_main.php:200
+msgid "Print Remi&ttances"
+msgstr ""
+
+#: reporting/reports_main.php:209
 msgid "Inventory &Valuation Report"
 msgstr ""
 
-#: reporting/reports_main.php:183
+#: reporting/reports_main.php:217
 msgid "Inventory &Planning Report"
 msgstr ""
 
-#: reporting/reports_main.php:188
+#: reporting/reports_main.php:223
 msgid "Stock &Check Sheets"
 msgstr ""
 
-#: reporting/reports_main.php:192
+#: reporting/reports_main.php:227
 msgid "Inventory Column"
 msgstr ""
 
-#: reporting/reports_main.php:193
+#: reporting/reports_main.php:228
 msgid "Show Shortage"
 msgstr ""
 
-#: reporting/reports_main.php:197
+#: reporting/reports_main.php:230
+msgid "Item Like"
+msgstr ""
+
+#: reporting/reports_main.php:234
 msgid "Inventory &Sales Report"
 msgstr ""
 
-#: reporting/reports_main.php:205
+#: reporting/reports_main.php:244
 msgid "&GRN Valuation Report"
 msgstr ""
 
-#: reporting/reports_main.php:211
-msgid "Manufacturing"
+#: reporting/reports_main.php:250
+msgid "Inventory P&urchasing Report"
+msgstr ""
+
+#: reporting/reports_main.php:260
+msgid "Inventory &Movement Report"
 msgstr ""
 
-#: reporting/reports_main.php:212
+#: reporting/reports_main.php:268
+msgid "C&osted Inventory Movement Report"
+msgstr ""
+
+#: reporting/reports_main.php:276
+msgid "Item &Sales Summary Report"
+msgstr ""
+
+#: reporting/reports_main.php:286
 msgid "&Bill of Material Listing"
 msgstr ""
 
-#: reporting/reports_main.php:213
+#: reporting/reports_main.php:287
 msgid "From product"
 msgstr ""
 
-#: reporting/reports_main.php:214
+#: reporting/reports_main.php:288
 msgid "To product"
 msgstr ""
 
-#: reporting/reports_main.php:217
+#: reporting/reports_main.php:292
+msgid "Work Order &Listing"
+msgstr ""
+
+#: reporting/reports_main.php:295
+msgid "Outstanding Only"
+msgstr ""
+
+#: reporting/reports_main.php:299
 msgid "Print &Work Orders"
 msgstr ""
 
-#: reporting/reports_main.php:220
+#: reporting/reports_main.php:302
 msgid "Email Locations"
 msgstr ""
 
-#: reporting/reports_main.php:225
+#: reporting/reports_main.php:309
+msgid "&Fixed Assets Valuation"
+msgstr ""
+
+#: reporting/reports_main.php:311
+msgid "Fixed Assets Class"
+msgstr ""
+
+#: reporting/reports_main.php:312
+msgid "Fixed Assets Location"
+msgstr ""
+
+#: reporting/reports_main.php:321
 msgid "Dimension &Summary"
 msgstr ""
 
-#: reporting/reports_main.php:226
+#: reporting/reports_main.php:322
 msgid "From Dimension"
 msgstr ""
 
-#: reporting/reports_main.php:227
+#: reporting/reports_main.php:323
 msgid "To Dimension"
 msgstr ""
 
-#: reporting/reports_main.php:228
-msgid "Show Balance"
-msgstr ""
-
-#: reporting/reports_main.php:235
+#: reporting/reports_main.php:329
 msgid "Banking"
 msgstr ""
 
-#: reporting/reports_main.php:236
+#: reporting/reports_main.php:330
 msgid "Bank &Statement"
 msgstr ""
 
-#: reporting/reports_main.php:243
+#: reporting/reports_main.php:334 reporting/reports_main.php:405
+#: reporting/reports_main.php:455 reporting/reports_main.php:500
+msgid "Zero values"
+msgstr ""
+
+#: reporting/reports_main.php:338
+msgid "Bank Statement w/ &Reconcile"
+msgstr ""
+
+#: reporting/reports_main.php:345
 msgid "General Ledger"
 msgstr ""
 
-#: reporting/reports_main.php:244
+#: reporting/reports_main.php:346
 msgid "Chart of &Accounts"
 msgstr ""
 
-#: reporting/reports_main.php:245
+#: reporting/reports_main.php:347
 msgid "Show Balances"
 msgstr ""
 
-#: reporting/reports_main.php:248
+#: reporting/reports_main.php:351
 msgid "List of &Journal Entries"
 msgstr ""
 
-#: reporting/reports_main.php:259 reporting/reports_main.php:308
-#: reporting/reports_main.php:352
+#: reporting/reports_main.php:361 reporting/reports_main.php:415
+#: reporting/reports_main.php:464
 msgid "GL Account &Transactions"
 msgstr ""
 
-#: reporting/reports_main.php:262 reporting/reports_main.php:311
-#: reporting/reports_main.php:355
+#: reporting/reports_main.php:364 reporting/reports_main.php:418
+#: reporting/reports_main.php:467
 msgid "From Account"
 msgstr ""
 
-#: reporting/reports_main.php:263 reporting/reports_main.php:312
-#: reporting/reports_main.php:356
+#: reporting/reports_main.php:365 reporting/reports_main.php:419
+#: reporting/reports_main.php:468
 msgid "To Account"
 msgstr ""
 
-#: reporting/reports_main.php:268 reporting/reports_main.php:316
-#: reporting/reports_main.php:359
+#: reporting/reports_main.php:371 reporting/reports_main.php:424
+#: reporting/reports_main.php:472
 msgid "Annual &Expense Breakdown"
 msgstr ""
 
-#: reporting/reports_main.php:275 reporting/reports_main.php:322
-#: reporting/reports_main.php:364
+#: reporting/reports_main.php:379 reporting/reports_main.php:431
+#: reporting/reports_main.php:478
 msgid "&Balance Sheet"
 msgstr ""
 
-#: reporting/reports_main.php:281 reporting/reports_main.php:292
-#: reporting/reports_main.php:327 reporting/reports_main.php:337
-#: reporting/reports_main.php:368 reporting/reports_main.php:377
+#: reporting/reports_main.php:385 reporting/reports_main.php:397
+#: reporting/reports_main.php:436 reporting/reports_main.php:447
+#: reporting/reports_main.php:482 reporting/reports_main.php:492
 msgid "Decimal values"
 msgstr ""
 
-#: reporting/reports_main.php:285 reporting/reports_main.php:331
-#: reporting/reports_main.php:372
+#: reporting/reports_main.php:390 reporting/reports_main.php:441
+#: reporting/reports_main.php:487
 msgid "&Profit and Loss Statement"
 msgstr ""
 
-#: reporting/reports_main.php:299 reporting/reports_main.php:344
-#: reporting/reports_main.php:384
-msgid "Zero values"
-msgstr ""
-
-#: reporting/reports_main.php:389
+#: reporting/reports_main.php:506
 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
-#: sales/view/view_dispatch.php:51 sales/view/view_invoice.php:51
+#: reporting/includes/doctext.inc:20 reporting/includes/doctext.inc:155
+#: sales/view/view_dispatch.php:51 sales/view/view_invoice.php:53
 msgid "Charge To"
 msgstr ""
 
-#: reporting/includes/doctext.inc:27
-msgid "With thanks from"
-msgstr ""
-
-#: reporting/includes/doctext.inc:30 sales/view/view_dispatch.php:74
+#: reporting/includes/doctext.inc:25 sales/view/view_dispatch.php:74
 msgid "Delivered To"
 msgstr ""
 
-#: reporting/includes/doctext.inc:34 sales/view/view_sales_order.php:69
-#: sales/inquiry/sales_orders_view.php:273
-#: sales/includes/ui/sales_order_ui.inc:605
-msgid "Valid until"
-msgstr ""
-
-#: reporting/includes/doctext.inc:38
-msgid "To Be Invoiced Before"
-msgstr ""
-
-#: reporting/includes/doctext.inc:41
-msgid "Your Ref"
-msgstr ""
-
-#: reporting/includes/doctext.inc:56 sales/manage/customer_branches.php:296
-msgid "Sales Person"
-msgstr ""
-
-#: reporting/includes/doctext.inc:57
-msgid "Your VAT no."
-msgstr ""
-
-#: reporting/includes/doctext.inc:59
-msgid "Customers Reference"
-msgstr ""
-
-#: reporting/includes/doctext.inc:60 sales/view/view_dispatch.php:87
-#: sales/view/view_invoice.php:86
-msgid "Our Order No"
-msgstr ""
-
-#: reporting/includes/doctext.inc:62
-msgid "Our VAT No."
-msgstr ""
-
-#: reporting/includes/doctext.inc:63
-msgid "Domicile"
-msgstr ""
-
-#: reporting/includes/doctext.inc:68
-msgid "* Subject to Realisation of the Cheque."
+#: reporting/includes/doctext.inc:32 sales/customer_credit_invoice.php:276
+#: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113
+#: sales/view/view_invoice.php:116 sales/includes/ui/sales_credit_ui.inc:163
+#: sales/includes/ui/sales_order_ui.inc:148
+msgid "Discount %"
 msgstr ""
 
-#: reporting/includes/doctext.inc:70
+#: reporting/includes/doctext.inc:35
 msgid "All amounts stated in"
 msgstr ""
 
-#: reporting/includes/doctext.inc:74
-msgid "Please quote Invoice no. when paying. All amounts stated in"
+#: reporting/includes/doctext.inc:50
+msgid "Quotation No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:75
-msgid "Please quote Credit no. when paying. All amounts stated in"
+#: reporting/includes/doctext.inc:55 reporting/includes/doctext.inc:72
+#: reporting/includes/doctext.inc:93 reporting/includes/doctext.inc:107
+#: reporting/includes/doctext.inc:130 reporting/includes/doctext.inc:160
+#: reporting/includes/doctext.inc:183 reporting/includes/doctext.inc:201
+#: reporting/includes/doctext.inc:239
+msgid "Customer's Reference"
 msgstr ""
 
-#: reporting/includes/doctext.inc:78
-msgid "Phone/Fax/Email"
+#: reporting/includes/doctext.inc:56 reporting/includes/doctext.inc:73
+#: reporting/includes/doctext.inc:94 reporting/includes/doctext.inc:108
+#: reporting/includes/doctext.inc:131 reporting/includes/doctext.inc:184
+#: reporting/includes/doctext.inc:240 sales/manage/customer_branches.php:286
+msgid "Sales Person"
 msgstr ""
 
-#: reporting/includes/doctext.inc:80 reporting/includes/doctext.inc:127
-msgid "You can pay through"
+#: reporting/includes/doctext.inc:57 reporting/includes/doctext.inc:74
+#: reporting/includes/doctext.inc:95 reporting/includes/doctext.inc:109
+#: reporting/includes/doctext.inc:132 reporting/includes/doctext.inc:162
+#: reporting/includes/doctext.inc:185 reporting/includes/doctext.inc:203
+#: reporting/includes/doctext.inc:241
+msgid "Your VAT no."
 msgstr ""
 
-#: reporting/includes/doctext.inc:113 sales/customer_credit_invoice.php:283
-#: 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:58
+msgid "Our Quotation No"
 msgstr ""
 
-#: reporting/includes/doctext.inc:118
-msgid "DueDate"
+#: reporting/includes/doctext.inc:59 sales/view/view_sales_order.php:69
+#: sales/inquiry/sales_orders_view.php:272
+#: sales/includes/ui/sales_order_ui.inc:598
+msgid "Valid until"
 msgstr ""
 
-#: reporting/includes/doctext.inc:124
-msgid "Dear"
+#: reporting/includes/doctext.inc:64
+msgid "PREPAYMENT ORDER"
 msgstr ""
 
-#: reporting/includes/doctext.inc:125
-msgid "Attached you will find "
+#: reporting/includes/doctext.inc:65
+msgid "Order No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:126
-msgid "Kindest regards"
+#: reporting/includes/doctext.inc:75 reporting/includes/doctext.inc:96
+#: reporting/includes/doctext.inc:110 reporting/includes/doctext.inc:137
+#: reporting/includes/doctext.inc:204 reporting/includes/doctext.inc:242
+#: sales/view/view_dispatch.php:87 sales/view/view_invoice.php:87
+msgid "Our Order No"
 msgstr ""
 
-#: reporting/includes/doctext.inc:131 reporting/includes/doctext.inc:140
+#: reporting/includes/doctext.inc:82
 msgid "Delivery Note No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:132
-msgid "Receipt No."
+#: reporting/includes/doctext.inc:97
+msgid "To Be Invoiced Before"
 msgstr ""
 
-#: reporting/includes/doctext.inc:133
-msgid "Remittance No."
+#: reporting/includes/doctext.inc:103
+msgid "Credit No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:134
-msgid "Purchase Order No."
+#: reporting/includes/doctext.inc:104
+msgid "Please quote Credit no. when paying. All amounts stated in"
 msgstr ""
 
-#: reporting/includes/doctext.inc:135 reporting/includes/doctext.inc:141
-msgid "Order No."
+#: reporting/includes/doctext.inc:116
+msgid "PREPAYMENT INVOICE"
 msgstr ""
 
-#: reporting/includes/doctext.inc:136
-msgid "Quotation No."
+#: reporting/includes/doctext.inc:117
+msgid "FINAL INVOICE"
 msgstr ""
 
-#: reporting/includes/doctext.inc:137
+#: reporting/includes/doctext.inc:118
 msgid "Invoice No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:138
-msgid "Credit No."
-msgstr ""
-
-#: reporting/includes/doctext.inc:150 sales/view/view_credit.php:138
-#: sales/view/view_dispatch.php:155 sales/view/view_invoice.php:157
-#: sales/view/view_sales_order.php:227
-#: sales/includes/ui/sales_credit_ui.inc:222
-msgid "Shipping"
-msgstr ""
-
-#: reporting/includes/doctext.inc:153 sales/view/view_credit.php:143
-msgid "TOTAL CREDIT"
-msgstr ""
-
-#: reporting/includes/doctext.inc:154
-msgid "TOTAL ORDER EX VAT"
-msgstr ""
-
-#: reporting/includes/doctext.inc:155
-msgid "TOTAL ORDER VAT INCL."
+#: reporting/includes/doctext.inc:120
+msgid "Please quote Invoice no. when paying. All amounts stated in"
 msgstr ""
 
-#: reporting/includes/doctext.inc:156
-msgid "TOTAL PO"
+#: reporting/includes/doctext.inc:136
+msgid "Date of Payment"
 msgstr ""
 
-#: reporting/includes/doctext.inc:157
-msgid "TOTAL DELIVERY INCL. VAT"
+#: reporting/includes/doctext.inc:142
+msgid "Date of Sale"
 msgstr ""
 
-#: reporting/includes/doctext.inc:161
-msgid "As advance / full / part / payment towards:"
+#: reporting/includes/doctext.inc:151
+msgid "Remittance No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:162
-msgid "By Cash / Cheque* / Draft No."
+#: reporting/includes/doctext.inc:152 reporting/includes/doctext.inc:172
+msgid "Order To"
 msgstr ""
 
-#: reporting/includes/doctext.inc:163
-msgid "Dated"
+#: reporting/includes/doctext.inc:171
+msgid "Purchase Order No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:164
-msgid "Drawn on Bank"
+#: reporting/includes/doctext.inc:175
+msgid "Deliver To"
 msgstr ""
 
-#: reporting/includes/doctext.inc:166
-msgid "Received / Sign"
+#: reporting/includes/doctext.inc:198
+msgid "Receipt No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:170
-msgid "TOTAL RECEIPT"
+#: reporting/includes/doctext.inc:199
+msgid "With thanks from"
 msgstr ""
 
-#: reporting/includes/doctext.inc:172
-msgid "TOTAL REMITTANCE"
+#: reporting/includes/doctext.inc:214
+msgid "Work Order No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:176
-msgid "Outstanding Transactions"
+#: reporting/includes/doctext.inc:245
+msgid "DueDate"
 msgstr ""
 
-#: reporting/includes/doctext.inc:179
-msgid "Statement"
+#: reporting/includes/doctext.inc:271 reporting/includes/pdf_report.inc:1017
+msgid "You can pay through"
 msgstr ""
 
-#: reporting/includes/doctext.inc:180
-msgid "as of"
+#: reporting/includes/doctext.inc:275
+msgid "* Subject to Realisation of the Cheque."
 msgstr ""
 
-#: reporting/includes/excel_report.inc:67 reporting/includes/pdf_report.inc:80
+#: reporting/includes/excel_report.inc:69 reporting/includes/pdf_report.inc:81
 msgid ""
 "The security settings on your account do not permit you to print this report"
 msgstr ""
 
-#: reporting/includes/excel_report.inc:262
-#: reporting/includes/pdf_report.inc:316
+#: reporting/includes/excel_report.inc:259
+#: reporting/includes/pdf_report.inc:328
 msgid "Print Out Date"
 msgstr ""
 
-#: reporting/includes/excel_report.inc:268
-#: reporting/includes/pdf_report.inc:325
+#: reporting/includes/excel_report.inc:265
+#: reporting/includes/pdf_report.inc:337
 msgid "Fiscal Year"
 msgstr ""
 
-#: reporting/includes/excel_report.inc:396
+#: reporting/includes/excel_report.inc:393
 msgid "Report Date"
 msgstr ""
 
-#: reporting/includes/excel_report.inc:413
-#: reporting/includes/pdf_report.inc:599
+#: reporting/includes/excel_report.inc:410
+#: reporting/includes/pdf_report.inc:601
 msgid "Generated At"
 msgstr ""
 
-#: reporting/includes/excel_report.inc:419
-#: reporting/includes/pdf_report.inc:608
+#: reporting/includes/excel_report.inc:416
+#: reporting/includes/pdf_report.inc:610
 msgid "Generated By"
 msgstr ""
 
-#: reporting/includes/header2.inc:150 reporting/includes/pdf_report.inc:352
-#: reporting/includes/pdf_report.inc:499 reporting/includes/pdf_report.inc:627
+#: reporting/includes/header2.inc:124
+msgid "Our VAT No."
+msgstr ""
+
+#: reporting/includes/header2.inc:130
+msgid "Domicile"
+msgstr ""
+
+#: reporting/includes/header2.inc:146 reporting/includes/pdf_report.inc:364
+#: reporting/includes/pdf_report.inc:502 reporting/includes/pdf_report.inc:629
 msgid "Page"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:582
+#: reporting/includes/pdf_report.inc:584
 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:984
+#: reporting/includes/pdf_report.inc:1032
+#, php-format
+msgid "You have no email contact defined for this type of document for '%s'."
+msgstr ""
+
+#: reporting/includes/pdf_report.inc:1003
+msgid "Dear"
+msgstr ""
+
+#: reporting/includes/pdf_report.inc:1004
+msgid "Attached you will find "
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1022
-msgid "There is no contact email set for this document type."
+#: reporting/includes/pdf_report.inc:1020
+msgid "Kindest regards"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1024
+#: reporting/includes/pdf_report.inc:1035
 msgid "Sending document by email failed"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1027
+#: reporting/includes/pdf_report.inc:1035
+#: reporting/includes/pdf_report.inc:1038
+msgid "Email:"
+msgstr ""
+
+#: reporting/includes/pdf_report.inc:1038
 msgid "has been sent by email to destination."
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1057
+#: reporting/includes/pdf_report.inc:1067
 msgid "Report has been sent to network printer "
 msgstr ""
 
@@ -11173,155 +12928,196 @@ msgstr ""
 msgid "Cannot flush printing queue"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:61
+#: reporting/includes/reports_classes.inc:62
 msgid "Report Classes:"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:81
+#: reporting/includes/reports_classes.inc:82
 msgid "Reports For Class: "
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:101
+#: reporting/includes/reports_classes.inc:102
 msgid "Display: "
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:149
+#: reporting/includes/reports_classes.inc:153
 msgid "Unknown report parameter type:"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:175
+#: reporting/includes/reports_classes.inc:179
 msgid "No Currency Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:224
-msgid "No payment Link"
-msgstr ""
-
-#: reporting/includes/reports_classes.inc:228
-msgid "PDF/Printer"
-msgstr ""
-
-#: reporting/includes/reports_classes.inc:239
+#: reporting/includes/reports_classes.inc:253
 msgid "No Graphics"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:239
+#: reporting/includes/reports_classes.inc:253
 msgid "Vertical bars"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:239
+#: reporting/includes/reports_classes.inc:253
 msgid "Horizontal bars"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:240
+#: reporting/includes/reports_classes.inc:254
 msgid "Dots"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:240
+#: reporting/includes/reports_classes.inc:254
 msgid "Lines"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:240
+#: reporting/includes/reports_classes.inc:254
 msgid "Pie"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:240
+#: reporting/includes/reports_classes.inc:254
 msgid "Donut"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:244
-#: reporting/includes/reports_classes.inc:247
+#: reporting/includes/reports_classes.inc:258
+#: reporting/includes/reports_classes.inc:261
 msgid "No Type Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:257
+#: reporting/includes/reports_classes.inc:271
 msgid "No Account Group Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:272
-#: reporting/includes/reports_classes.inc:278
-#: reporting/includes/reports_classes.inc:284
+#: reporting/includes/reports_classes.inc:286
+#: reporting/includes/reports_classes.inc:292
+#: reporting/includes/reports_classes.inc:298
 msgid "No Dimension Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:290
+#: reporting/includes/reports_classes.inc:304
 msgid "No Customer Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:298
+#: reporting/includes/reports_classes.inc:312
 msgid "No Supplier Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:380
+#: reporting/includes/reports_classes.inc:419
+#: reporting/includes/reports_classes.inc:421
 msgid "No Location Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:383
+#: reporting/includes/reports_classes.inc:424
+#: reporting/includes/reports_classes.inc:426
 msgid "No Category Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:392
+#: reporting/includes/reports_classes.inc:428
+msgid "No Class Filter"
+msgstr ""
+
+#: reporting/includes/reports_classes.inc:436
 msgid "No Sales Folk Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:399
+#: reporting/includes/reports_classes.inc:443
 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:40
-#, php-format
-msgid "Recurrent Invoice covers period %s - %s."
-msgstr ""
-
-#: sales/create_recurrent_invoices.php:97
+#: sales/create_recurrent_invoices.php:142
 #, php-format
 msgid "%s recurrent invoice(s) created, # %s - # %s."
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:102
+#: sales/create_recurrent_invoices.php:147
 #, php-format
 msgid "&Print Recurrent Invoices # %s - # %s"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:104
+#: sales/create_recurrent_invoices.php:150
 #, php-format
 msgid "&Email Recurrent Invoices # %s - # %s"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:115
-#: sales/manage/recurrent_invoices.php:102
-msgid "Template No"
+#: sales/create_recurrent_invoices.php:168
+msgid ""
+"Recurrent invoice cannot be generated before last day of covered period."
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:115
-#: sales/manage/recurrent_invoices.php:102
-msgid "Begin"
+#: sales/create_recurrent_invoices.php:170
+msgid ""
+"Recurrent invoices cannot be generated because some items have no price "
+"defined in customer currency."
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:115
-#: sales/manage/recurrent_invoices.php:102
-msgid "End"
+#: sales/create_recurrent_invoices.php:172
+msgid ""
+"Recurrent invoices cannot be generated because selected sales order template "
+"uses prepayment sales terms. Change payment terms and try again."
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:115
-#: sales/manage/recurrent_invoices.php:102
-#: sales/manage/recurrent_invoices.php:185
-msgid "Last Created"
+#: sales/create_recurrent_invoices.php:180
+#: sales/manage/recurrent_invoices.php:193
+msgid "Template:"
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:181
+msgid "Number of invoices:"
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:182
+msgid "Invoice date:"
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:183
+msgid "Invoice notice:"
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:183
+#, php-format
+msgid "Recurrent Invoice covers period %s - %s."
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:189
+msgid "Create"
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:189
+msgid "Create recurrent invoices"
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:190
+msgid "Return to recurrent invoices"
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:191
+#, php-format
+msgid ""
+"You are about to issue %s invoices.\n"
+" Do you want to continue?"
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:203
+#: sales/manage/recurrent_invoices.php:128
+msgid "Begin"
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:203
+#: sales/manage/recurrent_invoices.php:128
+msgid "End"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:156
-msgid "Create Invoices"
+#: sales/create_recurrent_invoices.php:240
+#, php-format
+msgid "Create %s Invoice(s)"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:164
+#: sales/create_recurrent_invoices.php:252
 msgid "Marked items are due."
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:166
+#: sales/create_recurrent_invoices.php:254
 msgid "No recurrent invoices are due."
 msgstr ""
 
@@ -11330,7 +13126,7 @@ msgstr ""
 msgid "Modifying Customer Credit Note #%d"
 msgstr ""
 
-#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:662
+#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:705
 msgid ""
 "There are no customers, or there are no customers with branches. Please "
 "define customers and customer branches."
@@ -11353,8 +13149,8 @@ msgstr ""
 msgid "&Email This Credit Invoice"
 msgstr ""
 
-#: sales/credit_note_entry.php:73 sales/customer_credit_invoice.php:60
-#: sales/customer_credit_invoice.php:77
+#: sales/credit_note_entry.php:73 sales/customer_credit_invoice.php:59
+#: sales/customer_credit_invoice.php:76
 msgid "View the GL &Journal Entries for this Credit Note"
 msgstr ""
 
@@ -11362,164 +13158,170 @@ msgstr ""
 msgid "Enter Another &Credit Note"
 msgstr ""
 
-#: sales/credit_note_entry.php:157
+#: sales/credit_note_entry.php:147 sales/customer_credit_invoice.php:101
+#: sales/customer_delivery.php:177 sales/customer_invoice.php:316
+#: sales/sales_order_entry.php:445
+msgid "You must enter a reference."
+msgstr ""
+
+#: sales/credit_note_entry.php:153
 msgid "The entered date for the credit note is invalid."
 msgstr ""
 
-#: sales/credit_note_entry.php:174
+#: 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:175
+#: 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:195
+#: sales/credit_note_entry.php:197
 msgid "The quantity must be greater than zero."
 msgstr ""
 
-#: sales/credit_note_entry.php:200
+#: sales/credit_note_entry.php:202
 msgid "The entered price is negative or invalid."
 msgstr ""
 
-#: sales/credit_note_entry.php:205
+#: sales/credit_note_entry.php:207
 msgid "The entered discount percent is negative, greater than 100 or invalid."
 msgstr ""
 
-#: sales/credit_note_entry.php:273
+#: sales/credit_note_entry.php:275
 msgid "Credit Note Items"
 msgstr ""
 
-#: sales/credit_note_entry.php:283 sales/customer_credit_invoice.php:384
+#: sales/credit_note_entry.php:285 sales/customer_credit_invoice.php:378
 msgid "Process Credit Note"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:38
+#: sales/customer_credit_invoice.php:37
 #, php-format
 msgid "Modifying Credit Invoice # %d."
 msgstr ""
 
-#: sales/customer_credit_invoice.php:42
+#: sales/customer_credit_invoice.php:41
 msgid "Credit all or part of an Invoice"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:53
+#: sales/customer_credit_invoice.php:52
 msgid "Credit Note has been processed"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:55 sales/customer_credit_invoice.php:72
+#: sales/customer_credit_invoice.php:54 sales/customer_credit_invoice.php:71
 msgid "&View This Credit Note"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:57 sales/customer_credit_invoice.php:74
+#: sales/customer_credit_invoice.php:56 sales/customer_credit_invoice.php:73
 msgid "&Print This Credit Note"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:58 sales/customer_credit_invoice.php:75
+#: sales/customer_credit_invoice.php:57 sales/customer_credit_invoice.php:74
 msgid "&Email This Credit Note"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:70
+#: sales/customer_credit_invoice.php:69
 msgid "Credit Note has been updated"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:114
+#: sales/customer_credit_invoice.php:108
 msgid "The entered shipping cost is invalid or less than zero."
 msgstr ""
 
-#: sales/customer_credit_invoice.php:119 sales/customer_credit_invoice.php:141
+#: sales/customer_credit_invoice.php:113 sales/customer_credit_invoice.php:135
 msgid ""
 "Selected quantity cannot be less than zero nor more than quantity not "
 "credited yet."
 msgstr ""
 
-#: sales/customer_credit_invoice.php:139
+#: sales/customer_credit_invoice.php:133
 msgid ""
 "This page can only be opened if an invoice has been selected for crediting."
 msgstr ""
 
-#: sales/customer_credit_invoice.php:251
+#: sales/customer_credit_invoice.php:248
 msgid "Crediting Invoice"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:272
+#: sales/customer_credit_invoice.php:265
 msgid "Credit Note Date"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:282
+#: sales/customer_credit_invoice.php:275
 msgid "Invoiced Quantity"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:283
+#: sales/customer_credit_invoice.php:276
 msgid "Credit Quantity"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:317
+#: sales/customer_credit_invoice.php:310
 msgid "Credit Shipping Cost"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:350
-#: sales/includes/ui/sales_credit_ui.inc:323
+#: sales/customer_credit_invoice.php:343
+#: sales/includes/ui/sales_credit_ui.inc:318
 msgid "Credit Note Type"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:358
-#: sales/includes/ui/sales_credit_ui.inc:331
+#: sales/customer_credit_invoice.php:351
+#: sales/includes/ui/sales_credit_ui.inc:326
 msgid "Items Returned to Location"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:363
-#: sales/includes/ui/sales_credit_ui.inc:336
+#: sales/customer_credit_invoice.php:356
+#: sales/includes/ui/sales_credit_ui.inc:331
 msgid "Write off the cost of the items to"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:382
+#: sales/customer_credit_invoice.php:376
 msgid "Update credit value for quantities entered"
 msgstr ""
 
-#: sales/customer_delivery.php:37
+#: sales/customer_delivery.php:36
 #, php-format
 msgid "Modifying Delivery Note # %d."
 msgstr ""
 
-#: sales/customer_delivery.php:41
+#: sales/customer_delivery.php:40
 msgid "Deliver Items for a Sales Order"
 msgstr ""
 
-#: sales/customer_delivery.php:50 sales/sales_order_entry.php:175
+#: sales/customer_delivery.php:49 sales/sales_order_entry.php:199
 #, php-format
 msgid "Delivery # %d has been entered."
 msgstr ""
 
-#: sales/customer_delivery.php:52 sales/sales_order_entry.php:177
+#: sales/customer_delivery.php:51 sales/sales_order_entry.php:201
 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:53 sales/customer_delivery.php:75
+#: sales/sales_order_entry.php:203
 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:54 sales/customer_delivery.php:76
+#: sales/sales_order_entry.php:204
 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:55 sales/customer_delivery.php:77
+#: sales/sales_order_entry.php:205
 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:56 sales/customer_delivery.php:78
+#: sales/sales_order_entry.php:206
 msgid "E&mail as Packing Slip"
 msgstr ""
 
-#: sales/customer_delivery.php:59 sales/sales_order_entry.php:185
+#: sales/customer_delivery.php:58 sales/sales_order_entry.php:209
 msgid "View the GL Journal Entries for this Dispatch"
 msgstr ""
 
@@ -11540,138 +13342,148 @@ msgstr ""
 msgid "View this delivery"
 msgstr ""
 
-#: sales/customer_delivery.php:80
+#: sales/customer_delivery.php:81
 msgid "Confirm Delivery and Invoice"
 msgstr ""
 
-#: sales/customer_delivery.php:82
+#: sales/customer_delivery.php:83
 msgid "Select A Different Delivery"
 msgstr ""
 
-#: sales/customer_delivery.php:94
+#: sales/customer_delivery.php:93 sales/customer_invoice.php:148
+msgid ""
+"You have to set Deferred Income Account in GL Setup to entry prepayment "
+"invoices."
+msgstr ""
+
+#: sales/customer_delivery.php:97 sales/customer_delivery.php:102
 msgid "Select a different sales order to delivery"
 msgstr ""
 
-#: sales/customer_delivery.php:95
+#: sales/customer_delivery.php:98
 msgid "This order has no items. There is nothing to delivery."
 msgstr ""
 
-#: sales/customer_delivery.php:107
+#: sales/customer_delivery.php:104
+msgid ""
+"This prepayment order is not yet ready for delivery due to insufficient "
+"amount received."
+msgstr ""
+
+#: sales/customer_delivery.php:121
 msgid "Select a different delivery"
 msgstr ""
 
-#: sales/customer_delivery.php:108
+#: sales/customer_delivery.php:122
 msgid "This delivery has all items invoiced. There is nothing to modify."
 msgstr ""
 
-#: sales/customer_delivery.php:118
+#: sales/customer_delivery.php:132
 msgid ""
 "This page can only be opened if an order or delivery note has been selected. "
 "Please select it first."
 msgstr ""
 
-#: sales/customer_delivery.php:120
+#: sales/customer_delivery.php:134
 msgid "Select a Sales Order to Delivery"
 msgstr ""
 
-#: sales/customer_delivery.php:129
+#: sales/customer_delivery.php:143
 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:146
 msgid "Freight cost cannot be less than zero"
 msgstr ""
 
-#: sales/customer_delivery.php:144
+#: sales/customer_delivery.php:158
 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:170
 msgid "The entered dead-line for invoice is invalid."
 msgstr ""
 
-#: sales/customer_delivery.php:179 sales/customer_invoice.php:293
+#: sales/customer_delivery.php:187 sales/customer_invoice.php:329
 msgid "The entered shipping value is not numeric."
 msgstr ""
 
-#: sales/customer_delivery.php:185
+#: sales/customer_delivery.php:193
 msgid "There are no item quantities on this delivery note."
 msgstr ""
 
-#: sales/customer_delivery.php:288 sales/sales_order_entry.php:491
-#: sales/includes/ui/sales_order_ui.inc:244
+#: sales/customer_delivery.php:205 sales/sales_order_entry.php:389
 msgid ""
-"The delivery cannot be processed because there is an insufficient quantity "
-"for item:"
+"This document cannot be processed because there is insufficient quantity for "
+"items marked."
 msgstr ""
 
-#: sales/customer_delivery.php:350
+#: sales/customer_delivery.php:341
 msgid "For Sales Order"
 msgstr ""
 
-#: sales/customer_delivery.php:359
+#: sales/customer_delivery.php:350
 msgid "Delivery From"
 msgstr ""
 
-#: sales/customer_delivery.php:408
+#: sales/customer_delivery.php:399
 msgid "Invoice Dead-line"
 msgstr ""
 
-#: sales/customer_delivery.php:418 sales/customer_invoice.php:438
-#: sales/includes/ui/sales_order_ui.inc:82
-#: sales/includes/ui/sales_order_ui.inc:368
+#: sales/customer_delivery.php:409 sales/customer_invoice.php:506
+#: sales/includes/ui/sales_order_ui.inc:83
+#: sales/includes/ui/sales_order_ui.inc:357
 msgid ""
 "The selected customer account is currently on hold. Please contact the "
 "credit control personnel to discuss."
 msgstr ""
 
-#: sales/customer_delivery.php:423
+#: sales/customer_delivery.php:414
 msgid "Delivery Items"
 msgstr ""
 
-#: sales/customer_delivery.php:429
+#: sales/customer_delivery.php:420
 msgid "Max. delivery"
 msgstr ""
 
-#: sales/customer_delivery.php:429 sales/customer_invoice.php:448
-#: sales/includes/ui/sales_order_ui.inc:141
-msgid "Delivered"
-msgstr ""
-
-#: sales/customer_delivery.php:430 sales/customer_invoice.php:449
-#: sales/view/view_receipt.php:45 sales/view/view_sales_order.php:202
-msgid "Discount"
+#: sales/customer_delivery.php:420 sales/customer_invoice.php:521
+msgid "Invoiced"
 msgstr ""
 
-#: sales/customer_delivery.php:490 sales/customer_invoice.php:533
+#: sales/customer_delivery.php:497 sales/customer_invoice.php:611
 msgid "Shipping Cost"
 msgstr ""
 
-#: sales/customer_delivery.php:510 sales/includes/ui/sales_order_ui.inc:242
+#: sales/customer_delivery.php:517 sales/includes/ui/sales_order_ui.inc:236
 msgid ""
 "Marked items have insufficient quantities in stock as on day of delivery."
 msgstr ""
 
-#: sales/customer_delivery.php:514
+#: sales/customer_delivery.php:521
 msgid "Action For Balance"
 msgstr ""
 
-#: sales/customer_delivery.php:521 sales/customer_invoice.php:562
+#: sales/customer_delivery.php:528 sales/customer_delivery.php:530
+#: sales/customer_delivery.php:533 sales/customer_invoice.php:663
 msgid "Refresh document page"
 msgstr ""
 
-#: sales/customer_delivery.php:522
+#: sales/customer_delivery.php:530
+msgid "Reset quantity"
+msgstr ""
+
+#: sales/customer_delivery.php:533
+msgid "Clear quantity"
+msgstr ""
+
+#: sales/customer_delivery.php:535
 msgid "Process Dispatch"
 msgstr ""
 
-#: sales/customer_delivery.php:523 sales/customer_invoice.php:564
-#: sales/sales_order_entry.php:710
+#: sales/customer_delivery.php:536 sales/customer_invoice.php:665
+#: sales/sales_order_entry.php:752
 msgid "Check entered data and save document"
 msgstr ""
 
@@ -11688,514 +13500,581 @@ msgstr ""
 msgid "Issue Batch Invoice for Delivery Notes"
 msgstr ""
 
-#: sales/customer_invoice.php:55
+#: sales/customer_invoice.php:44
+msgid "Prepayment or Final Invoice Entry"
+msgstr ""
+
+#: sales/customer_invoice.php:57
 msgid "Selected deliveries has been processed"
 msgstr ""
 
-#: sales/customer_invoice.php:57 sales/customer_invoice.php:77
-#: sales/sales_order_entry.php:204
+#: sales/customer_invoice.php:59 sales/customer_invoice.php:83
+#: sales/sales_order_entry.php:228
 msgid "&View This Invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:59 sales/customer_invoice.php:79
+#: sales/customer_invoice.php:61 sales/customer_invoice.php:85
 msgid "&Print This Invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:60 sales/customer_invoice.php:80
+#: sales/customer_invoice.php:62 sales/customer_invoice.php:86
 msgid "&Email This Invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:62 sales/sales_order_entry.php:217
+#: sales/customer_invoice.php:64 sales/sales_order_entry.php:238
 msgid "View the GL &Journal Entries for this Invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:64
+#: sales/customer_invoice.php:66
 msgid "Select Another &Delivery For Invoicing"
 msgstr ""
 
-#: sales/customer_invoice.php:75
+#: sales/customer_invoice.php:69 sales/sales_order_entry.php:248
+msgid "Entry &customer payment for this invoice"
+msgstr ""
+
+#: sales/customer_invoice.php:81
 #, php-format
 msgid "Sales Invoice # %d has been updated."
 msgstr ""
 
-#: sales/customer_invoice.php:82
+#: sales/customer_invoice.php:88
 msgid "Select Another &Invoice to Modify"
 msgstr ""
 
-#: sales/customer_invoice.php:121
+#: sales/customer_invoice.php:127
 msgid "Select a different delivery to invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:122
+#: sales/customer_invoice.php:128
 msgid ""
 "There are no delivered items with a quantity left to invoice. There is "
 "nothing left to invoice."
 msgstr ""
 
-#: sales/customer_invoice.php:131
+#: sales/customer_invoice.php:142
 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:140
+#: sales/customer_invoice.php:156
 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:146
+#: sales/customer_invoice.php:178
 msgid ""
 "This page can only be opened after delivery selection. Please select "
 "delivery to invoicing first."
 msgstr ""
 
-#: sales/customer_invoice.php:148
+#: sales/customer_invoice.php:180
 msgid "Select Delivery to Invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:153 sales/customer_invoice.php:304
+#: sales/customer_invoice.php:185 sales/customer_invoice.php:340
 msgid ""
 "Selected quantity cannot be less than quantity credited nor more than "
 "quantity not invoiced yet."
 msgstr ""
 
-#: sales/customer_invoice.php:257
+#: sales/customer_invoice.php:296
 msgid "The entered invoice date is invalid."
 msgstr ""
 
-#: sales/customer_invoice.php:263
-msgid "The entered invoice date is not in fiscal year."
-msgstr ""
-
-#: sales/customer_invoice.php:269
+#: sales/customer_invoice.php:309
 msgid "The entered invoice due date is invalid."
 msgstr ""
 
-#: sales/customer_invoice.php:299
+#: sales/customer_invoice.php:335
 msgid "There are no item quantities on this invoice."
 msgstr ""
 
-#: sales/customer_invoice.php:379
+#: sales/customer_invoice.php:345
+msgid ""
+"There is no non-invoiced payments for this order. If you want to issue final "
+"invoice, select delayed or cash payment terms."
+msgstr ""
+
+#: sales/customer_invoice.php:436
 msgid "Payment terms:"
 msgstr ""
 
-#: sales/customer_invoice.php:382 sales/includes/ui/sales_order_ui.inc:405
-#: sales/includes/ui/sales_order_ui.inc:409
-msgid "Payment:"
+#: sales/customer_invoice.php:512 sales/sales_order_entry.php:728
+msgid "Sales Order Items"
 msgstr ""
 
-#: sales/customer_invoice.php:444
+#: sales/customer_invoice.php:512
 msgid "Invoice Items"
 msgstr ""
 
-#: sales/customer_invoice.php:449
+#: sales/customer_invoice.php:522
 msgid "This Invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:457
+#: sales/customer_invoice.php:530
 msgid "Credited"
 msgstr ""
 
-#: sales/customer_invoice.php:551
+#: sales/customer_invoice.php:632
 msgid "Invoice Total"
 msgstr ""
 
-#: sales/customer_payments.php:33 sales/customer_payments.php.orig:33
+#: sales/customer_invoice.php:641
+msgid "Sales order:"
+msgstr ""
+
+#: sales/customer_invoice.php:653
+msgid "Payments received:"
+msgstr ""
+
+#: sales/customer_invoice.php:654
+msgid "Invoiced here:"
+msgstr ""
+
+#: sales/customer_invoice.php:655
+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.orig: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.orig:62
+#: sales/customer_payments.php:71
+msgid "Invalid sales invoice number."
+msgstr ""
+
+#: sales/customer_payments.php:98
 msgid "The customer payment has been successfully entered."
 msgstr ""
 
-#: sales/customer_payments.php:64 sales/customer_payments.php.orig:64
+#: sales/customer_payments.php:100 sales/customer_payments.php:119
 msgid "&Print This Receipt"
 msgstr ""
 
-#: sales/customer_payments.php:66 sales/customer_payments.php.orig:66
-msgid "&View the GL Journal Entries for this Customer Payment"
+#: sales/customer_payments.php:102
+msgid "&View this Customer Payment"
 msgstr ""
 
-#: sales/customer_payments.php:70 sales/customer_payments.php.orig:70
+#: sales/customer_payments.php:104 sales/customer_payments.php:127
 msgid "Enter Another &Customer Payment"
 msgstr ""
 
-#: sales/customer_payments.php:83 sales/customer_payments.php.orig:83
-#: sales/sales_order_entry.php:329
+#: sales/customer_payments.php:106
+msgid "Enter Payment to &Supplier"
+msgstr ""
+
+#: sales/customer_payments.php:110 sales/customer_payments.php:121
+msgid "&View the GL Journal Entries for this Customer Payment"
+msgstr ""
+
+#: sales/customer_payments.php:117
+msgid "The customer payment has been successfully updated."
+msgstr ""
+
+#: sales/customer_payments.php:125
+msgid "Select Another Customer Payment for &Edition"
+msgstr ""
+
+#: sales/customer_payments.php:140 sales/sales_order_entry.php:360
 msgid "There is no customer selected."
 msgstr ""
 
-#: sales/customer_payments.php:90 sales/customer_payments.php.orig:90
-#: sales/sales_order_entry.php:336
+#: sales/customer_payments.php:147 sales/sales_order_entry.php:367
 msgid "This customer has no branch defined."
 msgstr ""
 
-#: sales/customer_payments.php:96 sales/customer_payments.php.orig:96
+#: sales/customer_payments.php:153
 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.orig:118 sales/customer_payments.php.orig:124
+#: sales/customer_payments.php:168 sales/customer_payments.php:174
 msgid "The entered amount is invalid or negative and cannot be processed."
 msgstr ""
 
-#: sales/customer_payments.php:150 sales/customer_payments.php.orig:150
+#: sales/customer_payments.php:193
 msgid "The entered discount is not a valid number."
 msgstr ""
 
-#: sales/customer_payments.php:157 sales/customer_payments.php.orig:157
+#: sales/customer_payments.php:199
 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:233 sales/customer_payments.php.orig:231
-msgid "From Customer:"
+#: sales/customer_payments.php:206
+msgid "The entered payment amount is zero or negative."
 msgstr ""
 
-#: sales/customer_payments.php:248 sales/customer_payments.php.orig:250
-msgid "This customer account is on hold."
+#: sales/customer_payments.php:308
+msgid "Into Bank Account:"
 msgstr ""
 
-#: sales/customer_payments.php:255 sales/customer_payments.php.orig:257
-msgid "Into Bank Account:"
+#: sales/customer_payments.php:311 sales/customer_payments.php:313
+msgid "From Customer:"
 msgstr ""
 
-#: sales/customer_payments.php:262 sales/customer_payments.php.orig:264
+#: sales/customer_payments.php:345
 msgid "Date of Deposit:"
 msgstr ""
 
-#: sales/customer_payments.php:287 sales/customer_payments.php.orig:288
-msgid "Customer prompt payment discount :"
+#: sales/customer_payments.php:359
+msgid "Payment Amount:"
 msgstr ""
 
-#: sales/customer_payments.php:296 sales/customer_payments.php.orig:297
-msgid "Amount and discount are in customer's currency."
+#: sales/customer_payments.php:372
+msgid "Customer prompt payment discount :"
 msgstr ""
 
-#: sales/customer_payments.php:300 sales/customer_payments.php.orig:301
+#: sales/customer_payments.php:382
 msgid "Add Payment"
 msgstr ""
 
-#: sales/sales_order_entry.php:56
+#: sales/customer_payments.php:384
+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:72
+msgid "Fixed Assets Sale"
+msgstr ""
+
+#: sales/sales_order_entry.php:75
 msgid "Direct Sales Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:67
+#: sales/sales_order_entry.php:80
 #, php-format
 msgid "Modifying Sales Order # %d"
 msgstr ""
 
-#: sales/sales_order_entry.php:73
+#: sales/sales_order_entry.php:86
 #, php-format
 msgid "Modifying Sales Quotation # %d"
 msgstr ""
 
-#: sales/sales_order_entry.php:78
+#: sales/sales_order_entry.php:91
 msgid "New Sales Order Entry"
 msgstr ""
 
-#: sales/sales_order_entry.php:82
+#: sales/sales_order_entry.php:95
 msgid "New Sales Quotation Entry"
 msgstr ""
 
-#: sales/sales_order_entry.php:85
+#: sales/sales_order_entry.php:98
 msgid "Sales Order Entry"
 msgstr ""
 
-#: sales/sales_order_entry.php:101
+#: sales/sales_order_entry.php:106
+msgid ""
+"This order cannot be edited because there are invoices or payments related "
+"to it, and prepayment terms were used."
+msgstr ""
+
+#: sales/sales_order_entry.php:125
 #, 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:127 sales/sales_order_entry.php:147
 msgid "&View This Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:109
+#: sales/sales_order_entry.php:133
 msgid "Make &Delivery Against This Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:114
+#: sales/sales_order_entry.php:138
 msgid "Enter a &New Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:121
+#: sales/sales_order_entry.php:145
 #, php-format
 msgid "Order # %d has been updated."
 msgstr ""
 
-#: sales/sales_order_entry.php:129
+#: sales/sales_order_entry.php:153
 msgid "Confirm Order Quantities and Make &Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:132
+#: sales/sales_order_entry.php:156
 msgid "Select A Different &Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:139
+#: sales/sales_order_entry.php:163
 #, 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:165 sales/sales_order_entry.php:183
 msgid "&View This Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:143 sales/sales_order_entry.php:161
+#: sales/sales_order_entry.php:167 sales/sales_order_entry.php:185
 msgid "&Print This Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:144 sales/sales_order_entry.php:162
+#: sales/sales_order_entry.php:168 sales/sales_order_entry.php:186
 msgid "&Email This Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:147 sales/sales_order_entry.php:165
+#: sales/sales_order_entry.php:171 sales/sales_order_entry.php:189
 msgid "Make &Sales Order Against This Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:150
+#: sales/sales_order_entry.php:174
 msgid "Enter a New &Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:157
+#: sales/sales_order_entry.php:181
 #, php-format
 msgid "Quotation # %d has been updated."
 msgstr ""
 
-#: sales/sales_order_entry.php:168
+#: sales/sales_order_entry.php:192
 msgid "Select A Different &Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:187
+#: sales/sales_order_entry.php:211
 msgid "Make &Invoice Against This Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:191
+#: sales/sales_order_entry.php:215
 msgid "Enter a New Template &Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:194
+#: sales/sales_order_entry.php:218
 msgid "Enter a &New Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:202
+#: sales/sales_order_entry.php:226
 #, php-format
 msgid "Invoice # %d has been entered."
 msgstr ""
 
-#: sales/sales_order_entry.php:206
+#: sales/sales_order_entry.php:230
 msgid "&Print Sales Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:207
+#: sales/sales_order_entry.php:231
 msgid "&Email Sales Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:215
+#: sales/sales_order_entry.php:236
 msgid "Print &Receipt"
 msgstr ""
 
-#: sales/sales_order_entry.php:220
+#: sales/sales_order_entry.php:241
 msgid "Enter a &New Template Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:223
+#: sales/sales_order_entry.php:244
 msgid "Enter a &New Direct Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:358
+#: sales/sales_order_entry.php:395
+msgid "Pre-payment required have to be positive and less than total amount."
+msgstr ""
+
+#: sales/sales_order_entry.php:400
 msgid ""
 "You must enter the person or company to whom delivery should be made to."
 msgstr ""
 
-#: sales/sales_order_entry.php:365
+#: sales/sales_order_entry.php:406
 msgid ""
 "You should enter the street address in the box provided. Orders cannot be "
 "accepted without a valid street address."
 msgstr ""
 
-#: sales/sales_order_entry.php:374
+#: sales/sales_order_entry.php:415
 msgid "The shipping cost entered is expected to be numeric."
 msgstr ""
 
-#: sales/sales_order_entry.php:380
+#: sales/sales_order_entry.php:421
 msgid "The Valid date is invalid."
 msgstr ""
 
-#: sales/sales_order_entry.php:382
+#: sales/sales_order_entry.php:423
 msgid "The delivery date is invalid."
 msgstr ""
 
-#: sales/sales_order_entry.php:389
+#: sales/sales_order_entry.php:429
 msgid "The requested valid date is before the date of the quotation."
 msgstr ""
 
-#: sales/sales_order_entry.php:391
+#: sales/sales_order_entry.php:431
 msgid "The requested delivery date is before the date of the order."
 msgstr ""
 
-#: sales/sales_order_entry.php:400
+#: sales/sales_order_entry.php:440
 msgid "You need to define a cash account for your Sales Point."
 msgstr ""
 
-#: sales/sales_order_entry.php:470
+#: 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:523
 msgid ""
 "The item could not be updated because you are attempting to set the quantity "
 "ordered to less than 0, or the discount percent to more than 100."
 msgstr ""
 
-#: sales/sales_order_entry.php:474
+#: sales/sales_order_entry.php:527
 msgid "Price for inventory item must be entered and can not be less than 0"
 msgstr ""
 
-#: sales/sales_order_entry.php:481
+#: sales/sales_order_entry.php:534
 msgid ""
 "You attempting to make the quantity ordered a quantity less than has already "
 "been delivered. The quantity delivered cannot be modified retrospectively."
 msgstr ""
 
-#: sales/sales_order_entry.php:512
+#: sales/sales_order_entry.php:552
 #, php-format
 msgid "Price %s is below Standard Cost %s"
 msgstr ""
 
-#: sales/sales_order_entry.php:537
+#: sales/sales_order_entry.php:577
 msgid ""
 "This item cannot be deleted because some of it has already been delivered."
 msgstr ""
 
-#: sales/sales_order_entry.php:566
+#: sales/sales_order_entry.php:606
 msgid "Direct delivery entry has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:567
+#: sales/sales_order_entry.php:607
 msgid "Enter a New Sales Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:570
+#: sales/sales_order_entry.php:609
 msgid "Direct invoice entry has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:571
+#: sales/sales_order_entry.php:610
 msgid "Enter a New Sales Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:576
-msgid ""
-"This order cannot be cancelled because some of it has already been invoiced "
-"or dispatched. However, the line item quantities may be modified."
-msgstr ""
-
-#: sales/sales_order_entry.php:581
+#: sales/sales_order_entry.php:615
 msgid "This sales quotation has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:582
+#: sales/sales_order_entry.php:616
 msgid "Enter a New Sales Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:586
+#: sales/sales_order_entry.php:623
+msgid "Undelivered part of order has been cancelled as requested."
+msgstr ""
+
+#: sales/sales_order_entry.php:624
+msgid "Select Another Sales Order for Edition"
+msgstr ""
+
+#: sales/sales_order_entry.php:628
 msgid "This sales order has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:587
+#: sales/sales_order_entry.php:629
 msgid "Enter a New Sales Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:666
+#: sales/sales_order_entry.php:709
 msgid "Sales Invoice Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:667
+#: sales/sales_order_entry.php:710
 msgid "Enter Delivery Details and Confirm Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:669
+#: sales/sales_order_entry.php:712
 msgid "Place Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:672
+#: sales/sales_order_entry.php:715
 msgid "Delivery Note Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:673
+#: sales/sales_order_entry.php:716
 msgid "Enter Delivery Details and Confirm Dispatch"
 msgstr ""
 
-#: sales/sales_order_entry.php:674
+#: sales/sales_order_entry.php:717
 msgid "Cancel Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:675
+#: sales/sales_order_entry.php:718
 msgid "Place Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:677
+#: sales/sales_order_entry.php:720
 msgid "Quotation Date:"
 msgstr ""
 
-#: sales/sales_order_entry.php:678
+#: sales/sales_order_entry.php:721
 msgid "Sales Quotation Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:679
+#: sales/sales_order_entry.php:722
 msgid "Enter Delivery Details and Confirm Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:680
+#: sales/sales_order_entry.php:723
 msgid "Cancel Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:681
+#: sales/sales_order_entry.php:724
 msgid "Place Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:682
+#: sales/sales_order_entry.php:725
 msgid "Commit Quotations Changes"
 msgstr ""
 
-#: sales/sales_order_entry.php:685
-msgid "Sales Order Items"
-msgstr ""
-
-#: sales/sales_order_entry.php:686
+#: sales/sales_order_entry.php:729
 msgid "Enter Delivery Details and Confirm Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:689
+#: sales/sales_order_entry.php:732
 msgid "Commit Order Changes"
 msgstr ""
 
-#: sales/sales_order_entry.php:711
+#: 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:714
+#: sales/sales_order_entry.php:758
 msgid "Validate changes and update document"
 msgstr ""
 
-#: sales/sales_order_entry.php:718
+#: 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:55
 #, php-format
 msgid "Allocation of %s # %d"
 msgstr ""
@@ -12205,10 +14084,11 @@ 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:270 sales/manage/customers.php:330
 #: sales/inquiry/customer_allocation_inquiry.php:42
-#: sales/inquiry/customer_inquiry.php:44
-#: sales/inquiry/sales_orders_view.php:234
+#: sales/inquiry/customer_inquiry.php:154
+#: sales/inquiry/sales_deliveries_view.php:114
+#: sales/inquiry/sales_orders_view.php:232
 msgid "Select a customer: "
 msgstr ""
 
@@ -12254,324 +14134,357 @@ msgstr ""
 msgid "Dissallow invoicing ?"
 msgstr ""
 
-#: sales/manage/customer_branches.php:18
+#: sales/manage/customer_branches.php:22
+#: sales/inquiry/customer_branches_list.php:25
 msgid "Customer Branches"
 msgstr ""
 
-#: sales/manage/customer_branches.php:25
+#: sales/manage/customer_branches.php:29
 msgid ""
 "There are no customers defined in the system. Please define a customer to "
 "add customer branches."
 msgstr ""
 
-#: sales/manage/customer_branches.php:27
+#: sales/manage/customer_branches.php:31
 msgid ""
 "There are no sales people defined in the system. At least one sales person "
 "is required before proceeding."
 msgstr ""
 
-#: sales/manage/customer_branches.php:29
+#: sales/manage/customer_branches.php:33
 msgid ""
 "There are no sales areas defined in the system. At least one sales area is "
 "required before proceeding."
 msgstr ""
 
-#: sales/manage/customer_branches.php:31
+#: sales/manage/customer_branches.php:35
 msgid ""
 "There are no shipping companies defined in the system. At least one shipping "
 "company is required before proceeding."
 msgstr ""
 
-#: sales/manage/customer_branches.php:63
+#: sales/manage/customer_branches.php:67
 msgid "The Branch name cannot be empty."
 msgstr ""
 
-#: sales/manage/customer_branches.php:70
+#: sales/manage/customer_branches.php:74
 msgid "The Branch short name cannot be empty."
 msgstr ""
 
-#: sales/manage/customer_branches.php:88
+#: sales/manage/customer_branches.php:90
 msgid "Selected customer branch has been updated"
 msgstr ""
 
-#: sales/manage/customer_branches.php:106
+#: sales/manage/customer_branches.php:108
 msgid "New customer branch has been added"
 msgstr ""
 
-#: sales/manage/customer_branches.php:125
+#: sales/manage/customer_branches.php:124
 msgid ""
 "Cannot delete this branch because customer transactions have been created to "
 "this branch."
 msgstr ""
 
-#: sales/manage/customer_branches.php:132
+#: sales/manage/customer_branches.php:131
 msgid ""
 "Cannot delete this branch because sales orders exist for it. Purge old sales "
 "orders first."
 msgstr ""
 
-#: sales/manage/customer_branches.php:137
+#: sales/manage/customer_branches.php:136
 msgid "Selected customer branch has been deleted"
 msgstr ""
 
-#: sales/manage/customer_branches.php:217
+#: sales/manage/customer_branches.php:209
 msgid "Main Branch"
 msgstr ""
 
-#: sales/manage/customer_branches.php:236
+#: sales/manage/customer_branches.php:228
 msgid "Name and Contact"
 msgstr ""
 
-#: sales/manage/customer_branches.php:237
+#: sales/manage/customer_branches.php:229
 msgid "Branch Name:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:238
+#: sales/manage/customer_branches.php:230
 msgid "Branch Short Name:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:241
+#: sales/manage/customer_branches.php:233 sales/manage/customers.php:261
 msgid "Sales Person:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:242
+#: sales/manage/customer_branches.php:234 sales/manage/customers.php:298
 msgid "Sales Area:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:243
-#: sales/manage/recurrent_invoices.php:174
+#: sales/manage/customer_branches.php:235
+#: sales/manage/recurrent_invoices.php:200
 msgid "Sales Group:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:244
+#: sales/manage/customer_branches.php:236 sales/manage/customers.php:296
 msgid "Default Inventory Location:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:245
+#: sales/manage/customer_branches.php:237 sales/manage/customers.php:297
 msgid "Default Shipping Company:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:252
+#: sales/manage/customer_branches.php:244
 msgid "Accounts Receivable Account:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:258
+#: sales/manage/customer_branches.php:251
 msgid "General contact data"
 msgstr ""
 
-#: sales/manage/customer_branches.php:268
+#: sales/manage/customer_branches.php:261
 msgid "Billing Address:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:272
-msgid "Disable this Branch:"
-msgstr ""
-
-#: sales/manage/customer_branches.php:295
-#: sales/inquiry/sales_deliveries_view.php:183
+#: sales/manage/customer_branches.php:285
+#: sales/inquiry/customer_branches_list.php:49
+#: sales/inquiry/sales_deliveries_view.php:172
 msgid "Contact"
 msgstr ""
 
-#: sales/manage/customer_branches.php:297
+#: sales/manage/customer_branches.php:287
 msgid "Area"
 msgstr ""
 
-#: sales/manage/customer_branches.php:298
+#: sales/manage/customer_branches.php:288
 msgid "Phone No"
 msgstr ""
 
-#: sales/manage/customer_branches.php:299
+#: sales/manage/customer_branches.php:289
 msgid "Fax No"
 msgstr ""
 
-#: sales/manage/customer_branches.php:301
+#: sales/manage/customer_branches.php:291
 msgid "Tax Group"
 msgstr ""
 
-#: sales/manage/customer_branches.php:319
-#: sales/includes/ui/sales_order_ui.inc:299
+#: sales/manage/customer_branches.php:307
+#: sales/includes/ui/sales_order_ui.inc:288
 msgid ""
 "The selected customer does not have any branches. Please create at least one "
 "branch."
 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:267
 msgid "Discount Percent:"
 msgstr ""
 
-#: sales/manage/customers.php:227
+#: sales/manage/customers.php:268
 msgid "Prompt Payment Discount Percent:"
 msgstr ""
 
-#: sales/manage/customers.php:231
+#: sales/manage/customers.php:272
 msgid "Credit Status:"
 msgstr ""
 
-#: sales/manage/customers.php:244
+#: sales/manage/customers.php:285
 msgid "Customer branches"
 msgstr ""
 
-#: sales/manage/customers.php:246
+#: sales/manage/customers.php:287
 msgid "Select or &Add"
 msgstr ""
 
-#: sales/manage/customers.php:246
+#: sales/manage/customers.php:287
 msgid "&Add or Edit "
 msgstr ""
 
-#: sales/manage/customers.php:257
+#: sales/manage/customers.php:307
 msgid "Add New Customer"
 msgstr ""
 
-#: sales/manage/customers.php:261
+#: sales/manage/customers.php:311
 msgid "Update Customer"
 msgstr ""
 
-#: sales/manage/customers.php:262
+#: sales/manage/customers.php:312
 msgid "Update customer data"
 msgstr ""
 
-#: sales/manage/customers.php:263
+#: sales/manage/customers.php:313
 msgid "Select this customer and return to document entry."
 msgstr ""
 
-#: sales/manage/customers.php:264
+#: sales/manage/customers.php:314
 msgid "Delete Customer"
 msgstr ""
 
-#: sales/manage/customers.php:265
+#: sales/manage/customers.php:315
 msgid "Delete customer data if have been never used"
 msgstr ""
 
-#: sales/manage/customers.php:272
+#: sales/manage/customers.php:322
 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:331
 msgid "New customer"
 msgstr ""
 
+#: sales/manage/customers.php:354
+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."
+#: sales/manage/recurrent_invoices.php:26
+msgid ""
+"There is no template order in database.\n"
+"\tYou have to create at least one sales order marked as template to be able "
+"to define recurrent invoices."
+msgstr ""
+
+#: sales/manage/recurrent_invoices.php:40
+msgid ""
+"This customer has no branches. Please define at least one branch for this "
+"customer first."
+msgstr ""
+
+#: sales/manage/recurrent_invoices.php:48
+msgid "The invoice description cannot be empty."
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:63
+#: sales/manage/recurrent_invoices.php:54
+msgid "This recurrent invoice description is already in use."
+msgstr ""
+
+#: sales/manage/recurrent_invoices.php:77
+msgid "No recurence interval has been entered."
+msgstr ""
+
+#: sales/manage/recurrent_invoices.php:89
 msgid "Selected recurrent invoice has been updated"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:69
+#: sales/manage/recurrent_invoices.php:95
 msgid "New recurrent invoice has been added"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:86
+#: sales/manage/recurrent_invoices.php:112
 msgid "Selected recurrent invoice has been deleted"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:167
-msgid "Template:"
+#: sales/manage/recurrent_invoices.php:128
+#: sales/manage/recurrent_invoices.php:211
+msgid "Last Created"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:176
+#: sales/manage/recurrent_invoices.php:202
 msgid "Days:"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:178
+#: sales/manage/recurrent_invoices.php:204
 msgid "Monthly:"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:180
+#: sales/manage/recurrent_invoices.php:206
 msgid "Begin:"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:182
+#: sales/manage/recurrent_invoices.php:208
 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 ""
@@ -12602,6 +14515,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 ""
@@ -12652,6 +14569,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 ""
@@ -12669,7 +14592,7 @@ msgid "Fax number:"
 msgstr ""
 
 #: sales/manage/sales_people.php:160
-msgid "Break Pt.:"
+msgid "Turnover Break Pt Level:"
 msgstr ""
 
 #: sales/manage/sales_points.php:16
@@ -12823,11 +14746,11 @@ msgstr ""
 msgid "DISPATCH NOTE #%d"
 msgstr ""
 
-#: sales/view/view_dispatch.php:65 sales/view/view_invoice.php:65
+#: sales/view/view_dispatch.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_dispatch.php:91 sales/view/view_invoice.php:91
 #: sales/view/view_sales_order.php:63
 msgid "Customer Order Ref."
 msgstr ""
@@ -12840,11 +14763,11 @@ msgstr ""
 msgid "There are no line items on this dispatch."
 msgstr ""
 
-#: sales/view/view_dispatch.php:162
+#: sales/view/view_dispatch.php:163
 msgid "TOTAL VALUE"
 msgstr ""
 
-#: sales/view/view_dispatch.php:166
+#: sales/view/view_dispatch.php:167
 msgid "This dispatch has been voided."
 msgstr ""
 
@@ -12852,15 +14775,29 @@ 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 ""
 
+#: sales/view/view_invoice.php:171
+msgid "PREPAYMENT AMOUNT INVOICED"
+msgstr ""
+
 #: sales/view/view_receipt.php:24
 msgid "View Customer Payment"
 msgstr ""
@@ -12874,12 +14811,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
@@ -12924,15 +14869,23 @@ msgstr ""
 msgid "Deliver From Location"
 msgstr ""
 
-#: sales/view/view_sales_order.php:82
+#: 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:197
+#: sales/view/view_sales_order.php:215
 msgid "This Sales Order is used as a Template."
 msgstr ""
 
-#: sales/view/view_sales_order.php:202
+#: sales/view/view_sales_order.php:220
 msgid "Quantity Delivered"
 msgstr ""
 
@@ -12948,17 +14901,12 @@ msgstr ""
 msgid "Customer Transactions"
 msgstr ""
 
-#: sales/inquiry/customer_inquiry.php:68
-msgid "CUSTOMER ACCOUNT IS ON HOLD"
-msgstr ""
-
-#: sales/inquiry/customer_inquiry.php:193
+#: sales/inquiry/customer_inquiry.php:93
 msgid "Print Receipt"
 msgstr ""
 
-#: sales/inquiry/customer_inquiry.php:223
-#: sales/inquiry/customer_inquiry.php:236
-msgid "RB"
+#: sales/inquiry/customer_inquiry.php:113
+msgid "CUSTOMER ACCOUNT IS ON HOLD"
 msgstr ""
 
 #: sales/inquiry/sales_deliveries_view.php:29
@@ -12969,100 +14917,112 @@ msgstr ""
 msgid "Search All Deliveries"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:70
+#: sales/inquiry/sales_deliveries_view.php:68
 msgid ""
 "For batch invoicing you should\n"
 "\t\t    select at least one delivery. All items must be dispatched to\n"
 "\t\t    the same customer branch."
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:179
+#: sales/inquiry/sales_deliveries_view.php:168
 msgid "Delivery #"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:185
+#: sales/inquiry/sales_deliveries_view.php:174
 msgid "Cust Ref"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:187
+#: sales/inquiry/sales_deliveries_view.php:176
 msgid "Due By"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:188
+#: sales/inquiry/sales_deliveries_view.php:177
 msgid "Delivery Total"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:190
+#: sales/inquiry/sales_deliveries_view.php:179
 msgid "Batch"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:190
+#: sales/inquiry/sales_deliveries_view.php:179
 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:123
 msgid "Dispatch"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:171
+#: sales/inquiry/sales_orders_view.php:167
 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:176
+msgid "Prepayment Invoice"
+msgstr ""
+
+#: sales/inquiry/sales_orders_view.php:176
+msgid "Final Invoice"
+msgstr ""
+
+#: sales/inquiry/sales_orders_view.php:234
 msgid "Show All:"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:253
+#: sales/inquiry/sales_orders_view.php:252
 msgid "Order #"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:257
-#: sales/inquiry/sales_orders_view.php:271
+#: sales/inquiry/sales_orders_view.php:256
+#: sales/inquiry/sales_orders_view.php:270
 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:259
+#: sales/inquiry/sales_orders_view.php:273
 msgid "Delivery To"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:267
+#: sales/inquiry/sales_orders_view.php:266
 msgid "Quote #"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:272
+#: sales/inquiry/sales_orders_view.php:271
 msgid "Quote Date"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:275
+#: sales/inquiry/sales_orders_view.php:274
 msgid "Quote Total"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:302
+#: sales/inquiry/sales_orders_view.php:304
 msgid "Tmpl"
 msgstr ""
 
-#: sales/includes/cart_class.inc:347
+#: sales/includes/cart_class.inc:400
 msgid "You have to enter valid stock code or nonempty description"
 msgstr ""
 
@@ -13072,7 +15032,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:382
 msgid ""
 "Unsuspected overallocation happened due to sparse credit notes exists for "
 "this invoice.\n"
@@ -13080,145 +15040,148 @@ msgid ""
 "charges."
 msgstr ""
 
-#: sales/includes/db/sales_invoice_db.inc:173
-msgid "Cash invoice"
+#: sales/includes/db/recurrent_invoices_db.inc:158
+#, php-format
+msgid "Unknown %s price for '%s' in pricelist '%s'"
 msgstr ""
 
-#: sales/includes/db/sales_order_db.inc:107
-#: sales/includes/db/sales_order_db.inc:259
-msgid "Stocks below Re-Order Level at "
+#: sales/includes/db/sales_credit_db.inc:185
+msgid "Return"
 msgstr ""
 
-#: sales/includes/db/sales_order_db.inc:110
-#: sales/includes/db/sales_order_db.inc:264
-msgid "Below"
+#: sales/includes/db/sales_credit_db.inc:187
+msgid "Ex Inv:"
 msgstr ""
 
-#: sales/includes/db/sales_order_db.inc:111
-#: sales/includes/db/sales_order_db.inc:265
-msgid "Please reorder"
+#: sales/includes/db/sales_invoice_db.inc:206
+msgid "Cash invoice"
 msgstr ""
 
-#: sales/includes/db/sales_order_db.inc:139
+#: sales/includes/db/sales_order_db.inc:101
 msgid "Deleted."
 msgstr ""
 
-#: sales/includes/ui/sales_credit_ui.inc:94
-#: sales/includes/ui/sales_order_ui.inc:379
+#: sales/includes/ui/sales_credit_ui.inc:90
+#: sales/includes/ui/sales_order_ui.inc:367
 msgid "Customer Currency:"
 msgstr ""
 
-#: sales/includes/ui/sales_credit_ui.inc:112
-#: sales/includes/ui/sales_order_ui.inc:638
+#: sales/includes/ui/sales_credit_ui.inc:108
+#: sales/includes/ui/sales_order_ui.inc:639
 msgid "Shipping Company:"
 msgstr ""
 
-#: sales/includes/ui/sales_credit_ui.inc:114
-#: sales/includes/ui/sales_order_ui.inc:386
+#: sales/includes/ui/sales_credit_ui.inc:110
+#: sales/includes/ui/sales_order_ui.inc:374
 msgid "Customer Discount:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:61
+#: sales/includes/ui/sales_order_ui.inc:60
 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:105
 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:218
 msgid "Shipping Charge"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:297
+#: sales/includes/ui/sales_order_ui.inc:286
 msgid "No customer found for entered text."
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:323
+#: sales/includes/ui/sales_order_ui.inc:312
 #, php-format
 msgid "Customer's payment terms '%s' cannot be selected on this POS"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:373
+#: sales/includes/ui/sales_order_ui.inc:361
 msgid "Reference number unique for this document type"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:415
+#: sales/includes/ui/sales_order_ui.inc:403
+#: sales/includes/ui/sales_order_ui.inc:405
 msgid "Price List:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:432
+#: sales/includes/ui/sales_order_ui.inc:422
 msgid "Date of order receive"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:582
+#: sales/includes/ui/sales_order_ui.inc:503
+msgid "[Select item]"
+msgstr ""
+
+#: sales/includes/ui/sales_order_ui.inc:574
 msgid "Cash payment"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:585
-#: sales/includes/ui/sales_order_ui.inc:616
+#: sales/includes/ui/sales_order_ui.inc:577
+#: sales/includes/ui/sales_order_ui.inc:609
 msgid "Deliver from Location:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:588
+#: sales/includes/ui/sales_order_ui.inc:580
 msgid "Cash account:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:594
+#: sales/includes/ui/sales_order_ui.inc:587
 msgid "Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:599
+#: sales/includes/ui/sales_order_ui.inc:592
 msgid "Invoice Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:600
+#: sales/includes/ui/sales_order_ui.inc:593
 msgid "Invoice before"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:604
+#: sales/includes/ui/sales_order_ui.inc:597
 msgid "Quotation Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:609
+#: sales/includes/ui/sales_order_ui.inc:602
 msgid "Order Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:622
+#: sales/includes/ui/sales_order_ui.inc:623
 msgid "Enter requested day of delivery"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:623
+#: sales/includes/ui/sales_order_ui.inc:624
 msgid "Enter Valid until Date"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:624
+#: sales/includes/ui/sales_order_ui.inc:625
 msgid "Deliver To:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:625
+#: sales/includes/ui/sales_order_ui.inc:626
 msgid "Additional identifier for delivery e.g. name of receiving person"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:628
+#: sales/includes/ui/sales_order_ui.inc:629
 msgid "Delivery address. Default is address of customer branch"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:632
+#: sales/includes/ui/sales_order_ui.inc:633
 msgid "Contact Phone Number:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:633
+#: sales/includes/ui/sales_order_ui.inc:634
 msgid "Phone number of ordering person. Defaults to branch phone number"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:634
+#: sales/includes/ui/sales_order_ui.inc:635
 msgid "Customer Reference:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:635
+#: sales/includes/ui/sales_order_ui.inc:636
 msgid "Customer reference number for this order (if any)"
 msgstr ""
 
@@ -13287,39 +15250,35 @@ msgstr ""
 msgid "The tax group name cannot be empty."
 msgstr ""
 
-#: taxes/tax_groups.php:61
+#: taxes/tax_groups.php:63
 msgid "Selected tax group has been updated"
 msgstr ""
 
-#: taxes/tax_groups.php:66
+#: taxes/tax_groups.php:68
 msgid "New tax group has been added"
 msgstr ""
 
-#: taxes/tax_groups.php:81
+#: taxes/tax_groups.php:83
 msgid ""
 "Cannot delete this tax group because customer branches been created "
 "referring to it."
 msgstr ""
 
-#: taxes/tax_groups.php:87
+#: taxes/tax_groups.php:89
 msgid ""
 "Cannot delete this tax group because suppliers been created referring to it."
 msgstr ""
 
-#: taxes/tax_groups.php:104
+#: taxes/tax_groups.php:106
 msgid "Selected tax group has been deleted"
 msgstr ""
 
-#: taxes/tax_groups.php:124
-msgid "Shipping Tax"
-msgstr ""
-
-#: taxes/tax_groups.php:168
-msgid "Tax applied to Shipping:"
+#: taxes/tax_groups.php:169
+msgid "Select the taxes that are included in this group."
 msgstr ""
 
-#: taxes/tax_groups.php:172
-msgid "Select the taxes that are included in this group."
+#: taxes/tax_groups.php:174
+msgid "Shipping Tax"
 msgstr ""
 
 #: taxes/tax_types.php:16
@@ -13389,35 +15348,39 @@ msgstr ""
 msgid "Main Menu"
 msgstr ""
 
-#: themes/default/renderer.php:53 themes/default/renderer.php:76
-msgid "Help"
+#: themes/default/renderer.php:71 themes/default/renderer.php:80
+msgid "Preferences"
 msgstr ""
 
-#: themes/default/renderer.php:71
-msgid "Preferences"
+#: themes/default/renderer.php:72
+msgid "Change Password"
 msgstr ""
 
-#: sql/alter2.1.php:18
+#: themes/default/renderer.php:74 themes/default/renderer.php:85
+msgid "Help"
+msgstr ""
+
+#: sql/alter2.1.php:19
 msgid "Upgrade from version 2.0 to 2.1"
 msgstr ""
 
-#: sql/alter2.1.php:35
+#: sql/alter2.1.php:37
 msgid "Cannot retrieve bank accounts codes"
 msgstr ""
 
-#: sql/alter2.1.php:43
+#: sql/alter2.1.php:45
 msgid "Cannot update bank transactions"
 msgstr ""
 
-#: sql/alter2.1.php:52
+#: sql/alter2.1.php:54
 msgid "Cannot select stock identificators"
 msgstr ""
 
-#: sql/alter2.1.php:63
+#: sql/alter2.1.php:65
 msgid "Cannot insert stock id into item_codes"
 msgstr ""
 
-#: sql/alter2.1.php:139
+#: sql/alter2.1.php:144
 msgid ""
 "Seems that system upgrade to version 2.1 has \n"
 "\t\t\tbeen performed for this company already.<br> If something has gone \n"
@@ -13425,24 +15388,71 @@ msgid ""
 "\t\t\tdatabase restore from last backup file first."
 msgstr ""
 
-#: sql/alter2.2.php:23
+#: sql/alter2.2.php:24
 msgid "Upgrade from version 2.1/2.2beta to 2.2"
 msgstr ""
 
-#: sql/alter2.2.php:84
+#: sql/alter2.2.php:86
 msgid "Cannot query max sales order number."
 msgstr ""
 
-#: sql/alter2.2.php:95
+#: sql/alter2.2.php:97
 msgid "Cannot store next sales order reference."
 msgstr ""
 
-#: sql/alter2.2.php:250
+#: sql/alter2.2.php:221
 msgid ""
 "Cannot upgrade extensions system: file /modules/installed_modules.php is not "
 "writeable"
 msgstr ""
 
-#: sql/alter2.3.php:20
+#: sql/alter2.3.php:21
 msgid "Upgrade from version 2.2 to 2.3"
 msgstr ""
+
+#: sql/alter2.4.php:23
+msgid "Upgrade from version 2.3 to 2.4"
+msgstr ""
+
+#: sql/alter2.4.php:31 sql/alter2.4rc1.php:31
+msgid "Set optimal parameters and start upgrade:"
+msgstr ""
+
+#: sql/alter2.4.php:34
+msgid "Text collation optimization:"
+msgstr ""
+
+#: sql/alter2.4.php:89
+msgid "Cannot update config_db.php file."
+msgstr ""
+
+#: sql/alter2.4.php:128
+#, php-format
+msgid ""
+"Cannot update work orders costs:\n"
+"%s"
+msgstr ""
+
+#: sql/alter2.4.php:221
+msgid "Convertion to utf8 done."
+msgstr ""
+
+#: sql/alter2.4.php:260
+#, php-format
+msgid "Cannot drop column in %s table: %s"
+msgstr ""
+
+#: sql/alter2.4rc1.php:23
+msgid "Upgrade from version 2.4beta to 2.4RC1"
+msgstr ""
+
+#: sql/alter2.4rc1.php:36
+msgid "None (will be set later)"
+msgstr ""
+
+#: sql/alter2.4rc1.php:71
+#, php-format
+msgid ""
+"Cannot update sys prefs setting:\n"
+"%s"
+msgstr ""