0000593,0001093: Prepayments made against orders implemented.
[fa-stable.git] / lang / new_language_template / LC_MESSAGES / empty.po
index 25f2331558e354c04dcbeda3872e75f8e64408e3..d81832e435d58bad5d2094f0b50fa9afc4e4fd67 100644 (file)
@@ -8,1772 +8,1879 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-29 20:42+0200\n"
+"POT-Creation-Date: 2012-06-16 10:52+0200\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-Transfer-Encoding: 8bit\n"
 
-#: /var/www/fa_unstable/devel/../frontaccounting.php:84
-#: /var/www/fa_unstable/devel/../frontaccounting.php:85
+#: ../frontaccounting.php:73
+#: ../frontaccounting.php:74
 msgid "Main  Menu"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../frontaccounting.php:86
-#: /var/www/fa_unstable/devel/../access/logout.php:17
-#: /var/www/fa_unstable/devel/../themes/default/renderer.php:42
-#: /var/www/fa_unstable/devel/../themes/default/renderer.php:69
+#: ../frontaccounting.php:75
+#: ../access/logout.php:18
+#: ../themes/default/renderer.php:52
+#: ../themes/default/renderer.php:78
 msgid "Logout"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../access/login.php:13
+#: ../access/login.php:13
 msgid "Restricted access"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../access/login.php:33
+#: ../access/login.php:27
 msgid "Login as user: demouser and password: password"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../access/login.php:37
+#: ../access/login.php:31
 msgid "Please login here"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../access/login.php:45
-#: /var/www/fa_unstable/devel/../access/login.php:75
+#: ../access/login.php:39
+#: ../access/login.php:69
 msgid "Authorization timeout"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../access/login.php:45
-#: /var/www/fa_unstable/devel/../access/login.php:82
+#: ../access/login.php:39
+#: ../access/login.php:76
 msgid "Login"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../access/login.php:82
-#: /var/www/fa_unstable/devel/../admin/inst_upgrade.php:180
+#: ../access/login.php:76
+#: ../admin/inst_upgrade.php:137
 msgid "Version"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../access/login.php:85
+#: ../access/login.php:79
 msgid "User name"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../access/login.php:89
-#: /var/www/fa_unstable/devel/../admin/change_current_user_password.php:78
-#: /var/www/fa_unstable/devel/../admin/users.php:191
+#: ../access/login.php:83
+#: ../admin/change_current_user_password.php:78
+#: ../admin/users.php:191
 msgid "Password:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../access/login.php:98
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:237
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:313
+#: ../access/login.php:92
+#: ../admin/create_coy.php:249
+#: ../admin/create_coy.php:331
+#: ../includes/sysnames.inc:194
 msgid "Company"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../access/login.php:107
+#: ../access/login.php:101
 msgid "Login -->"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../access/login.php:136
-#: /var/www/fa_unstable/devel/../admin/display_prefs.php:110
-#: /var/www/fa_unstable/devel/../themes/default/renderer.php:114
+#: ../access/login.php:132
+#: ../admin/display_prefs.php:111
+#: ../themes/default/renderer.php:123
 msgid "Theme:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../access/logout.php:28
+#: ../access/logout.php:29
 msgid "Thank you for using"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../access/logout.php:39
+#: ../access/logout.php:40
 msgid "Click here to Login Again."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/attachments.php:72
+#: ../admin/attachments.php:72
 msgid "Attach Documents"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/attachments.php:116
+#: ../admin/attachments.php:123
 msgid "Attachment has been inserted."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/attachments.php:122
+#: ../admin/attachments.php:129
 msgid "Attachment has been updated."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/attachments.php:134
+#: ../admin/attachments.php:141
 msgid "Attachment has been deleted."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/attachments.php:152
-#: /var/www/fa_unstable/devel/../admin/view_print_transaction.php:72
-#: /var/www/fa_unstable/devel/../gl/inquiry/journal_inquiry.php:47
-#: /var/www/fa_unstable/devel/../inventory/includes/item_adjustments_ui.inc:47
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_add_finished.php:196
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_costs.php:140
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:377
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:385
-#: /var/www/fa_unstable/devel/../manufacturing/includes/work_order_issue_ui.inc:157
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_allocation_inquiry.php:47
+#: ../admin/attachments.php:159
+#: ../admin/view_print_transaction.php:72
+#: ../gl/inquiry/journal_inquiry.php:47
+#: ../inventory/includes/item_adjustments_ui.inc:47
+#: ../manufacturing/work_order_add_finished.php:203
+#: ../manufacturing/work_order_costs.php:136
+#: ../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
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:47
 msgid "Type:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/attachments.php:164
-#: /var/www/fa_unstable/devel/../admin/view_print_transaction.php:126
-#: /var/www/fa_unstable/devel/../admin/void_transaction.php:160
-#: /var/www/fa_unstable/devel/../dimensions/inquiry/search_dimensions.php:127
-#: /var/www/fa_unstable/devel/../dimensions/view/view_dimension.php:54
-#: /var/www/fa_unstable/devel/../gl/bank_account_reconcile.php:234
-#: /var/www/fa_unstable/devel/../gl/inquiry/bank_inquiry.php:67
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_account_inquiry.php:125
-#: /var/www/fa_unstable/devel/../gl/inquiry/journal_inquiry.php:119
-#: /var/www/fa_unstable/devel/../gl/inquiry/journal_inquiry.php:132
-#: /var/www/fa_unstable/devel/../includes/ui/allocation_cart.inc:259
-#: /var/www/fa_unstable/devel/../inventory/inquiry/stock_movements.php:70
-#: /var/www/fa_unstable/devel/../manufacturing/search_work_orders.php:159
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:157
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:200
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:236
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:276
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:280
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:331
-#: /var/www/fa_unstable/devel/../purchasing/view/view_po.php:115
-#: /var/www/fa_unstable/devel/../purchasing/view/view_po.php:140
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search_completed.php:111
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search.php:125
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_allocation_inquiry.php:126
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_inquiry.php:163
-#: /var/www/fa_unstable/devel/../purchasing/allocations/supplier_allocation_main.php:95
-#: /var/www/fa_unstable/devel/../reporting/rep101.php:130
-#: /var/www/fa_unstable/devel/../reporting/rep201.php:118
-#: /var/www/fa_unstable/devel/../reporting/rep203.php:91
-#: /var/www/fa_unstable/devel/../reporting/rep601.php:76
-#: /var/www/fa_unstable/devel/../reporting/rep704.php:78
-#: /var/www/fa_unstable/devel/../reporting/rep704.php:81
-#: /var/www/fa_unstable/devel/../reporting/rep704.php:84
-#: /var/www/fa_unstable/devel/../reporting/rep710.php:76
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:108
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:116
-#: /var/www/fa_unstable/devel/../sales/allocations/customer_allocation_main.php:94
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:94
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:127
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:159
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_allocation_inquiry.php:142
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_inquiry.php:213
+#: ../admin/attachments.php:171
+#: ../admin/view_print_transaction.php:126
+#: ../admin/void_transaction.php:181
+#: ../dimensions/inquiry/search_dimensions.php:127
+#: ../dimensions/view/view_dimension.php:54
+#: ../gl/bank_account_reconcile.php:232
+#: ../gl/inquiry/bank_inquiry.php:70
+#: ../gl/inquiry/gl_account_inquiry.php:126
+#: ../gl/inquiry/journal_inquiry.php:127
+#: ../gl/inquiry/journal_inquiry.php:140
+#: ../includes/ui/allocation_cart.inc:264
+#: ../inventory/inquiry/stock_movements.php:77
+#: ../inventory/inquiry/stock_movements.php.orig:79
+#: ../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:120
+#: ../purchasing/inquiry/po_search_completed.php.orig:119
+#: ../purchasing/inquiry/po_search.php:130
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:126
+#: ../purchasing/inquiry/supplier_inquiry.php:174
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:171
+#: ../purchasing/allocations/supplier_allocation_main.php:95
+#: ../reporting/rep101.php:130
+#: ../reporting/rep201.php:118
+#: ../reporting/rep203.php:91
+#: ../reporting/rep601.php:76
+#: ../reporting/rep602.php:80
+#: ../reporting/rep704.php:79
+#: ../reporting/rep704.php:82
+#: ../reporting/rep704.php:85
+#: ../reporting/rep710.php:76
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:208
+#: ../reporting/includes/doctext.inc:246
+#: ../sales/allocations/customer_allocation_main.php:94
+#: ../sales/view/view_sales_order.php:109
+#: ../sales/view/view_sales_order.php:142
+#: ../sales/view/view_sales_order.php:179
+#: ../sales/view/view_sales_order.php.orig:96
+#: ../sales/view/view_sales_order.php.orig:129
+#: ../sales/view/view_sales_order.php.orig:161
+#: ../sales/inquiry/customer_allocation_inquiry.php:145
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:145
+#: ../sales/inquiry/customer_inquiry.php:201
+#: ../sales/inquiry/customer_inquiry.php.orig:225
 msgid "#"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/attachments.php:164
-#: /var/www/fa_unstable/devel/../admin/attachments.php:214
-#: /var/www/fa_unstable/devel/../admin/crm_categories.php:88
-#: /var/www/fa_unstable/devel/../admin/inst_upgrade.php:180
-#: /var/www/fa_unstable/devel/../admin/payment_terms.php:127
-#: /var/www/fa_unstable/devel/../admin/printers.php:84
-#: /var/www/fa_unstable/devel/../admin/print_profiles.php:148
-#: /var/www/fa_unstable/devel/../gl/inquiry/tax_inquiry.php:82
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:178
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:218
-#: /var/www/fa_unstable/devel/../includes/ui/view_package.php:22
-#: /var/www/fa_unstable/devel/../inventory/manage/item_codes.php:123
-#: /var/www/fa_unstable/devel/../inventory/manage/item_units.php:94
-#: /var/www/fa_unstable/devel/../inventory/manage/movement_types.php:95
-#: /var/www/fa_unstable/devel/../inventory/manage/sales_kits.php:40
-#: /var/www/fa_unstable/devel/../inventory/view/view_adjustment.php:56
-#: /var/www/fa_unstable/devel/../inventory/view/view_transfer.php:56
-#: /var/www/fa_unstable/devel/../manufacturing/manage/bom_edit.php:70
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:28
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:461
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:473
-#: /var/www/fa_unstable/devel/../purchasing/po_receive_items.php:58
-#: /var/www/fa_unstable/devel/../reporting/rep104.php:109
-#: /var/www/fa_unstable/devel/../reporting/rep105.php:112
-#: /var/www/fa_unstable/devel/../reporting/rep204.php:82
-#: /var/www/fa_unstable/devel/../reporting/rep303.php:109
-#: /var/www/fa_unstable/devel/../reporting/rep303.php:115
-#: /var/www/fa_unstable/devel/../reporting/rep304.php:114
-#: /var/www/fa_unstable/devel/../reporting/rep305.php:72
-#: /var/www/fa_unstable/devel/../reporting/rep401.php:69
-#: /var/www/fa_unstable/devel/../sales/create_recurrent_invoices.php:98
-#: /var/www/fa_unstable/devel/../sales/manage/credit_status.php:97
-#: /var/www/fa_unstable/devel/../sales/manage/recurrent_invoices.php:85
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:284
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:288
-#: /var/www/fa_unstable/devel/../taxes/tax_groups.php:146
-#: /var/www/fa_unstable/devel/../taxes/tax_types.php:115
+#: ../admin/attachments.php:171
+#: ../admin/attachments.php:221
+#: ../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:492
+#: ../purchasing/includes/ui/invoice_ui.inc:504
+#: ../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:112
+#: ../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:317
+#: ../sales/inquiry/sales_orders_view.php:321
+#: ../sales/inquiry/sales_orders_view.php.orig:294
+#: ../sales/inquiry/sales_orders_view.php.orig:298
+#: ../taxes/tax_groups.php:123
+#: ../taxes/tax_groups.php.orig:125
+#: ../taxes/tax_groups.php.sav:125
+#: ../taxes/tax_types.php:115
 msgid "Description"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/attachments.php:164
-#: /var/www/fa_unstable/devel/../admin/backups.php:60
-#: /var/www/fa_unstable/devel/../admin/backups.php:139
+#: ../admin/attachments.php:171
+#: ../admin/backups.php:63
+#: ../admin/backups.php:149
 msgid "Filename"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/attachments.php:164
+#: ../admin/attachments.php:171
 msgid "Size"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/attachments.php:164
+#: ../admin/attachments.php:171
 msgid "Filetype"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/attachments.php:164
+#: ../admin/attachments.php:171
 msgid "Date Uploaded"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/attachments.php:179
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:261
-#: /var/www/fa_unstable/devel/../admin/crm_categories.php:106
-#: /var/www/fa_unstable/devel/../admin/fiscalyears.php:158
-#: /var/www/fa_unstable/devel/../admin/inst_lang.php:100
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:217
-#: /var/www/fa_unstable/devel/../admin/payment_terms.php:142
-#: /var/www/fa_unstable/devel/../admin/printers.php:96
-#: /var/www/fa_unstable/devel/../admin/shipping_companies.php:106
-#: /var/www/fa_unstable/devel/../admin/tags.php:140
-#: /var/www/fa_unstable/devel/../admin/users.php:144
-#: /var/www/fa_unstable/devel/../dimensions/inquiry/search_dimensions.php:120
-#: /var/www/fa_unstable/devel/../gl/inquiry/journal_inquiry.php:111
-#: /var/www/fa_unstable/devel/../gl/manage/bank_accounts.php:126
-#: /var/www/fa_unstable/devel/../gl/manage/currencies.php:166
-#: /var/www/fa_unstable/devel/../gl/manage/exchange_rates.php:94
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_classes.php:131
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_types.php:148
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:188
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:285
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:158
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:122
-#: /var/www/fa_unstable/devel/../includes/ui/contacts_view.inc:61
-#: /var/www/fa_unstable/devel/../includes/ui/simple_crud_class.inc:52
-#: /var/www/fa_unstable/devel/../inventory/prices.php:145
-#: /var/www/fa_unstable/devel/../inventory/purchasing_data.php:144
-#: /var/www/fa_unstable/devel/../inventory/includes/item_adjustments_ui.inc:87
-#: /var/www/fa_unstable/devel/../inventory/includes/stock_transfers_ui.inc:79
-#: /var/www/fa_unstable/devel/../inventory/manage/item_categories.php:121
-#: /var/www/fa_unstable/devel/../inventory/manage/item_codes.php:138
-#: /var/www/fa_unstable/devel/../inventory/manage/item_units.php:110
-#: /var/www/fa_unstable/devel/../inventory/manage/locations.php:161
-#: /var/www/fa_unstable/devel/../inventory/manage/movement_types.php:106
-#: /var/www/fa_unstable/devel/../inventory/manage/sales_kits.php:55
-#: /var/www/fa_unstable/devel/../manufacturing/search_work_orders.php:109
-#: /var/www/fa_unstable/devel/../manufacturing/manage/bom_edit.php:86
-#: /var/www/fa_unstable/devel/../manufacturing/manage/work_centres.php:114
-#: /var/www/fa_unstable/devel/../manufacturing/includes/work_order_issue_ui.inc:58
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:510
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:240
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search_completed.php:96
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search.php:82
-#: /var/www/fa_unstable/devel/../sales/manage/credit_status.php:119
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:159
-#: /var/www/fa_unstable/devel/../sales/manage/recurrent_invoices.php:113
-#: /var/www/fa_unstable/devel/../sales/manage/sales_areas.php:103
-#: /var/www/fa_unstable/devel/../sales/manage/sales_groups.php:99
-#: /var/www/fa_unstable/devel/../sales/manage/sales_people.php:119
-#: /var/www/fa_unstable/devel/../sales/manage/sales_points.php:99
-#: /var/www/fa_unstable/devel/../sales/manage/sales_types.php:121
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_inquiry.php:186
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_deliveries_view.php:149
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:123
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_credit_ui.inc:197
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:208
-#: /var/www/fa_unstable/devel/../taxes/item_tax_types.php:134
-#: /var/www/fa_unstable/devel/../taxes/tax_groups.php:168
-#: /var/www/fa_unstable/devel/../taxes/tax_types.php:132
+#: ../admin/attachments.php:186
+#: ../admin/create_coy.php:273
+#: ../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:118
+#: ../gl/manage/bank_accounts.php:133
+#: ../gl/manage/currencies.php:164
+#: ../gl/manage/exchange_rates.php:94
+#: ../gl/manage/gl_account_classes.php:132
+#: ../gl/manage/gl_account_types.php:154
+#: ../gl/manage/gl_quick_entries.php:196
+#: ../gl/manage/gl_quick_entries.php:295
+#: ../gl/includes/ui/gl_bank_ui.inc:184
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:158
+#: ../gl/includes/ui/gl_journal_ui.inc:134
+#: ../includes/ui/contacts_view.inc:64
+#: ../includes/ui/simple_crud_class.inc:52
+#: ../includes/ui/ui_input.inc:956
+#: ../inventory/prices.php:145
+#: ../inventory/purchasing_data.php:146
+#: ../inventory/purchasing_data.php.orig:75
+#: ../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
+#: ../manufacturing/manage/work_centres.php:114
+#: ../manufacturing/includes/work_order_issue_ui.inc:58
+#: ../purchasing/includes/ui/invoice_ui.inc:542
+#: ../purchasing/includes/ui/po_ui.inc:273
+#: ../purchasing/inquiry/po_search_completed.php:105
+#: ../purchasing/inquiry/po_search_completed.php.orig:104
+#: ../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
+#: ../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/sales_deliveries_view.php:154
+#: ../sales/inquiry/sales_deliveries_view.php.orig:154
+#: ../sales/inquiry/sales_orders_view.php:136
+#: ../sales/inquiry/sales_orders_view.php.orig:127
+#: ../sales/includes/ui/sales_credit_ui.inc:197
+#: ../sales/includes/ui/sales_order_ui.inc:202
+#: ../sales/includes/ui/sales_order_ui.inc.orig:202
+#: ../taxes/item_tax_types.php:139
+#: ../taxes/tax_groups.php:137
+#: ../taxes/tax_groups.php.orig:139
+#: ../taxes/tax_groups.php.sav:139
+#: ../taxes/tax_types.php:132
 msgid "Edit"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/attachments.php:180
-#: /var/www/fa_unstable/devel/../gl/inquiry/journal_inquiry.php:127
+#: ../admin/attachments.php:187
+#: ../gl/inquiry/journal_inquiry.php:135
 msgid "View"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/attachments.php:181
+#: ../admin/attachments.php:188
 msgid "Download"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/attachments.php:182
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:262
-#: /var/www/fa_unstable/devel/../admin/crm_categories.php:110
-#: /var/www/fa_unstable/devel/../admin/fiscalyears.php:160
-#: /var/www/fa_unstable/devel/../admin/inst_chart.php:80
-#: /var/www/fa_unstable/devel/../admin/inst_lang.php:109
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:226
-#: /var/www/fa_unstable/devel/../admin/inst_theme.php:101
-#: /var/www/fa_unstable/devel/../admin/payment_terms.php:143
-#: /var/www/fa_unstable/devel/../admin/printers.php:97
-#: /var/www/fa_unstable/devel/../admin/shipping_companies.php:107
-#: /var/www/fa_unstable/devel/../admin/tags.php:141
-#: /var/www/fa_unstable/devel/../admin/users.php:146
-#: /var/www/fa_unstable/devel/../gl/gl_budget.php:137
-#: /var/www/fa_unstable/devel/../gl/manage/bank_accounts.php:127
-#: /var/www/fa_unstable/devel/../gl/manage/currencies.php:168
-#: /var/www/fa_unstable/devel/../gl/manage/exchange_rates.php:99
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_classes.php:132
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_types.php:149
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:189
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:286
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:160
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:124
-#: /var/www/fa_unstable/devel/../includes/ui/contacts_view.inc:64
-#: /var/www/fa_unstable/devel/../includes/ui/simple_crud_class.inc:54
-#: /var/www/fa_unstable/devel/../includes/ui/ui_input.inc:276
-#: /var/www/fa_unstable/devel/../inventory/prices.php:146
-#: /var/www/fa_unstable/devel/../inventory/purchasing_data.php:145
-#: /var/www/fa_unstable/devel/../inventory/includes/item_adjustments_ui.inc:89
-#: /var/www/fa_unstable/devel/../inventory/includes/stock_transfers_ui.inc:81
-#: /var/www/fa_unstable/devel/../inventory/manage/item_categories.php:122
-#: /var/www/fa_unstable/devel/../inventory/manage/item_codes.php:139
-#: /var/www/fa_unstable/devel/../inventory/manage/item_units.php:111
-#: /var/www/fa_unstable/devel/../inventory/manage/locations.php:162
-#: /var/www/fa_unstable/devel/../inventory/manage/movement_types.php:107
-#: /var/www/fa_unstable/devel/../inventory/manage/sales_kits.php:56
-#: /var/www/fa_unstable/devel/../manufacturing/manage/bom_edit.php:87
-#: /var/www/fa_unstable/devel/../manufacturing/manage/work_centres.php:115
-#: /var/www/fa_unstable/devel/../manufacturing/includes/work_order_issue_ui.inc:60
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:283
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:242
-#: /var/www/fa_unstable/devel/../sales/manage/credit_status.php:120
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:163
-#: /var/www/fa_unstable/devel/../sales/manage/recurrent_invoices.php:114
-#: /var/www/fa_unstable/devel/../sales/manage/sales_areas.php:104
-#: /var/www/fa_unstable/devel/../sales/manage/sales_groups.php:100
-#: /var/www/fa_unstable/devel/../sales/manage/sales_people.php:120
-#: /var/www/fa_unstable/devel/../sales/manage/sales_points.php:100
-#: /var/www/fa_unstable/devel/../sales/manage/sales_types.php:122
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_credit_ui.inc:199
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:210
-#: /var/www/fa_unstable/devel/../taxes/item_tax_types.php:135
-#: /var/www/fa_unstable/devel/../taxes/tax_groups.php:169
-#: /var/www/fa_unstable/devel/../taxes/tax_types.php:133
+#: ../admin/attachments.php:189
+#: ../admin/create_coy.php:274
+#: ../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:134
+#: ../gl/manage/currencies.php:166
+#: ../gl/manage/exchange_rates.php:99
+#: ../gl/manage/gl_account_classes.php:133
+#: ../gl/manage/gl_account_types.php:155
+#: ../gl/manage/gl_quick_entries.php:197
+#: ../gl/manage/gl_quick_entries.php:296
+#: ../gl/includes/ui/gl_bank_ui.inc:186
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:160
+#: ../gl/includes/ui/gl_journal_ui.inc:136
+#: ../includes/ui/contacts_view.inc:67
+#: ../includes/ui/simple_crud_class.inc:54
+#: ../includes/ui/ui_input.inc:285
+#: ../inventory/prices.php:146
+#: ../inventory/purchasing_data.php:147
+#: ../inventory/purchasing_data.php.orig:80
+#: ../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
+#: ../manufacturing/manage/work_centres.php:115
+#: ../manufacturing/includes/work_order_issue_ui.inc:60
+#: ../purchasing/includes/ui/invoice_ui.inc:304
+#: ../purchasing/includes/ui/po_ui.inc:275
+#: ../sales/manage/credit_status.php:120
+#: ../sales/manage/customer_branches.php:163
+#: ../sales/manage/recurrent_invoices.php:131
+#: ../sales/manage/sales_areas.php:104
+#: ../sales/manage/sales_groups.php:100
+#: ../sales/manage/sales_people.php:120
+#: ../sales/manage/sales_points.php:100
+#: ../sales/manage/sales_types.php:122
+#: ../sales/includes/ui/sales_credit_ui.inc:199
+#: ../sales/includes/ui/sales_order_ui.inc:204
+#: ../sales/includes/ui/sales_order_ui.inc.orig:204
+#: ../taxes/item_tax_types.php:140
+#: ../taxes/tax_groups.php:138
+#: ../taxes/tax_groups.php.orig:140
+#: ../taxes/tax_groups.php.sav:140
+#: ../taxes/tax_types.php:133
 msgid "Delete"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/attachments.php:208
-#: /var/www/fa_unstable/devel/../admin/attachments.php:213
+#: ../admin/attachments.php:215
+#: ../admin/attachments.php:220
 msgid "Transaction #"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/attachments.php:215
+#: ../admin/attachments.php:222
 msgid "Attached File"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/backups.php:21
-#: /var/www/fa_unstable/devel/../admin/backups.php:111
+#: ../admin/backups.php:21
+#: ../admin/backups.php:40
+#: ../admin/backups.php:114
+#: ../admin/backups.php:142
+#: ../admin/backups.php:155
+#: ../admin/backups.php:173
 msgid "Select backup file first."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/backups.php:40
+#: ../admin/backups.php:43
 msgid "Backup and Restore Database"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/backups.php:47
+#: ../admin/backups.php:50
 msgid "Backup paths have not been set correctly."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/backups.php:48
+#: ../admin/backups.php:51
 msgid "Please contact System Administrator."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/backups.php:49
+#: ../admin/backups.php:52
 msgid "cannot find backup directory"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/backups.php:59
+#: ../admin/backups.php:62
 msgid "Backup successfully generated."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/backups.php:62
+#: ../admin/backups.php:65
 msgid "Database backup failed."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/backups.php:95
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:249
-#: /var/www/fa_unstable/devel/../admin/fiscalyears.php:149
-#: /var/www/fa_unstable/devel/../admin/inst_lang.php:85
-#: /var/www/fa_unstable/devel/../admin/inst_lang.php:97
-#: /var/www/fa_unstable/devel/../dimensions/inquiry/search_dimensions.php:107
-#: /var/www/fa_unstable/devel/../gl/manage/bank_accounts.php:123
-#: /var/www/fa_unstable/devel/../gl/manage/currencies.php:164
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_classes.php:126
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:223
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:38
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:113
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:126
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:1628
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:123
-#: /var/www/fa_unstable/devel/../reporting/rep101.php:126
-#: /var/www/fa_unstable/devel/../reporting/rep102.php:106
-#: /var/www/fa_unstable/devel/../reporting/rep104.php:103
-#: /var/www/fa_unstable/devel/../reporting/rep106.php:73
-#: /var/www/fa_unstable/devel/../reporting/rep201.php:114
-#: /var/www/fa_unstable/devel/../reporting/rep202.php:108
-#: /var/www/fa_unstable/devel/../reporting/rep203.php:87
-#: /var/www/fa_unstable/devel/../reporting/rep303.php:101
-#: /var/www/fa_unstable/devel/../reporting/rep303.php:105
-#: /var/www/fa_unstable/devel/../reporting/rep501.php:109
-#: /var/www/fa_unstable/devel/../sales/manage/sales_points.php:94
-#: /var/www/fa_unstable/devel/../sales/manage/sales_points.php:95
-#: /var/www/fa_unstable/devel/../sales/manage/sales_types.php:119
-#: /var/www/fa_unstable/devel/../taxes/item_tax_types.php:124
-#: /var/www/fa_unstable/devel/../taxes/tax_groups.php:161
+#: ../admin/backups.php:98
+#: ../admin/create_coy.php:261
+#: ../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:130
+#: ../gl/manage/currencies.php:162
+#: ../gl/manage/gl_account_classes.php:127
+#: ../gl/manage/gl_quick_entries.php:230
+#: ../includes/system_tests.inc:38
+#: ../includes/system_tests.inc:113
+#: ../includes/system_tests.inc:126
+#: ../includes/ui/ui_lists.inc:1674
+#: ../includes/ui/ui_lists.inc.orig:1672
+#: ../purchasing/manage/suppliers.php:122
+#: ../purchasing/manage/suppliers.php.orig:132
+#: ../reporting/rep101.php:126
+#: ../reporting/rep102.php:112
+#: ../reporting/rep102.php:114
+#: ../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
+#: ../sales/manage/sales_points.php:94
+#: ../sales/manage/sales_points.php:95
+#: ../sales/manage/sales_types.php:119
+#: ../taxes/item_tax_types.php:129
 msgid "No"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/backups.php:133
+#: ../admin/backups.php:139
 msgid "Restore backup completed."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/backups.php:138
+#: ../admin/backups.php:148
 msgid "File successfully deleted."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/backups.php:143
+#: ../admin/backups.php:153
 msgid "Can't delete backup file."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/backups.php:152
+#: ../admin/backups.php:165
 msgid "You can only upload *.sql backup files"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/backups.php:158
+#: ../admin/backups.php:171
 msgid "File was not uploaded into the system."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/backups.php:164
+#: ../admin/backups.php:180
 msgid "Create backup"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/backups.php:165
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:583
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:631
+#: ../admin/backups.php:181
+#: ../sales/includes/ui/sales_order_ui.inc:589
+#: ../sales/includes/ui/sales_order_ui.inc:645
+#: ../sales/includes/ui/sales_order_ui.inc.orig:589
+#: ../sales/includes/ui/sales_order_ui.inc.orig:637
 msgid "Comments:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/backups.php:166
+#: ../admin/backups.php:182
 msgid "Compression:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/backups.php:168
+#: ../admin/backups.php:184
 msgid "Create Backup"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/backups.php:170
+#: ../admin/backups.php:186
 msgid "Backup scripts maintenance"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/backups.php:176
+#: ../admin/backups.php:192
 msgid "View Backup"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/backups.php:177
+#: ../admin/backups.php:193
 msgid "Download Backup"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/backups.php:178
+#: ../admin/backups.php:194
 msgid "Restore Backup"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/backups.php:179
+#: ../admin/backups.php:195
 msgid ""
 "You are about to restore database from backup file.\n"
 "Do you want to continue?"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/backups.php:181
+#: ../admin/backups.php:197
 msgid "Delete Backup"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/backups.php:183
+#: ../admin/backups.php:199
 #, php-format
 msgid ""
 "You are about to remove selected backup file.\n"
 "Do you want to continue ?"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/backups.php:189
+#: ../admin/backups.php:205
 msgid "Upload file"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/change_current_user_password.php:16
-#: /var/www/fa_unstable/devel/../admin/change_current_user_password.php:85
-#: /var/www/fa_unstable/devel/../themes/default/renderer.php:63
+#: ../admin/change_current_user_password.php:16
+#: ../admin/change_current_user_password.php:85
+#: ../themes/default/renderer.php:72
 msgid "Change password"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/change_current_user_password.php:28
-#: /var/www/fa_unstable/devel/../admin/users.php:40
+#: ../admin/change_current_user_password.php:28
+#: ../admin/users.php:40
 msgid "The password entered must be at least 4 characters long."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/change_current_user_password.php:35
-#: /var/www/fa_unstable/devel/../admin/users.php:47
+#: ../admin/change_current_user_password.php:35
+#: ../admin/users.php:47
 msgid "The password cannot contain the user login."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/change_current_user_password.php:42
+#: ../admin/change_current_user_password.php:42
 msgid "The passwords entered are not the same."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/change_current_user_password.php:56
+#: ../admin/change_current_user_password.php:56
 msgid "Password cannot be changed in demo mode."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/change_current_user_password.php:61
+#: ../admin/change_current_user_password.php:61
 msgid "Your password has been updated."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/change_current_user_password.php:73
-#: /var/www/fa_unstable/devel/../admin/users.php:180
+#: ../admin/change_current_user_password.php:73
+#: ../admin/users.php:180
 msgid "User login:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/change_current_user_password.php:79
+#: ../admin/change_current_user_password.php:79
 msgid "Repeat password:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/change_current_user_password.php:81
+#: ../admin/change_current_user_password.php:81
 msgid "Enter your new password in the fields."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:16
-#: /var/www/fa_unstable/devel/../applications/setup.php:18
+#: ../admin/company_preferences.php:16
+#: ../applications/setup.php:18
 msgid "Company Setup"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:31
+#: ../admin/company_preferences.php:31
 msgid "Login timeout must be positive number not less than 10."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:38
+#: ../admin/company_preferences.php:38
 msgid "The company name must be entered."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:55
+#: ../admin/company_preferences.php:54
 msgid ""
 "Only jpg and png files are supported - a file extension of .jpg or .png is "
 "expected"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:60
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:74
+#: ../admin/company_preferences.php:59
+#: ../inventory/manage/items.php:87
+#: ../inventory/manage/items.php.orig:85
 msgid ""
 "The file size is over the maximum allowed. The maximum size allowed in KB is"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:65
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:79
+#: ../admin/company_preferences.php:64
+#: ../inventory/manage/items.php:77
+#: ../inventory/manage/items.php:92
+#: ../inventory/manage/items.php.orig:75
 msgid "Only graphics files can be uploaded"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:73
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:94
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:87
+#: ../admin/company_preferences.php:72
+#: ../admin/company_preferences.php:93
+#: ../inventory/manage/items.php:100
+#: ../inventory/manage/items.php.orig:93
 msgid "The existing image could not be removed"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:83
+#: ../admin/company_preferences.php:82
 msgid "Error uploading logo file"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:117
+#: ../admin/company_preferences.php:115
 msgid "Company setup has been updated."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:161
+#: ../admin/company_preferences.php:159
 msgid "Name (to appear on reports):"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:162
-#: /var/www/fa_unstable/devel/../admin/shipping_companies.php:142
-#: /var/www/fa_unstable/devel/../includes/ui/contacts_view.inc:98
-#: /var/www/fa_unstable/devel/../inventory/manage/locations.php:202
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:203
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:622
+#: ../admin/company_preferences.php:160
+#: ../admin/shipping_companies.php:142
+#: ../includes/ui/contacts_view.inc:109
+#: ../inventory/manage/locations.php:202
+#: ../sales/manage/customers.php:231
+#: ../sales/manage/sav.customers.php:231
+#: ../sales/includes/ui/sales_order_ui.inc:636
+#: ../sales/includes/ui/sales_order_ui.inc.orig:628
 msgid "Address:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:163
+#: ../admin/company_preferences.php:161
 msgid "Domicile:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:165
-#: /var/www/fa_unstable/devel/../admin/shipping_companies.php:138
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:105
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:261
+#: ../admin/company_preferences.php:163
+#: ../admin/shipping_companies.php:138
+#: ../purchasing/manage/suppliers.php:135
+#: ../purchasing/manage/suppliers.php.orig:114
+#: ../sales/manage/customer_branches.php:262
 msgid "Phone Number:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:166
-#: /var/www/fa_unstable/devel/../includes/ui/contacts_view.inc:93
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:107
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:263
+#: ../admin/company_preferences.php:164
+#: ../includes/ui/contacts_view.inc:104
+#: ../purchasing/manage/suppliers.php:138
+#: ../purchasing/manage/suppliers.php.orig:116
+#: ../sales/manage/customer_branches.php:264
+#: ../sales/manage/customers.php:254
+#: ../sales/manage/sav.customers.php:254
 msgid "Fax Number:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:167
-#: /var/www/fa_unstable/devel/../admin/users.php:202
+#: ../admin/company_preferences.php:165
+#: ../admin/users.php:202
 msgid "Email Address:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:169
+#: ../admin/company_preferences.php:167
 msgid "Official Company Number:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:170
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:88
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:205
+#: ../admin/company_preferences.php:168
+#: ../purchasing/manage/suppliers.php:96
+#: ../purchasing/manage/suppliers.php.orig:97
+#: ../sales/manage/customers.php:233
+#: ../sales/manage/sav.customers.php:233
 msgid "GSTNo:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:172
+#: ../admin/company_preferences.php:170
 msgid "Home Currency:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:173
-#: /var/www/fa_unstable/devel/../gl/gl_budget.php:63
+#: ../admin/company_preferences.php:171
+#: ../gl/gl_budget.php:63
 msgid "Fiscal Year:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:174
+#: ../admin/company_preferences.php:172
 msgid "Tax Periods:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:174
+#: ../admin/company_preferences.php:172
 msgid "Months."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:175
+#: ../admin/company_preferences.php:173
 msgid "Tax Last Period:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:175
+#: ../admin/company_preferences.php:173
 msgid "Months back."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:179
+#: ../admin/company_preferences.php:177
 msgid "Company Logo:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:180
+#: ../admin/company_preferences.php:178
 msgid "New Company Logo (.jpg)"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:181
+#: ../admin/company_preferences.php:179
 msgid "Delete Company Logo:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:183
+#: ../admin/company_preferences.php:181
 msgid "Use Dimensions:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:184
+#: ../admin/company_preferences.php:182
 msgid "Base for auto price calculations:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:185
+#: ../admin/company_preferences.php:183
 msgid "No base price list"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:186
+#: ../admin/company_preferences.php:184
 msgid "Add Price from Std Cost:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:188
+#: ../admin/company_preferences.php:186
 msgid "Round to nearest:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:191
+#: ../admin/company_preferences.php:189
 msgid "Search Item List"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:192
+#: ../admin/company_preferences.php:190
 msgid "Search Customer List"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:193
+#: ../admin/company_preferences.php:191
 msgid "Search Supplier List"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:195
+#: ../admin/company_preferences.php:193
 msgid "Automatic Revaluation Currency Accounts"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:196
+#: ../admin/company_preferences.php:194
 msgid "Time Zone on Reports"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:197
+#: ../admin/company_preferences.php:195
 msgid "Login Timeout:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:197
+#: ../admin/company_preferences.php:195
 msgid "seconds"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:198
+#: ../admin/company_preferences.php:196
 msgid "Version Id"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/company_preferences.php:203
-#: /var/www/fa_unstable/devel/../admin/display_prefs.php:141
-#: /var/www/fa_unstable/devel/../admin/forms_setup.php:61
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:203
-#: /var/www/fa_unstable/devel/../admin/inst_chart.php:74
-#: /var/www/fa_unstable/devel/../admin/inst_lang.php:103
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:220
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:238
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:282
-#: /var/www/fa_unstable/devel/../admin/inst_theme.php:95
-#: /var/www/fa_unstable/devel/../dimensions/dimension_entry.php:293
-#: /var/www/fa_unstable/devel/../gl/gl_bank.php:410
-#: /var/www/fa_unstable/devel/../gl/gl_budget.php:135
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:60
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:249
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:221
-#: /var/www/fa_unstable/devel/../includes/ui/db_pager_view.inc:174
-#: /var/www/fa_unstable/devel/../includes/ui/simple_crud_class.inc:56
-#: /var/www/fa_unstable/devel/../includes/ui/simple_crud_class.inc:227
-#: /var/www/fa_unstable/devel/../includes/ui/ui_input.inc:203
-#: /var/www/fa_unstable/devel/../includes/ui/ui_input.inc:889
-#: /var/www/fa_unstable/devel/../inventory/adjustments.php:233
-#: /var/www/fa_unstable/devel/../inventory/cost_update.php:125
-#: /var/www/fa_unstable/devel/../inventory/reorder_level.php:97
-#: /var/www/fa_unstable/devel/../inventory/transfers.php:236
-#: /var/www/fa_unstable/devel/../inventory/includes/item_adjustments_ui.inc:157
-#: /var/www/fa_unstable/devel/../inventory/includes/stock_transfers_ui.inc:137
-#: /var/www/fa_unstable/devel/../inventory/manage/sales_kits.php:208
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:457
-#: /var/www/fa_unstable/devel/../manufacturing/includes/work_order_issue_ui.inc:127
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:273
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:408
-#: /var/www/fa_unstable/devel/../purchasing/po_receive_items.php:322
-#: /var/www/fa_unstable/devel/../sales/credit_note_entry.php:278
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:391
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:521
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:553
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:312
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_credit_ui.inc:290
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:243
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:551
+#: ../admin/company_preferences.php:201
+#: ../admin/display_prefs.php:144
+#: ../admin/forms_setup.php:61
+#: ../admin/gl_setup.php:235
+#: ../admin/gl_setup.php.orig:231
+#: ../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:403
+#: ../gl/gl_budget.php:135
+#: ../gl/manage/gl_quick_entries.php:60
+#: ../gl/includes/ui/gl_bank_ui.inc:275
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:249
+#: ../gl/includes/ui/gl_journal_ui.inc:257
+#: ../includes/ui/db_pager_view.inc:174
+#: ../includes/ui/simple_crud_class.inc:56
+#: ../includes/ui/simple_crud_class.inc:227
+#: ../includes/ui/ui_input.inc:207
+#: ../includes/ui/ui_input.inc:901
+#: ../inventory/adjustments.php:235
+#: ../inventory/cost_update.php:116
+#: ../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:306
+#: ../purchasing/includes/ui/po_ui.inc:457
+#: ../purchasing/po_receive_items.php:331
+#: ../sales/credit_note_entry.php:282
+#: ../sales/customer_credit_invoice.php:382
+#: ../sales/customer_delivery.php:531
+#: ../sales/customer_invoice.php:682
+#: ../sales/inquiry/sales_orders_view.php:349
+#: ../sales/inquiry/sales_orders_view.php.orig:322
+#: ../sales/includes/ui/sales_credit_ui.inc:293
+#: ../sales/includes/ui/sales_order_ui.inc:237
+#: ../sales/includes/ui/sales_order_ui.inc:555
+#: ../sales/includes/ui/sales_order_ui.inc.orig:237
+#: ../sales/includes/ui/sales_order_ui.inc.orig:555
 msgid "Update"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:21
+#: ../admin/create_coy.php:21
 msgid "Create/Update Company"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:53
+#: ../admin/create_coy.php:46
+#: ../admin/create_coy.php:52
+msgid "Database settings are not specified."
+msgstr ""
+
+#: ../admin/create_coy.php:62
 msgid "This database settings are already used by another company."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:58
+#: ../admin/create_coy.php:67
 msgid ""
 "You cannot have table set without prefix together with prefixed sets in the "
 "same database."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:116
+#: ../admin/create_coy.php:127
 msgid "Error creating Database: "
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:116
+#: ../admin/create_coy.php:127
 msgid ", Please create it manually"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:120
+#: ../admin/create_coy.php:131
 msgid "Cannot create new company due to bugs in sql file."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:133
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:200
+#: ../admin/create_coy.php:145
+#: ../admin/create_coy.php:212
 msgid "Cannot open the configuration file - "
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:135
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:202
+#: ../admin/create_coy.php:147
+#: ../admin/create_coy.php:214
 msgid "Cannot write to the configuration file - "
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:137
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:173
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:204
+#: ../admin/create_coy.php:149
+#: ../admin/create_coy.php:185
+#: ../admin/create_coy.php:216
 msgid "The configuration file "
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:137
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:173
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:204
-#: /var/www/fa_unstable/devel/../admin/db/maintenance_db.inc:248
+#: ../admin/create_coy.php:149
+#: ../admin/create_coy.php:185
+#: ../admin/create_coy.php:216
+#: ../admin/db/maintenance_db.inc:250
+#: ../admin/db/maintenance_db.inc.orig:248
 msgid ""
 " is not writable. Change its permissions so it is, then re-run the operation."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:149
+#: ../admin/create_coy.php:161
 msgid "New company has been created."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:149
+#: ../admin/create_coy.php:161
 msgid "Company has been updated."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:166
+#: ../admin/create_coy.php:178
 msgid ""
 "Broken company subdirectories system. You have to remove this company "
 "manually."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:182
+#: ../admin/create_coy.php:194
 msgid "Cannot rename subdirectory to temporary name."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:188
+#: ../admin/create_coy.php:200
 msgid "Cannot rename company subdirectory"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:194
+#: ../admin/create_coy.php:206
 msgid "Error removing Database: "
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:194
+#: ../admin/create_coy.php:206
 msgid ", please remove it manually"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:213
+#: ../admin/create_coy.php:225
 msgid "Cannot remove temporary renamed company data directory "
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:216
+#: ../admin/create_coy.php:228
 msgid "Selected company has been deleted"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:230
+#: ../admin/create_coy.php:242
 msgid "Are you sure you want to delete company no. "
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:237
+#: ../admin/create_coy.php:249
 msgid "Database Host"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:237
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:315
+#: ../admin/create_coy.php:249
+#: ../admin/create_coy.php:336
+#: ../admin/create_coy.php:342
 msgid "Database User"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:238
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:318
+#: ../admin/create_coy.php:250
+#: ../admin/create_coy.php:338
+#: ../admin/create_coy.php:343
 msgid "Database Name"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:238
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:320
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:322
+#: ../admin/create_coy.php:250
+#: ../admin/create_coy.php:339
+#: ../admin/create_coy.php:344
 msgid "Table Pref"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:238
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:323
-#: /var/www/fa_unstable/devel/../admin/inst_lang.php:36
-#: /var/www/fa_unstable/devel/../admin/print_profiles.php:162
+#: ../admin/create_coy.php:250
+#: ../admin/create_coy.php:346
+#: ../admin/inst_lang.php:36
+#: ../admin/print_profiles.php:162
 msgid "Default"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:247
-#: /var/www/fa_unstable/devel/../admin/fiscalyears.php:153
-#: /var/www/fa_unstable/devel/../admin/inst_lang.php:85
-#: /var/www/fa_unstable/devel/../admin/inst_lang.php:97
-#: /var/www/fa_unstable/devel/../dimensions/inquiry/search_dimensions.php:107
-#: /var/www/fa_unstable/devel/../gl/manage/bank_accounts.php:121
-#: /var/www/fa_unstable/devel/../gl/manage/currencies.php:164
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_classes.php:126
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:223
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:38
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:113
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:126
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:1629
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:123
-#: /var/www/fa_unstable/devel/../reporting/rep101.php:125
-#: /var/www/fa_unstable/devel/../reporting/rep102.php:105
-#: /var/www/fa_unstable/devel/../reporting/rep104.php:105
-#: /var/www/fa_unstable/devel/../reporting/rep106.php:75
-#: /var/www/fa_unstable/devel/../reporting/rep201.php:113
-#: /var/www/fa_unstable/devel/../reporting/rep202.php:107
-#: /var/www/fa_unstable/devel/../reporting/rep203.php:86
-#: /var/www/fa_unstable/devel/../reporting/rep303.php:96
-#: /var/www/fa_unstable/devel/../reporting/rep303.php:104
-#: /var/www/fa_unstable/devel/../reporting/rep501.php:107
-#: /var/www/fa_unstable/devel/../sales/manage/sales_points.php:94
-#: /var/www/fa_unstable/devel/../sales/manage/sales_points.php:95
-#: /var/www/fa_unstable/devel/../sales/manage/sales_types.php:119
-#: /var/www/fa_unstable/devel/../taxes/item_tax_types.php:128
-#: /var/www/fa_unstable/devel/../taxes/tax_groups.php:159
+#: ../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:128
+#: ../gl/manage/currencies.php:162
+#: ../gl/manage/gl_account_classes.php:127
+#: ../gl/manage/gl_quick_entries.php:230
+#: ../includes/system_tests.inc:38
+#: ../includes/system_tests.inc:113
+#: ../includes/system_tests.inc:126
+#: ../includes/ui/ui_lists.inc:1675
+#: ../includes/ui/ui_lists.inc.orig:1673
+#: ../purchasing/manage/suppliers.php:122
+#: ../purchasing/manage/suppliers.php.orig:132
+#: ../reporting/rep101.php:125
+#: ../reporting/rep102.php:111
+#: ../reporting/rep102.php:113
+#: ../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
+#: ../sales/manage/sales_points.php:94
+#: ../sales/manage/sales_points.php:95
+#: ../sales/manage/sales_types.php:119
+#: ../taxes/item_tax_types.php:133
 msgid "Yes"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:275
+#: ../admin/create_coy.php:288
 msgid "The marked company is the current company which cannot be deleted."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:314
-#: /var/www/fa_unstable/devel/../admin/printers.php:84
+#: ../admin/create_coy.php:335
+#: ../admin/create_coy.php:341
+#: ../admin/printers.php:84
 msgid "Host"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:317
+#: ../admin/create_coy.php:337
 msgid "Database Password"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:320
-#: /var/www/fa_unstable/devel/../admin/inst_chart.php:68
-#: /var/www/fa_unstable/devel/../admin/inst_chart.php:70
-#: /var/www/fa_unstable/devel/../admin/inst_lang.php:87
-#: /var/www/fa_unstable/devel/../admin/inst_lang.php:90
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:212
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:214
-#: /var/www/fa_unstable/devel/../admin/inst_theme.php:90
-#: /var/www/fa_unstable/devel/../admin/inst_theme.php:92
-#: /var/www/fa_unstable/devel/../admin/inst_upgrade.php:192
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_types.php:184
-#: /var/www/fa_unstable/devel/../includes/ui/allocation_cart.inc:281
-#: /var/www/fa_unstable/devel/../taxes/tax_groups.php:221
+#: ../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:190
+#: ../includes/ui/allocation_cart.inc:288
 msgid "None"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:325
+#: ../admin/create_coy.php:350
 msgid "Database Script"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:327
+#: ../admin/create_coy.php:351
 msgid "New script Admin Password"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:330
-#: /var/www/fa_unstable/devel/../gl/gl_budget.php:136
+#: ../admin/create_coy.php:355
+#: ../gl/gl_budget.php:136
 msgid "Save"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/create_coy.php:354
+#: ../admin/create_coy.php:377
 msgid "Create a new company"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/crm_categories.php:17
+#: ../admin/crm_categories.php:17
 msgid "Contact Categories"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/crm_categories.php:31
+#: ../admin/crm_categories.php:31
 msgid "Category description cannot be empty."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/crm_categories.php:41
+#: ../admin/crm_categories.php:41
 msgid "Selected contact category has been updated"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/crm_categories.php:47
+#: ../admin/crm_categories.php:47
 msgid "New contact category has been added"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/crm_categories.php:62
+#: ../admin/crm_categories.php:62
 msgid "Cannot delete this category because there are contacts related to it."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/crm_categories.php:68
+#: ../admin/crm_categories.php:68
 msgid "Category has been deleted"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/crm_categories.php:88
+#: ../admin/crm_categories.php:88
 msgid "Type id"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/crm_categories.php:88
+#: ../admin/crm_categories.php:88
 msgid "Action id"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/crm_categories.php:88
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:294
+#: ../admin/crm_categories.php:88
+#: ../sales/manage/customer_branches.php:295
 msgid "Short Name"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/crm_categories.php:135
-#: /var/www/fa_unstable/devel/../admin/crm_categories.php:139
+#: ../admin/crm_categories.php:135
+#: ../admin/crm_categories.php:139
 msgid "Contact Category Type:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/crm_categories.php:136
-#: /var/www/fa_unstable/devel/../admin/crm_categories.php:140
+#: ../admin/crm_categories.php:136
+#: ../admin/crm_categories.php:140
 msgid "Contact Category Subtype:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/crm_categories.php:143
+#: ../admin/crm_categories.php:143
 msgid "Category Short Name:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/crm_categories.php:144
+#: ../admin/crm_categories.php:144
 msgid "Category Description:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/display_prefs.php:16
+#: ../admin/display_prefs.php:16
 msgid "Display Setup"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/display_prefs.php:30
+#: ../admin/display_prefs.php:30
 msgid "Query size must be integer and greater than zero."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/display_prefs.php:58
+#: ../admin/display_prefs.php:59
 msgid ""
 "Display settings have been updated. Keep in mind that changed settings are "
 "restored on every login in demo mode."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/display_prefs.php:60
+#: ../admin/display_prefs.php:61
 msgid "Display settings have been updated."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/display_prefs.php:69
+#: ../admin/display_prefs.php:70
 msgid "Decimal Places"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/display_prefs.php:71
+#: ../admin/display_prefs.php:72
 msgid "Prices/Amounts:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/display_prefs.php:72
+#: ../admin/display_prefs.php:73
 msgid "Quantities:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/display_prefs.php:73
+#: ../admin/display_prefs.php:74
 msgid "Exchange Rates:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/display_prefs.php:74
+#: ../admin/display_prefs.php:75
 msgid "Percentages:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/display_prefs.php:76
+#: ../admin/display_prefs.php:77
 msgid "Dateformat and Separators"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/display_prefs.php:78
+#: ../admin/display_prefs.php:79
 msgid "Dateformat:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/display_prefs.php:80
+#: ../admin/display_prefs.php:81
 msgid "Date Separator:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/display_prefs.php:85
+#: ../admin/display_prefs.php:86
 msgid "Thousand Separator:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/display_prefs.php:90
+#: ../admin/display_prefs.php:91
 msgid "Decimal Separator:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/display_prefs.php:97
-#: /var/www/fa_unstable/devel/../admin/inst_lang.php:35
+#: ../admin/display_prefs.php:98
+#: ../admin/inst_lang.php:35
 msgid "Language"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/display_prefs.php:99
-#: /var/www/fa_unstable/devel/../admin/users.php:206
+#: ../admin/display_prefs.php:100
+#: ../admin/users.php:206
 msgid "Language:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/display_prefs.php:102
-#: /var/www/fa_unstable/devel/../applications/setup.php:42
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:68
+#: ../admin/display_prefs.php:103
+#: ../applications/setup.php:42
+#: ../includes/sysnames.inc:94
 msgid "Miscellaneous"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/display_prefs.php:104
+#: ../admin/display_prefs.php:105
 msgid "Show hints for new users:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/display_prefs.php:106
+#: ../admin/display_prefs.php:107
 msgid "Show GL Information:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/display_prefs.php:108
+#: ../admin/display_prefs.php:109
 msgid "Show Item Codes:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/display_prefs.php:115
+#: ../admin/display_prefs.php:116
 msgid "Page Size:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/display_prefs.php:117
+#: ../admin/display_prefs.php:118
 msgid "Start-up Tab"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/display_prefs.php:125
-#: /var/www/fa_unstable/devel/../admin/users.php:210
+#: ../admin/display_prefs.php:126
+#: ../admin/users.php:210
 msgid "Printing profile"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/display_prefs.php:126
-#: /var/www/fa_unstable/devel/../admin/users.php:211
+#: ../admin/display_prefs.php:127
+#: ../admin/users.php:211
 msgid "Browser printing support"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/display_prefs.php:128
+#: ../admin/display_prefs.php:129
 msgid "Use popup window to display reports:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/display_prefs.php:129
-#: /var/www/fa_unstable/devel/../admin/users.php:214
+#: ../admin/display_prefs.php:130
+#: ../admin/users.php:214
 msgid "Set this option to on if your browser directly supports pdf files"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/display_prefs.php:131
+#: ../admin/display_prefs.php:132
 msgid "Use icons instead of text links:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/display_prefs.php:132
+#: ../admin/display_prefs.php:133
 msgid "Set this option to on for using icons instead of text links"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/display_prefs.php:134
+#: ../admin/display_prefs.php:135
 msgid "Query page size:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/display_prefs.php:136
+#: ../admin/display_prefs.php:137
 msgid "Remember last document date:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/display_prefs.php:137
+#: ../admin/display_prefs.php:138
 msgid ""
 "If set document date is remembered on subsequent documents, otherwise "
 "default is current date"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/fiscalyears.php:25
+#: ../admin/display_prefs.php:140
+msgid "Transaction days:"
+msgstr ""
+
+#: ../admin/fiscalyears.php:25
 msgid "Fiscal Years"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/fiscalyears.php:34
+#: ../admin/fiscalyears.php:34
 msgid "Invalid BEGIN date in fiscal year."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/fiscalyears.php:40
+#: ../admin/fiscalyears.php:40
 msgid "Invalid END date in fiscal year."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/fiscalyears.php:46
+#: ../admin/fiscalyears.php:46
+msgid "Invalid BEGIN or END date in fiscal year."
+msgstr ""
+
+#: ../admin/fiscalyears.php:52
 msgid "BEGIN date bigger than END date."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/fiscalyears.php:64
+#: ../admin/fiscalyears.php:70
 msgid "Cannot CLOSE this year because there are open fiscal years before"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/fiscalyears.php:75
+#: ../admin/fiscalyears.php:81
 msgid "Selected fiscal year has been updated"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/fiscalyears.php:83
+#: ../admin/fiscalyears.php:89
 msgid "New fiscal year has been added"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/fiscalyears.php:96
+#: ../admin/fiscalyears.php:102
 msgid "Cannot delete this fiscal year because thera are fiscal years before."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/fiscalyears.php:101
+#: ../admin/fiscalyears.php:107
 msgid "Cannot delete this fiscal year because the fiscal year is not closed."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/fiscalyears.php:114
+#: ../admin/fiscalyears.php:120
 msgid "Selected fiscal year has been deleted"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/fiscalyears.php:127
+#: ../admin/fiscalyears.php:133
 msgid ""
 "Warning: Deleting a fiscal year all transactions \n"
 "\t\tare removed and converted into relevant balances. This process is "
 "irreversible!"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/fiscalyears.php:132
+#: ../admin/fiscalyears.php:138
 msgid "Fiscal Year Begin"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/fiscalyears.php:132
+#: ../admin/fiscalyears.php:138
 msgid "Fiscal Year End"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/fiscalyears.php:132
-#: /var/www/fa_unstable/devel/../dimensions/inquiry/search_dimensions.php:133
-#: /var/www/fa_unstable/devel/../dimensions/inquiry/search_dimensions.php:139
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:637
-#: /var/www/fa_unstable/devel/../manufacturing/search_work_orders.php:108
-#: /var/www/fa_unstable/devel/../reporting/rep501.php:85
-#: /var/www/fa_unstable/devel/../reporting/rep710.php:109
-#: /var/www/fa_unstable/devel/../reporting/includes/excel_report.inc:219
-#: /var/www/fa_unstable/devel/../reporting/includes/pdf_report.inc:266
+#: ../admin/fiscalyears.php:138
+#: ../dimensions/inquiry/search_dimensions.php:133
+#: ../dimensions/inquiry/search_dimensions.php:139
+#: ../includes/ui/ui_input.inc:954
+#: ../includes/ui/ui_lists.inc:675
+#: ../includes/ui/ui_lists.inc.orig:675
+#: ../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
 msgid "Closed"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/fiscalyears.php:162
+#: ../admin/fiscalyears.php:168
 #, php-format
 msgid ""
 "Are you sure you want to delete fiscal year %s - %s? All transactions are "
 "deleted and converted into relevant balances. Do you want to continue ?"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/fiscalyears.php:170
+#: ../admin/fiscalyears.php:176
 msgid ""
 "The marked fiscal year is the current fiscal year which cannot be deleted."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/fiscalyears.php:194
-#: /var/www/fa_unstable/devel/../admin/fiscalyears.php:199
+#: ../admin/fiscalyears.php:200
+#: ../admin/fiscalyears.php:211
 msgid "Fiscal Year Begin:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/fiscalyears.php:195
-#: /var/www/fa_unstable/devel/../admin/fiscalyears.php:200
+#: ../admin/fiscalyears.php:201
+#: ../admin/fiscalyears.php:212
 msgid "Fiscal Year End:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/fiscalyears.php:204
+#: ../admin/fiscalyears.php:216
 msgid "Is Closed:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/forms_setup.php:16
+#: ../admin/forms_setup.php:16
 msgid "Forms Setup"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/forms_setup.php:36
+#: ../admin/forms_setup.php:36
 msgid "Forms settings have been updated."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/forms_setup.php:46
+#: ../admin/forms_setup.php:46
 msgid "Form"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/forms_setup.php:46
+#: ../admin/forms_setup.php:46
 msgid "Next Reference"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:16
+#: ../admin/gl_setup.php:16
+#: ../admin/gl_setup.php.orig:16
 msgid "System and General GL Setup"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:30
+#: ../admin/gl_setup.php:30
+#: ../admin/gl_setup.php.orig:30
 msgid "The delivery over-receive allowance must be between 0 and 100."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:37
+#: ../admin/gl_setup.php:37
+#: ../admin/gl_setup.php.orig:37
 msgid "The invoice over-charge allowance must be between 0 and 100."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:44
+#: ../admin/gl_setup.php:44
+#: ../admin/gl_setup.php.orig:44
 msgid "The past due days interval allowance must be between 0 and 100."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:66
+#: ../admin/gl_setup.php:52
+#: ../admin/gl_setup.php.orig:52
+msgid "Before GRN Clearing Account can be changed all GRNs have to be invoiced"
+msgstr ""
+
+#: ../admin/gl_setup.php:75
+#: ../admin/gl_setup.php.orig:75
 msgid "The general GL setup has been updated."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:116
+#: ../admin/gl_setup.php:138
+#: ../admin/gl_setup.php.orig:137
 msgid "General GL"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:118
+#: ../admin/gl_setup.php:140
+#: ../admin/gl_setup.php.orig:139
 msgid "Past Due Days Interval:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:118
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:153
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:161
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:196
-#: /var/www/fa_unstable/devel/../admin/payment_terms.php:140
+#: ../admin/gl_setup.php:140
+#: ../admin/gl_setup.php:180
+#: ../admin/gl_setup.php:188
+#: ../admin/gl_setup.php:206
+#: ../admin/gl_setup.php:228
+#: ../admin/gl_setup.php.orig:139
+#: ../admin/gl_setup.php.orig:176
+#: ../admin/gl_setup.php.orig:184
+#: ../admin/gl_setup.php.orig:202
+#: ../admin/gl_setup.php.orig:224
+#: ../admin/payment_terms.php:140
 msgid "days"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:120
+#: ../admin/gl_setup.php:142
+#: ../admin/gl_setup.php.orig:141
 msgid "Retained Earnings:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:122
+#: ../admin/gl_setup.php:144
+#: ../admin/gl_setup.php.orig:143
 msgid "Profit/Loss Year:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:124
+#: ../admin/gl_setup.php:146
+#: ../admin/gl_setup.php.orig:145
 msgid "Exchange Variances Account:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:126
+#: ../admin/gl_setup.php:148
+#: ../admin/gl_setup.php.orig:147
+#: ../gl/manage/bank_accounts.php:193
 msgid "Bank Charges Account:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:130
+#: ../admin/gl_setup.php:150
+#: ../admin/gl_setup.php.orig:149
+msgid "Tax Algorithm:"
+msgstr ""
+
+#: ../admin/gl_setup.php:154
+#: ../admin/gl_setup.php.orig:153
 msgid "Customers and Sales"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:132
+#: ../admin/gl_setup.php:156
+#: ../admin/gl_setup.php.orig:155
 msgid "Default Credit Limit:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:134
+#: ../admin/gl_setup.php:158
+#: ../admin/gl_setup.php.orig:157
 msgid "Accumulate batch shipping:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:136
+#: ../admin/gl_setup.php:160
+#: ../admin/gl_setup.php.orig:159
 msgid "Legal Text on Invoice:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:138
+#: ../admin/gl_setup.php:162
+#: ../admin/gl_setup.php.orig:161
 msgid "Shipping Charged Account:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:142
+#: ../admin/gl_setup.php:164
+msgid "Deferred Income Account:"
+msgstr ""
+
+#: ../admin/gl_setup.php:165
+msgid "Not used"
+msgstr ""
+
+#: ../admin/gl_setup.php:169
+#: ../admin/gl_setup.php.orig:165
 msgid "Customers and Sales Defaults"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:144
+#: ../admin/gl_setup.php:171
+#: ../admin/gl_setup.php.orig:167
 msgid "Receivable Account:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:146
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:182
-#: /var/www/fa_unstable/devel/../inventory/manage/item_categories.php:192
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:363
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:251
+#: ../admin/gl_setup.php:173
+#: ../admin/gl_setup.php:214
+#: ../admin/gl_setup.php.orig:169
+#: ../admin/gl_setup.php.orig:210
+#: ../inventory/manage/item_categories.php:192
+#: ../inventory/manage/items.php:361
+#: ../inventory/manage/items.php.orig:354
+#: ../sales/manage/customer_branches.php:251
 msgid "Sales Account:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:149
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:252
+#: ../admin/gl_setup.php:176
+#: ../admin/gl_setup.php.orig:172
+#: ../sales/manage/customer_branches.php:252
 msgid "Sales Discount Account:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:151
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:254
+#: ../admin/gl_setup.php:178
+#: ../admin/gl_setup.php.orig:174
+#: ../sales/manage/customer_branches.php:254
 msgid "Prompt Payment Discount Account:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:153
+#: ../admin/gl_setup.php:180
+#: ../admin/gl_setup.php.orig:176
 msgid "Delivery Required By:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:159
+#: ../admin/gl_setup.php:186
+#: ../admin/gl_setup.php.orig:182
 msgid "Dimension Defaults"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:161
+#: ../admin/gl_setup.php:188
+#: ../admin/gl_setup.php.orig:184
 msgid "Dimension Required By After:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:164
+#: ../admin/gl_setup.php:192
+#: ../admin/gl_setup.php.orig:188
 msgid "Suppliers and Purchasing"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:166
+#: ../admin/gl_setup.php:194
+#: ../admin/gl_setup.php.orig:190
 msgid "Delivery Over-Receive Allowance:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:168
+#: ../admin/gl_setup.php:196
+#: ../admin/gl_setup.php.orig:192
 msgid "Invoice Over-Charge Allowance:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:170
+#: ../admin/gl_setup.php:198
+#: ../admin/gl_setup.php.orig:194
 msgid "Suppliers and Purchasing Defaults"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:172
+#: ../admin/gl_setup.php:200
+#: ../admin/gl_setup.php.orig:196
 msgid "Payable Account:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:174
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:129
+#: ../admin/gl_setup.php:202
+#: ../admin/gl_setup.php.orig:198
+#: ../purchasing/manage/suppliers.php:132
+#: ../purchasing/manage/suppliers.php.orig:142
 msgid "Purchase Discount Account:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:176
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:163
+#: ../admin/gl_setup.php:204
+#: ../admin/gl_setup.php.orig:200
+msgid "GRN Clearing Account:"
+msgstr ""
+
+#: ../admin/gl_setup.php:204
+#: ../admin/gl_setup.php.orig:200
+msgid "No postings on GRN"
+msgstr ""
+
+#: ../admin/gl_setup.php:206
+#: ../admin/gl_setup.php.orig:202
+msgid "Receival Required By:"
+msgstr ""
+
+#: ../admin/gl_setup.php:208
+#: ../admin/gl_setup.php.orig:204
+#: ../reporting/reports_main.php:175
 msgid "Inventory"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:178
+#: ../admin/gl_setup.php:210
+#: ../admin/gl_setup.php.orig:206
 msgid "Allow Negative Inventory:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:179
+#: ../admin/gl_setup.php:211
+#: ../admin/gl_setup.php.orig:207
 msgid "Warning:  This may cause a delay in GL postings"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:181
+#: ../admin/gl_setup.php:213
+#: ../admin/gl_setup.php.orig:209
 msgid "Items Defaults"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:184
-#: /var/www/fa_unstable/devel/../inventory/manage/item_categories.php:202
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:367
+#: ../admin/gl_setup.php:216
+#: ../admin/gl_setup.php.orig:212
+#: ../inventory/manage/item_categories.php:202
+#: ../inventory/manage/items.php:365
+#: ../inventory/manage/items.php.orig:358
 msgid "Inventory Account:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:186
-#: /var/www/fa_unstable/devel/../inventory/manage/item_categories.php:196
-#: /var/www/fa_unstable/devel/../inventory/manage/item_categories.php:204
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:368
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:373
+#: ../admin/gl_setup.php:218
+#: ../admin/gl_setup.php.orig:214
+#: ../inventory/manage/item_categories.php:196
+#: ../inventory/manage/item_categories.php:204
+#: ../inventory/manage/items.php:366
+#: ../inventory/manage/items.php:371
+#: ../inventory/manage/items.php.orig:359
+#: ../inventory/manage/items.php.orig:364
 msgid "C.O.G.S. Account:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:188
-#: /var/www/fa_unstable/devel/../inventory/manage/item_categories.php:205
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:369
+#: ../admin/gl_setup.php:220
+#: ../admin/gl_setup.php.orig:216
+#: ../inventory/manage/item_categories.php:205
+#: ../inventory/manage/items.php:367
+#: ../inventory/manage/items.php.orig:360
 msgid "Inventory Adjustments Account:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:190
-#: /var/www/fa_unstable/devel/../inventory/manage/item_categories.php:209
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:380
+#: ../admin/gl_setup.php:222
+#: ../admin/gl_setup.php.orig:218
+#: ../inventory/manage/item_categories.php:209
+#: ../inventory/manage/items.php:378
+#: ../inventory/manage/items.php.orig:371
 msgid "Item Assembly Costs Account:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:194
+#: ../admin/gl_setup.php:226
+#: ../admin/gl_setup.php.orig:222
 msgid "Manufacturing Defaults"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/gl_setup.php:196
+#: ../admin/gl_setup.php:228
+#: ../admin/gl_setup.php.orig:224
 msgid "Work Order Required By After:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_chart.php:20
+#: ../admin/inst_chart.php:20
 msgid "Install Charts of Accounts"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_chart.php:35
+#: ../admin/inst_chart.php:35
 msgid "Selected chart has been successfully deleted"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_chart.php:50
+#: ../admin/inst_chart.php:50
 msgid "Chart"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_chart.php:50
-#: /var/www/fa_unstable/devel/../admin/inst_lang.php:36
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:190
-#: /var/www/fa_unstable/devel/../admin/inst_theme.php:73
-#: /var/www/fa_unstable/devel/../admin/inst_upgrade.php:198
+#: ../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
 msgid "Installed"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_chart.php:50
-#: /var/www/fa_unstable/devel/../admin/inst_lang.php:36
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:190
-#: /var/www/fa_unstable/devel/../admin/inst_theme.php:73
-#: /var/www/fa_unstable/devel/../inventory/inquiry/stock_status.php:70
-#: /var/www/fa_unstable/devel/../reporting/rep303.php:102
+#: ../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:71
+#: ../inventory/inquiry/stock_status.php.orig:77
+#: ../reporting/rep303.php:102
 msgid "Available"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_chart.php:50
-#: /var/www/fa_unstable/devel/../admin/inst_lang.php:35
-#: /var/www/fa_unstable/devel/../admin/inst_lang.php:218
+#: ../admin/inst_chart.php:50
+#: ../admin/inst_lang.php:35
+#: ../admin/inst_lang.php:218
 msgid "Encoding"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_chart.php:69
-#: /var/www/fa_unstable/devel/../admin/inst_chart.php:71
-#: /var/www/fa_unstable/devel/../admin/inst_lang.php:88
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:213
-#: /var/www/fa_unstable/devel/../admin/inst_theme.php:91
+#: ../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
+#: ../includes/sysnames.inc:193
 msgid "Unknown"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_chart.php:74
-#: /var/www/fa_unstable/devel/../admin/inst_lang.php:103
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:220
-#: /var/www/fa_unstable/devel/../admin/inst_theme.php:95
-#: /var/www/fa_unstable/devel/../admin/inst_upgrade.php:180
+#: ../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
 msgid "Install"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_chart.php:75
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:221
-#: /var/www/fa_unstable/devel/../admin/inst_theme.php:96
+#: ../admin/inst_chart.php:75
+#: ../admin/inst_module.php:139
+#: ../admin/inst_theme.php:97
 msgid "Upload and install latest extension package"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_chart.php:82
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:228
-#: /var/www/fa_unstable/devel/../admin/inst_theme.php:103
+#: ../admin/inst_chart.php:82
+#: ../admin/inst_module.php:146
+#: ../admin/inst_theme.php:104
 #, php-format
 msgid ""
 "You are about to remove package \\'%s\\'.\n"
 "Do you want to continue ?"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_lang.php:23
+#: ../admin/inst_lang.php:23
 msgid "Install/Update Languages"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_lang.php:35
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:314
-#: /var/www/fa_unstable/devel/../admin/printers.php:84
-#: /var/www/fa_unstable/devel/../admin/shipping_companies.php:91
-#: /var/www/fa_unstable/devel/../dimensions/dimension_entry.php:271
-#: /var/www/fa_unstable/devel/../dimensions/inquiry/search_dimensions.php:129
-#: /var/www/fa_unstable/devel/../dimensions/view/view_dimension.php:54
-#: /var/www/fa_unstable/devel/../inventory/manage/item_categories.php:98
-#: /var/www/fa_unstable/devel/../manufacturing/manage/work_centres.php:101
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:244
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:246
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:248
-#: /var/www/fa_unstable/devel/../reporting/rep501.php:85
-#: /var/www/fa_unstable/devel/../reporting/rep709.php:107
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:295
-#: /var/www/fa_unstable/devel/../sales/manage/sales_people.php:99
-#: /var/www/fa_unstable/devel/../taxes/item_tax_types.php:112
+#: ../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
+#: ../manufacturing/manage/work_centres.php:101
+#: ../purchasing/includes/ui/invoice_ui.inc:265
+#: ../purchasing/includes/ui/invoice_ui.inc:267
+#: ../purchasing/includes/ui/invoice_ui.inc:269
+#: ../reporting/rep501.php:85
+#: ../reporting/rep709.php:109
+#: ../reporting/rep709.php:110
+#: ../sales/manage/customer_branches.php:296
+#: ../sales/manage/sales_people.php:99
+#: ../taxes/item_tax_types.php:117
 msgid "Name"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_lang.php:35
-#: /var/www/fa_unstable/devel/../admin/inst_lang.php:220
+#: ../admin/inst_lang.php:35
+#: ../admin/inst_lang.php:220
 msgid "Right To Left"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_lang.php:47
+#: ../admin/inst_lang.php:47
 msgid "Supported"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_lang.php:49
+#: ../admin/inst_lang.php:49
 msgid "Display also languages not supported by server locales"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_lang.php:100
+#: ../admin/inst_lang.php:100
 msgid "Edit non standard language configuration"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_lang.php:104
+#: ../admin/inst_lang.php:104
 msgid "Upload and install latest language package"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_lang.php:111
+#: ../admin/inst_lang.php:111
 #, php-format
 msgid ""
 "You are about to remove language \\'%s\\'.\n"
 "Do you want to continue ?"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_lang.php:118
+#: ../admin/inst_lang.php:118
 msgid "The marked language is the current language which cannot be deleted."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_lang.php:120
+#: ../admin/inst_lang.php:120
 msgid "Update default"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_lang.php:122
+#: ../admin/inst_lang.php:122
 msgid "Add new language manually"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_lang.php:135
+#: ../admin/inst_lang.php:135
 msgid "Language name, code nor encoding cannot be empty"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_lang.php:140
+#: ../admin/inst_lang.php:140
 msgid ""
 "Standard package for this language is already installed. If you want to "
 "install this language manually, uninstall standard language package first."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_lang.php:216
+#: ../admin/inst_lang.php:216
 msgid "Language Code"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_lang.php:217
+#: ../admin/inst_lang.php:217
 msgid "Language Name"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_lang.php:221
+#: ../admin/inst_lang.php:221
 msgid "Default Language"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_lang.php:223
-#: /var/www/fa_unstable/devel/../admin/inst_lang.php:224
+#: ../admin/inst_lang.php:223
+#: ../admin/inst_lang.php:224
 msgid "Language File"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_lang.php:227
+#: ../admin/inst_lang.php:227
 msgid "Select your language files from your local harddisk."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:20
+#: ../admin/inst_module.php:20
 msgid "Install/Activate extensions"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:34
-msgid "Extension name cannot be empty."
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:39
-msgid "Extension name have to be unique."
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:45
-msgid "Extension title cannot be empty."
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:49
-msgid "Extension folder name cannot be empty."
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:53
-msgid "You have to select extension file to upload"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:72
-msgid "Module installation support is not implemented."
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:164
+#: ../admin/inst_module.php:78
 msgid "Selected extension has been successfully deleted"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:189
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:252
+#: ../admin/inst_module.php:104
+#: ../admin/inst_module.php:169
 msgid "Extension"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:189
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:252
+#: ../admin/inst_module.php:104
+#: ../admin/inst_module.php:169
 msgid "Modules provided"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:189
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:252
+#: ../admin/inst_module.php:104
+#: ../admin/inst_module.php:169
 msgid "Options provided"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:217
-msgid "Edit third-party extension parameters."
+#: ../admin/inst_module.php:133
+msgid "Install third-party extension."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:239
-msgid "Add third-party extension"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:252
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:637
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:2108
-#: /var/www/fa_unstable/devel/../reporting/includes/excel_report.inc:217
-#: /var/www/fa_unstable/devel/../reporting/includes/pdf_report.inc:264
+#: ../admin/inst_module.php:169
+#: ../includes/ui/ui_lists.inc:675
+#: ../includes/ui/ui_lists.inc:2156
+#: ../includes/ui/ui_lists.inc.orig:675
+#: ../includes/ui/ui_lists.inc.orig:2154
+#: ../reporting/includes/excel_report.inc:232
+#: ../reporting/includes/pdf_report.inc:264
 msgid "Active"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:315
-msgid "Subfolder (in modules directory)"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:317
-msgid "Menu Tab"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:318
-msgid "Menu Link Text"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:320
-msgid "Default status"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:322
-msgid "Extension File"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:323
-msgid "Access Levels File"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:324
-msgid "SQL File"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:327
-msgid "Select your extension PHP files from your local harddisk."
+#: ../admin/inst_module.php:232
+msgid "Status change for some extensions failed."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:337
-msgid "Extension data has been updated."
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:339
-msgid "Extension has been installed."
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:362
+#: ../admin/inst_module.php:235
 msgid "Current active extensions set has been saved."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_module.php:387
+#: ../admin/inst_module.php:257
 msgid "Extensions:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_theme.php:20
+#: ../admin/inst_theme.php:20
 msgid "Install Themes"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_theme.php:58
+#: ../admin/inst_theme.php:59
 msgid "Selected theme has been successfully deleted"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_theme.php:73
+#: ../admin/inst_theme.php:74
 msgid "Theme"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_upgrade.php:16
+#: ../admin/inst_upgrade.php:16
 msgid "Software Upgrade"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_upgrade.php:105
+#: ../admin/inst_upgrade.php:72
 #, php-format
 msgid "Database upgrade for company '%s' (%s:%s*) started..."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_upgrade.php:113
+#: ../admin/inst_upgrade.php:80
 msgid "Database upgrade finished."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_upgrade.php:117
+#: ../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."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_upgrade.php:145
+#: ../admin/inst_upgrade.php:102
 msgid "Cannot connect to database for company"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_upgrade.php:157
+#: ../admin/inst_upgrade.php:114
 #, php-format
 msgid "Database upgrade to version %s failed for company '%s'."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_upgrade.php:160
+#: ../admin/inst_upgrade.php:117
 msgid "You should restore company database from latest backup file"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_upgrade.php:171
+#: ../admin/inst_upgrade.php:129
 msgid "All companies data has been successfully updated"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_upgrade.php:180
+#: ../admin/inst_upgrade.php:137
 msgid "Sql file"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_upgrade.php:181
+#: ../admin/inst_upgrade.php:138
 msgid "Force upgrade"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_upgrade.php:204
+#: ../admin/inst_upgrade.php:161
 #, php-format
 msgid "Partially installed (%s)"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_upgrade.php:213
+#: ../admin/inst_upgrade.php:170
 msgid ""
 "Database upgrades marked as partially installed cannot be installed "
 "automatically.\n"
@@ -1781,7719 +1888,8659 @@ msgid ""
 "upgrade."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_upgrade.php:217
+#: ../admin/inst_upgrade.php:174
 msgid "Upgrade system"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/inst_upgrade.php:217
+#: ../admin/inst_upgrade.php:174
 msgid "Save database and perform upgrade"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/payment_terms.php:16
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:56
+#: ../admin/payment_terms.php:16
+#: ../reporting/includes/doctext.inc:41
+#: ../sales/view/view_invoice.php:76
+#: ../sales/view/view_sales_order.php:82
+#: ../sales/view/view_sales_order.php:90
+#: ../sales/view/view_sales_order.php.orig:78
 msgid "Payment Terms"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/payment_terms.php:51
+#: ../admin/payment_terms.php:51
 msgid "The number of days or the day in the following month must be numeric."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/payment_terms.php:57
+#: ../admin/payment_terms.php:57
 msgid "The Terms description must be entered."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/payment_terms.php:77
+#: ../admin/payment_terms.php:77
 msgid "Selected payment terms have been updated"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/payment_terms.php:82
+#: ../admin/payment_terms.php:82
 msgid "New payment terms have been added"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/payment_terms.php:95
+#: ../admin/payment_terms.php:95
 msgid ""
 "Cannot delete this payment term, because customer accounts have been created "
 "referring to this term."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/payment_terms.php:101
+#: ../admin/payment_terms.php:101
 msgid ""
 "Cannot delete this payment term, because supplier accounts have been created "
 "referring to this term"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/payment_terms.php:107
+#: ../admin/payment_terms.php:107
 msgid "Selected payment terms have been deleted"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/payment_terms.php:127
-#: /var/www/fa_unstable/devel/../dimensions/dimension_entry.php:275
-#: /var/www/fa_unstable/devel/../dimensions/inquiry/search_dimensions.php:75
-#: /var/www/fa_unstable/devel/../dimensions/inquiry/search_dimensions.php:130
-#: /var/www/fa_unstable/devel/../dimensions/view/view_dimension.php:54
-#: /var/www/fa_unstable/devel/../gl/bank_account_reconcile.php:233
-#: /var/www/fa_unstable/devel/../gl/inquiry/bank_inquiry.php:67
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_account_inquiry.php:125
-#: /var/www/fa_unstable/devel/../gl/inquiry/journal_inquiry.php:121
-#: /var/www/fa_unstable/devel/../gl/inquiry/tax_inquiry.php:82
-#: /var/www/fa_unstable/devel/../gl/manage/bank_accounts.php:102
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:178
-#: /var/www/fa_unstable/devel/../gl/view/accrual_trans.php:52
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:80
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:480
-#: /var/www/fa_unstable/devel/../inventory/inquiry/stock_movements.php:70
-#: /var/www/fa_unstable/devel/../inventory/manage/item_categories.php:98
-#: /var/www/fa_unstable/devel/../manufacturing/search_work_orders.php:161
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:236
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:276
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:280
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:331
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_allocation_inquiry.php:125
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_inquiry.php:162
-#: /var/www/fa_unstable/devel/../reporting/rep102.php:124
-#: /var/www/fa_unstable/devel/../reporting/rep202.php:127
-#: /var/www/fa_unstable/devel/../reporting/rep501.php:85
-#: /var/www/fa_unstable/devel/../reporting/rep601.php:76
-#: /var/www/fa_unstable/devel/../reporting/rep702.php:58
-#: /var/www/fa_unstable/devel/../reporting/rep704.php:78
-#: /var/www/fa_unstable/devel/../reporting/rep704.php:81
-#: /var/www/fa_unstable/devel/../reporting/rep704.php:84
-#: /var/www/fa_unstable/devel/../reporting/rep709.php:103
-#: /var/www/fa_unstable/devel/../reporting/rep710.php:76
-#: /var/www/fa_unstable/devel/../reporting/rep710.php:84
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:239
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:386
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:42
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:52
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_allocation_inquiry.php:141
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_inquiry.php:212
+#: ../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:231
+#: ../gl/inquiry/bank_inquiry.php:70
+#: ../gl/inquiry/gl_account_inquiry.php:126
+#: ../gl/inquiry/journal_inquiry.php:129
+#: ../gl/inquiry/tax_inquiry.php:82
+#: ../gl/manage/bank_accounts.php:109
+#: ../gl/manage/gl_quick_entries.php:186
+#: ../gl/view/accrual_trans.php:52
+#: ../gl/includes/ui/gl_bank_ui.inc:92
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:83
+#: ../includes/ui/ui_view.inc:488
+#: ../includes/ui/ui_view.inc.orig:488
+#: ../inventory/inquiry/stock_movements.php:77
+#: ../inventory/inquiry/stock_movements.php.orig:79
+#: ../inventory/manage/item_categories.php:98
+#: ../manufacturing/search_work_orders.php:161
+#: ../manufacturing/view/wo_costs_view.php:46
+#: ../manufacturing/includes/manufacturing_ui.inc:236
+#: ../manufacturing/includes/manufacturing_ui.inc:276
+#: ../manufacturing/includes/manufacturing_ui.inc:280
+#: ../manufacturing/includes/manufacturing_ui.inc:331
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:125
+#: ../purchasing/inquiry/supplier_inquiry.php:173
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:170
+#: ../reporting/rep102.php:132
+#: ../reporting/rep202.php:137
+#: ../reporting/rep501.php:85
+#: ../reporting/rep601.php:76
+#: ../reporting/rep602.php:80
+#: ../reporting/rep702.php:58
+#: ../reporting/rep704.php:79
+#: ../reporting/rep704.php:82
+#: ../reporting/rep704.php:85
+#: ../reporting/rep709.php:105
+#: ../reporting/rep710.php:76
+#: ../reporting/rep710.php:84
+#: ../reporting/reports_main.php:252
+#: ../reporting/reports_main.php:399
+#: ../reporting/includes/doctext.inc:162
+#: ../reporting/includes/doctext.inc:203
+#: ../reporting/includes/doctext.inc:222
+#: ../sales/inquiry/customer_allocation_inquiry.php:144
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:144
+#: ../sales/inquiry/customer_inquiry.php:200
+#: ../sales/inquiry/customer_inquiry.php.orig:224
 msgid "Type"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/payment_terms.php:127
+#: ../admin/payment_terms.php:127
 msgid "Due After/Days"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/payment_terms.php:140
+#: ../admin/payment_terms.php:140
+#: ../admin/void_transaction.php:125
 msgid "N/A"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/payment_terms.php:174
+#: ../admin/payment_terms.php:174
 msgid "Terms Description:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/payment_terms.php:176
+#: ../admin/payment_terms.php:176
 msgid "Payment type:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/payment_terms.php:179
+#: ../admin/payment_terms.php:179
 msgid "Days (Or Day In Following Month):"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/printers.php:16
+#: ../admin/printers.php:16
 msgid "Printer Locations"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/printers.php:31
+#: ../admin/printers.php:31
 msgid "Printer name cannot be empty."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/printers.php:36
+#: ../admin/printers.php:36
 msgid "You have selected printing to server at user IP."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/printers.php:41
+#: ../admin/printers.php:41
 msgid "Timeout cannot be less than zero nor longer than 60 (sec)."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/printers.php:52
+#: ../admin/printers.php:52
 msgid "New printer definition has been created"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/printers.php:53
+#: ../admin/printers.php:53
 msgid "Selected printer definition has been updated"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/printers.php:64
+#: ../admin/printers.php:64
 msgid ""
 "Cannot delete this printer definition, because print profile have been "
 "created using it."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/printers.php:69
+#: ../admin/printers.php:69
 msgid "Selected printer definition has been deleted"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/printers.php:84
-#: /var/www/fa_unstable/devel/../admin/printers.php:136
+#: ../admin/printers.php:84
+#: ../admin/printers.php:136
 msgid "Printer Queue"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/printers.php:132
+#: ../admin/printers.php:132
 msgid "Printer Name"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/printers.php:133
+#: ../admin/printers.php:133
 msgid "Printer Description"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/printers.php:134
+#: ../admin/printers.php:134
 msgid "Host name or IP"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/printers.php:135
+#: ../admin/printers.php:135
 msgid "Port"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/printers.php:137
+#: ../admin/printers.php:137
 msgid "Timeout"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/print_profiles.php:18
+#: ../admin/print_profiles.php:18
 msgid "Printing Profiles"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/print_profiles.php:33
+#: ../admin/print_profiles.php:33
 msgid "Default printing destination"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/print_profiles.php:91
+#: ../admin/print_profiles.php:91
 msgid "Printing profile name cannot be empty."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/print_profiles.php:107
+#: ../admin/print_profiles.php:107
 msgid "New printing profile has been created"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/print_profiles.php:110
+#: ../admin/print_profiles.php:110
 msgid "Printing profile has been updated"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/print_profiles.php:119
+#: ../admin/print_profiles.php:119
 msgid "Selected printing profile has been deleted"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/print_profiles.php:130
+#: ../admin/print_profiles.php:130
 msgid "Select printing profile"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/print_profiles.php:131
+#: ../admin/print_profiles.php:131
 msgid "New printing profile"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/print_profiles.php:136
-#: /var/www/fa_unstable/devel/../admin/print_profiles.php:138
+#: ../admin/print_profiles.php:136
+#: ../admin/print_profiles.php:138
 msgid "Printing Profile Name"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/print_profiles.php:148
+#: ../admin/print_profiles.php:148
 msgid "Report Id"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/print_profiles.php:148
+#: ../admin/print_profiles.php:148
 msgid "Printer"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/print_profiles.php:162
+#: ../admin/print_profiles.php:162
 msgid "Browser support"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/print_profiles.php:169
+#: ../admin/print_profiles.php:169
 msgid "no title was found in this report definition file."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/print_profiles.php:175
+#: ../admin/print_profiles.php:175
 msgid "Add New Profile"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/print_profiles.php:177
+#: ../admin/print_profiles.php:177
 msgid "Update Profile"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/print_profiles.php:178
+#: ../admin/print_profiles.php:178
 msgid "Update printer profile"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/print_profiles.php:179
+#: ../admin/print_profiles.php:179
 msgid "Delete Profile"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/print_profiles.php:180
+#: ../admin/print_profiles.php:180
 msgid "Delete printer profile (only if not used by any user)"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/security_roles.php:18
+#: ../admin/security_roles.php:18
 msgid "Access setup"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/security_roles.php:63
+#: ../admin/security_roles.php:63
 msgid "Role description cannot be empty."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/security_roles.php:69
+#: ../admin/security_roles.php:69
 msgid "Role name cannot be empty."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/security_roles.php:76
+#: ../admin/security_roles.php:76
 msgid ""
 "Access level edition in Company setup section have to be enabled for your "
 "account."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/security_roles.php:105
+#: ../admin/security_roles.php:105
 msgid "New security role has been added."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/security_roles.php:113
+#: ../admin/security_roles.php:113
 msgid "Security role has been updated."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/security_roles.php:126
+#: ../admin/security_roles.php:126
 msgid "This role is currently assigned to some users and cannot be deleted"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/security_roles.php:129
+#: ../admin/security_roles.php:129
 msgid "Security role has been sucessfully deleted."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/security_roles.php:178
+#: ../admin/security_roles.php:178
 msgid "Role:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/security_roles.php:180
-#: /var/www/fa_unstable/devel/../gl/manage/gl_accounts.php:195
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:253
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:281
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:282
+#: ../admin/security_roles.php:180
+#: ../gl/manage/gl_accounts.php:197
+#: ../inventory/manage/items.php:440
+#: ../inventory/manage/items.php.orig:433
+#: ../purchasing/manage/suppliers.php:291
+#: ../purchasing/manage/suppliers.php.orig:294
+#: ../sales/manage/customers.php:324
+#: ../sales/manage/sav.customers.php:324
 msgid "Show inactive:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/security_roles.php:195
+#: ../admin/security_roles.php:195
 msgid "Role name:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/security_roles.php:196
+#: ../admin/security_roles.php:196
 msgid "Role description:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/security_roles.php:197
+#: ../admin/security_roles.php:197
 msgid "Current status:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/security_roles.php:221
+#: ../admin/security_roles.php:221
 msgid "On/off set of features"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/security_roles.php:240
-#: /var/www/fa_unstable/devel/../admin/security_roles.php:246
+#: ../admin/security_roles.php:240
+#: ../admin/security_roles.php:246
 msgid "Update view"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/security_roles.php:241
+#: ../admin/security_roles.php:241
 msgid "Insert New Role"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/security_roles.php:245
+#: ../admin/security_roles.php:245
 msgid "Save Role"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/security_roles.php:247
+#: ../admin/security_roles.php:247
 msgid "Clone This Role"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/security_roles.php:248
+#: ../admin/security_roles.php:248
 msgid "Delete This Role"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/security_roles.php:249
-#: /var/www/fa_unstable/devel/../admin/void_transaction.php:208
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:61
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:251
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:223
-#: /var/www/fa_unstable/devel/../includes/ui/simple_crud_class.inc:58
-#: /var/www/fa_unstable/devel/../includes/ui/simple_crud_class.inc:231
-#: /var/www/fa_unstable/devel/../includes/ui/ui_controls.inc:561
-#: /var/www/fa_unstable/devel/../includes/ui/ui_input.inc:206
-#: /var/www/fa_unstable/devel/../inventory/includes/item_adjustments_ui.inc:159
-#: /var/www/fa_unstable/devel/../inventory/includes/stock_transfers_ui.inc:139
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:425
-#: /var/www/fa_unstable/devel/../manufacturing/includes/work_order_issue_ui.inc:129
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:410
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_credit_ui.inc:292
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:553
+#: ../admin/security_roles.php:249
+#: ../admin/void_transaction.php:229
+#: ../gl/manage/gl_quick_entries.php:61
+#: ../gl/includes/ui/gl_bank_ui.inc:277
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:251
+#: ../gl/includes/ui/gl_journal_ui.inc:259
+#: ../includes/ui/simple_crud_class.inc:58
+#: ../includes/ui/simple_crud_class.inc:231
+#: ../includes/ui/ui_controls.inc:594
+#: ../includes/ui/ui_input.inc:210
+#: ../inventory/includes/item_adjustments_ui.inc:159
+#: ../inventory/includes/stock_transfers_ui.inc:139
+#: ../inventory/manage/items.php:423
+#: ../inventory/manage/items.php.orig:416
+#: ../manufacturing/includes/work_order_issue_ui.inc:133
+#: ../purchasing/includes/ui/po_ui.inc:459
+#: ../sales/includes/ui/sales_credit_ui.inc:295
+#: ../sales/includes/ui/sales_order_ui.inc:557
+#: ../sales/includes/ui/sales_order_ui.inc.orig:557
 msgid "Cancel"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/security_roles.php:249
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:425
+#: ../admin/security_roles.php:249
+#: ../inventory/manage/items.php:423
+#: ../inventory/manage/items.php.orig:416
 msgid "Cancel Edition"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/shipping_companies.php:15
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:32
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:265
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:366
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:401
-#: /var/www/fa_unstable/devel/../sales/view/view_credit.php:74
-#: /var/www/fa_unstable/devel/../sales/view/view_dispatch.php:92
-#: /var/www/fa_unstable/devel/../sales/view/view_invoice.php:92
+#: ../admin/shipping_companies.php:15
+#: ../sales/customer_credit_invoice.php:256
+#: ../sales/customer_delivery.php:376
+#: ../sales/customer_invoice.php:486
+#: ../sales/view/view_credit.php:74
+#: ../sales/view/view_dispatch.php:92
+#: ../sales/view/view_invoice.php:92
 msgid "Shipping Company"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/shipping_companies.php:26
+#: ../admin/shipping_companies.php:26
 msgid "The shipping company name cannot be empty."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/shipping_companies.php:37
+#: ../admin/shipping_companies.php:37
 msgid "New shipping company has been added"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/shipping_companies.php:46
+#: ../admin/shipping_companies.php:46
 msgid "Selected shipping company has been updated"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/shipping_companies.php:59
+#: ../admin/shipping_companies.php:59
 msgid ""
 "Cannot delete this shipping company because sales orders have been created "
 "using this shipper."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/shipping_companies.php:67
+#: ../admin/shipping_companies.php:67
 msgid ""
 "Cannot delete this shipping company because invoices have been created using "
 "this shipping company."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/shipping_companies.php:72
+#: ../admin/shipping_companies.php:72
 msgid "Selected shipping company has been deleted"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/shipping_companies.php:91
+#: ../admin/shipping_companies.php:91
 msgid "Contact Person"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/shipping_companies.php:91
+#: ../admin/shipping_companies.php:91
 msgid "Phone Number"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/shipping_companies.php:91
-#: /var/www/fa_unstable/devel/../inventory/manage/locations.php:146
+#: ../admin/shipping_companies.php:91
+#: ../inventory/manage/locations.php:146
 msgid "Secondary Phone"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/shipping_companies.php:91
-#: /var/www/fa_unstable/devel/../inventory/manage/locations.php:146
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:75
+#: ../admin/shipping_companies.php:91
+#: ../inventory/manage/locations.php:146
 msgid "Address"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/shipping_companies.php:134
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_types.php:182
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:55
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:308
-#: /var/www/fa_unstable/devel/../manufacturing/manage/work_centres.php:137
+#: ../admin/shipping_companies.php:134
+#: ../gl/manage/gl_account_types.php:188
+#: ../gl/includes/ui/gl_bank_ui.inc:56
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:58
+#: ../inventory/manage/items.php:306
+#: ../inventory/manage/items.php.orig:299
+#: ../manufacturing/manage/work_centres.php:137
 msgid "Name:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/shipping_companies.php:136
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:104
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:260
+#: ../admin/shipping_companies.php:136
+#: ../purchasing/manage/suppliers.php.orig:113
+#: ../sales/manage/customer_branches.php:261
 msgid "Contact Person:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/shipping_companies.php:140
-#: /var/www/fa_unstable/devel/../includes/ui/contacts_view.inc:92
-#: /var/www/fa_unstable/devel/../inventory/manage/locations.php:205
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:106
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:262
+#: ../admin/shipping_companies.php:140
+#: ../includes/ui/contacts_view.inc:103
+#: ../inventory/manage/locations.php:205
+#: ../purchasing/manage/suppliers.php:136
+#: ../purchasing/manage/suppliers.php.orig:115
+#: ../sales/manage/customer_branches.php:263
+#: ../sales/manage/customers.php:253
+#: ../sales/manage/sav.customers.php:253
 msgid "Secondary Phone Number:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/system_diagnostics.php:17
+#: ../admin/system_diagnostics.php:17
 msgid "System Diagnostics"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/tags.php:33
+#: ../admin/tags.php:33
 msgid "Unspecified tag type"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/tags.php:40
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:260
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:268
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:279
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:307
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:314
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:324
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:349
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:355
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:364
+#: ../admin/tags.php:40
+#: ../reporting/reports_main.php:273
+#: ../reporting/reports_main.php:281
+#: ../reporting/reports_main.php:292
+#: ../reporting/reports_main.php:320
+#: ../reporting/reports_main.php:327
+#: ../reporting/reports_main.php:337
+#: ../reporting/reports_main.php:362
+#: ../reporting/reports_main.php:368
+#: ../reporting/reports_main.php:377
 msgid "Account Tags"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/tags.php:44
+#: ../admin/tags.php:44
 msgid "Dimension Tags"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/tags.php:57
+#: ../admin/tags.php:57
 msgid "The tag name cannot be empty."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/tags.php:73
+#: ../admin/tags.php:73
 msgid "Selected tag settings have been updated"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/tags.php:78
+#: ../admin/tags.php:78
 msgid "New tag has been added"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/tags.php:94
+#: ../admin/tags.php:94
 msgid ""
 "Cannot delete this tag because records have been created referring to it."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/tags.php:109
+#: ../admin/tags.php:109
 msgid "Selected tag has been deleted"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/tags.php:128
+#: ../admin/tags.php:128
 msgid "Tag Name"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/tags.php:128
+#: ../admin/tags.php:128
 msgid "Tag Description"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/tags.php:165
+#: ../admin/tags.php:165
 msgid "Tag Name:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/tags.php:166
+#: ../admin/tags.php:166
 msgid "Tag Description:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/users.php:16
+#: ../admin/users.php:16
 msgid "Users"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/users.php:31
+#: ../admin/users.php:31
 msgid "The user login entered must be at least 4 characters long."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/users.php:72
+#: ../admin/users.php:72
 msgid "The selected user has been updated."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/users.php:86
+#: ../admin/users.php:86
 msgid "A new user has been added."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/users.php:97
+#: ../admin/users.php:97
 msgid "User has been deleted."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/users.php:114
+#: ../admin/users.php:114
 msgid "User login"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/users.php:114
-#: /var/www/fa_unstable/devel/../admin/users.php:198
-#: /var/www/fa_unstable/devel/../includes/ui/contacts_view.inc:41
+#: ../admin/users.php:114
+#: ../admin/users.php:198
+#: ../includes/ui/contacts_view.inc:41
 msgid "Full Name"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/users.php:114
-#: /var/www/fa_unstable/devel/../includes/ui/contacts_view.inc:41
-#: /var/www/fa_unstable/devel/../inventory/manage/locations.php:146
-#: /var/www/fa_unstable/devel/../reporting/rep106.php:86
-#: /var/www/fa_unstable/devel/../reporting/includes/header2.inc:86
-#: /var/www/fa_unstable/devel/../sales/manage/sales_people.php:99
+#: ../admin/users.php:114
+#: ../includes/ui/contacts_view.inc:41
+#: ../inventory/manage/locations.php:146
+#: ../reporting/rep106.php:86
+#: ../reporting/includes/header2.inc:98
+#: ../sales/manage/sales_people.php:99
 msgid "Phone"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/users.php:115
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:301
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:81
+#: ../admin/users.php:115
+#: ../sales/manage/customer_branches.php:302
+#: ../sales/view/view_sales_order.php:96
+#: ../sales/view/view_sales_order.php.orig:83
 msgid "E-mail"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/users.php:115
+#: ../admin/users.php:115
 msgid "Last Visit"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/users.php:115
+#: ../admin/users.php:115
 msgid "Access Level"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/users.php:184
+#: ../admin/users.php:184
 msgid "User Login:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/users.php:195
+#: ../admin/users.php:195
 msgid "Enter a new password to change, leave empty to keep current."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/users.php:200
+#: ../admin/users.php:200
 msgid "Telephone No.:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/users.php:204
+#: ../admin/users.php:204
 msgid "Access Level:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/users.php:208
+#: ../admin/users.php:208
 msgid "User's POS"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/users.php:213
+#: ../admin/users.php:213
 msgid "Use popup window for reports:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/view_print_transaction.php:27
+#: ../admin/view_print_transaction.php:27
 msgid "View or Print Transactions"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/view_print_transaction.php:43
-#: /var/www/fa_unstable/devel/../admin/view_print_transaction.php:45
-#: /var/www/fa_unstable/devel/../admin/view_print_transaction.php:129
-#: /var/www/fa_unstable/devel/../includes/ui/ui_controls.inc:171
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search_completed.php:103
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search.php:88
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_inquiry.php:197
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_deliveries_view.php:155
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:116
+#: ../admin/view_print_transaction.php:43
+#: ../admin/view_print_transaction.php:45
+#: ../admin/view_print_transaction.php:129
+#: ../includes/ui/ui_controls.inc:195
+#: ../purchasing/inquiry/po_search_completed.php:112
+#: ../purchasing/inquiry/po_search_completed.php.orig:111
+#: ../purchasing/inquiry/po_search.php:93
+#: ../sales/inquiry/customer_inquiry.php:185
+#: ../sales/inquiry/customer_inquiry.php.orig:209
+#: ../sales/inquiry/sales_deliveries_view.php:160
+#: ../sales/inquiry/sales_deliveries_view.php.orig:160
+#: ../sales/inquiry/sales_orders_view.php:125
+#: ../sales/inquiry/sales_orders_view.php.orig:116
 msgid "Print"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/view_print_transaction.php:67
+#: ../admin/view_print_transaction.php:67
 msgid "Only documents can be printed."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/view_print_transaction.php:79
+#: ../admin/view_print_transaction.php:79
+#: ../admin/void_transaction.php:166
 msgid "from #:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/view_print_transaction.php:81
+#: ../admin/view_print_transaction.php:81
+#: ../admin/void_transaction.php:168
 msgid "to #:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/view_print_transaction.php:83
-#: /var/www/fa_unstable/devel/../dimensions/inquiry/search_dimensions.php:88
-#: /var/www/fa_unstable/devel/../gl/inquiry/journal_inquiry.php:53
-#: /var/www/fa_unstable/devel/../manufacturing/search_work_orders.php:78
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:443
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search_completed.php:69
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search.php:71
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_allocation_inquiry.php:57
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_inquiry.php:54
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_allocation_inquiry.php:51
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_inquiry.php:54
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_deliveries_view.php:111
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:238
+#: ../admin/view_print_transaction.php:83
+#: ../admin/void_transaction.php:170
+#: ../dimensions/inquiry/search_dimensions.php:88
+#: ../gl/inquiry/journal_inquiry.php:53
+#: ../manufacturing/search_work_orders.php:78
+#: ../purchasing/includes/ui/invoice_ui.inc:474
+#: ../purchasing/inquiry/po_search_completed.php:74
+#: ../purchasing/inquiry/po_search_completed.php.orig:75
+#: ../purchasing/inquiry/po_search.php:76
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:57
+#: ../purchasing/inquiry/supplier_inquiry.php:55
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:55
+#: ../sales/inquiry/customer_allocation_inquiry.php:51
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:51
+#: ../sales/inquiry/customer_inquiry.php:54
+#: ../sales/inquiry/customer_inquiry.php.orig:55
+#: ../sales/inquiry/sales_deliveries_view.php:116
+#: ../sales/inquiry/sales_deliveries_view.php.orig:116
+#: ../sales/inquiry/sales_orders_view.php:269
+#: ../sales/inquiry/sales_orders_view.php.orig:246
 msgid "Search"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/view_print_transaction.php:96
+#: ../admin/view_print_transaction.php:96
 msgid ""
 "The starting transaction number is expected to be numeric and greater than "
 "zero."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/view_print_transaction.php:102
+#: ../admin/view_print_transaction.php:102
 msgid ""
 "The ending transaction number is expected to be numeric and greater than "
 "zero."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/view_print_transaction.php:127
-#: /var/www/fa_unstable/devel/../admin/void_transaction.php:161
-#: /var/www/fa_unstable/devel/../dimensions/inquiry/search_dimensions.php:128
-#: /var/www/fa_unstable/devel/../dimensions/view/view_dimension.php:54
-#: /var/www/fa_unstable/devel/../gl/bank_account_reconcile.php:235
-#: /var/www/fa_unstable/devel/../gl/inquiry/bank_inquiry.php:67
-#: /var/www/fa_unstable/devel/../gl/inquiry/journal_inquiry.php:123
-#: /var/www/fa_unstable/devel/../gl/view/bank_transfer_view.php:86
-#: /var/www/fa_unstable/devel/../gl/view/gl_deposit_view.php:75
-#: /var/www/fa_unstable/devel/../gl/view/gl_payment_view.php:73
-#: /var/www/fa_unstable/devel/../gl/view/gl_trans_view.php:35
-#: /var/www/fa_unstable/devel/../includes/ui/contacts_view.inc:41
-#: /var/www/fa_unstable/devel/../inventory/inquiry/stock_movements.php:70
-#: /var/www/fa_unstable/devel/../inventory/view/view_adjustment.php:44
-#: /var/www/fa_unstable/devel/../inventory/view/view_transfer.php:44
-#: /var/www/fa_unstable/devel/../manufacturing/search_work_orders.php:160
-#: /var/www/fa_unstable/devel/../manufacturing/view/wo_issue_view.php:43
-#: /var/www/fa_unstable/devel/../manufacturing/view/wo_production_view.php:44
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:157
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:200
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:276
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:280
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:331
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/grn_ui.inc:36
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/grn_ui.inc:53
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:288
-#: /var/www/fa_unstable/devel/../purchasing/view/view_po.php:115
-#: /var/www/fa_unstable/devel/../purchasing/view/view_supp_credit.php:43
-#: /var/www/fa_unstable/devel/../purchasing/view/view_supp_invoice.php:46
-#: /var/www/fa_unstable/devel/../purchasing/view/view_supp_payment.php:70
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search_completed.php:112
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search.php:126
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_allocation_inquiry.php:127
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_inquiry.php:164
-#: /var/www/fa_unstable/devel/../purchasing/allocations/supplier_allocation_main.php:96
-#: /var/www/fa_unstable/devel/../reporting/rep501.php:85
-#: /var/www/fa_unstable/devel/../reporting/rep601.php:76
-#: /var/www/fa_unstable/devel/../reporting/rep702.php:51
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:45
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:256
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:258
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:346
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:348
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:380
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:382
-#: /var/www/fa_unstable/devel/../sales/allocations/customer_allocation_main.php:95
-#: /var/www/fa_unstable/devel/../sales/view/view_dispatch.php:85
-#: /var/www/fa_unstable/devel/../sales/view/view_invoice.php:85
-#: /var/www/fa_unstable/devel/../sales/view/view_receipt.php:50
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:79
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_allocation_inquiry.php:143
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_inquiry.php:215
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_deliveries_view.php:179
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_credit_ui.inc:85
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_credit_ui.inc:87
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:366
+#: ../admin/view_print_transaction.php:127
+#: ../admin/void_transaction.php:182
+#: ../dimensions/inquiry/search_dimensions.php:128
+#: ../dimensions/view/view_dimension.php:54
+#: ../gl/bank_account_reconcile.php:233
+#: ../gl/inquiry/bank_inquiry.php:70
+#: ../gl/inquiry/journal_inquiry.php:131
+#: ../gl/view/bank_transfer_view.php:86
+#: ../gl/view/gl_deposit_view.php:75
+#: ../gl/view/gl_payment_view.php:73
+#: ../gl/view/gl_trans_view.php:35
+#: ../includes/ui/contacts_view.inc:41
+#: ../inventory/inquiry/stock_movements.php:77
+#: ../inventory/inquiry/stock_movements.php.orig:79
+#: ../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:321
+#: ../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:121
+#: ../purchasing/inquiry/po_search_completed.php.orig:120
+#: ../purchasing/inquiry/po_search.php:131
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:127
+#: ../purchasing/inquiry/supplier_inquiry.php:175
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:172
+#: ../purchasing/allocations/supplier_allocation_main.php:96
+#: ../reporting/rep501.php:85
+#: ../reporting/rep601.php:76
+#: ../reporting/rep602.php:80
+#: ../reporting/rep702.php:51
+#: ../reporting/includes/doctext.inc:221
+#: ../sales/customer_credit_invoice.php:247
+#: ../sales/customer_credit_invoice.php:249
+#: ../sales/customer_delivery.php:356
+#: ../sales/customer_delivery.php:358
+#: ../sales/customer_invoice.php:458
+#: ../sales/customer_invoice.php:460
+#: ../sales/allocations/customer_allocation_main.php:95
+#: ../sales/view/view_dispatch.php:85
+#: ../sales/view/view_invoice.php:85
+#: ../sales/view/view_receipt.php:50
+#: ../sales/view/view_sales_order.php:94
+#: ../sales/view/view_sales_order.php.orig:81
+#: ../sales/inquiry/customer_allocation_inquiry.php:146
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:146
+#: ../sales/inquiry/customer_inquiry.php:203
+#: ../sales/inquiry/customer_inquiry.php.orig:227
+#: ../sales/inquiry/sales_deliveries_view.php:184
+#: ../sales/inquiry/sales_deliveries_view.php.orig: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
+#: ../sales/includes/ui/sales_order_ui.inc.orig:373
 msgid "Reference"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/view_print_transaction.php:128
-#: /var/www/fa_unstable/devel/../admin/void_transaction.php:162
-#: /var/www/fa_unstable/devel/../dimensions/inquiry/search_dimensions.php:131
-#: /var/www/fa_unstable/devel/../dimensions/view/view_dimension.php:54
-#: /var/www/fa_unstable/devel/../gl/accruals.php:87
-#: /var/www/fa_unstable/devel/../gl/accruals.php:191
-#: /var/www/fa_unstable/devel/../gl/bank_account_reconcile.php:236
-#: /var/www/fa_unstable/devel/../gl/inquiry/bank_inquiry.php:67
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_account_inquiry.php:125
-#: /var/www/fa_unstable/devel/../gl/inquiry/journal_inquiry.php:120
-#: /var/www/fa_unstable/devel/../gl/view/accrual_trans.php:52
-#: /var/www/fa_unstable/devel/../gl/view/bank_transfer_view.php:83
-#: /var/www/fa_unstable/devel/../gl/view/gl_deposit_view.php:68
-#: /var/www/fa_unstable/devel/../gl/view/gl_payment_view.php:66
-#: /var/www/fa_unstable/devel/../gl/view/gl_trans_view.php:36
-#: /var/www/fa_unstable/devel/../includes/ui/allocation_cart.inc:259
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:480
-#: /var/www/fa_unstable/devel/../inventory/inquiry/stock_movements.php:70
-#: /var/www/fa_unstable/devel/../inventory/view/view_adjustment.php:45
-#: /var/www/fa_unstable/devel/../inventory/view/view_transfer.php:47
-#: /var/www/fa_unstable/devel/../manufacturing/search_work_orders.php:166
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:417
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:423
-#: /var/www/fa_unstable/devel/../manufacturing/view/wo_production_view.php:45
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:157
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:200
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:236
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:277
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:281
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:332
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:103
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:302
-#: /var/www/fa_unstable/devel/../purchasing/view/view_po.php:140
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_allocation_inquiry.php:130
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_inquiry.php:167
-#: /var/www/fa_unstable/devel/../purchasing/allocations/supplier_allocation_main.php:97
-#: /var/www/fa_unstable/devel/../reporting/rep101.php:130
-#: /var/www/fa_unstable/devel/../reporting/rep201.php:118
-#: /var/www/fa_unstable/devel/../reporting/rep501.php:85
-#: /var/www/fa_unstable/devel/../reporting/rep601.php:76
-#: /var/www/fa_unstable/devel/../reporting/rep704.php:78
-#: /var/www/fa_unstable/devel/../reporting/rep704.php:81
-#: /var/www/fa_unstable/devel/../reporting/rep704.php:84
-#: /var/www/fa_unstable/devel/../reporting/rep709.php:107
-#: /var/www/fa_unstable/devel/../reporting/rep710.php:75
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:15
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:108
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:116
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:376
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:411
-#: /var/www/fa_unstable/devel/../sales/allocations/customer_allocation_main.php:96
-#: /var/www/fa_unstable/devel/../sales/view/view_credit.php:69
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:94
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:127
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:159
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_allocation_inquiry.php:145
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_inquiry.php:216
+#: ../admin/view_print_transaction.php:128
+#: ../admin/void_transaction.php:183
+#: ../dimensions/inquiry/search_dimensions.php:131
+#: ../dimensions/view/view_dimension.php:54
+#: ../gl/accruals.php:94
+#: ../gl/accruals.php:199
+#: ../gl/bank_account_reconcile.php:234
+#: ../gl/inquiry/bank_inquiry.php:70
+#: ../gl/inquiry/gl_account_inquiry.php:126
+#: ../gl/inquiry/journal_inquiry.php:128
+#: ../gl/view/accrual_trans.php:52
+#: ../gl/view/bank_transfer_view.php:83
+#: ../gl/view/gl_deposit_view.php:68
+#: ../gl/view/gl_payment_view.php:66
+#: ../gl/view/gl_trans_view.php:36
+#: ../includes/ui/allocation_cart.inc:264
+#: ../includes/ui/ui_view.inc:488
+#: ../includes/ui/ui_view.inc.orig:488
+#: ../inventory/inquiry/stock_movements.php:77
+#: ../inventory/inquiry/stock_movements.php.orig:79
+#: ../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_costs_view.php:46
+#: ../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:114
+#: ../purchasing/includes/ui/po_ui.inc:335
+#: ../purchasing/view/view_po.php:140
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:130
+#: ../purchasing/inquiry/supplier_inquiry.php:178
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:175
+#: ../purchasing/allocations/supplier_allocation_main.php:97
+#: ../reporting/rep101.php:130
+#: ../reporting/rep107.php:192
+#: ../reporting/rep201.php:118
+#: ../reporting/rep501.php:85
+#: ../reporting/rep601.php:76
+#: ../reporting/rep602.php:80
+#: ../reporting/rep704.php:79
+#: ../reporting/rep704.php:82
+#: ../reporting/rep704.php:85
+#: ../reporting/rep709.php:109
+#: ../reporting/rep710.php:75
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:208
+#: ../reporting/includes/doctext.inc:246
+#: ../reporting/includes/header2.inc:135
+#: ../sales/customer_delivery.php:386
+#: ../sales/customer_invoice.php:501
+#: ../sales/allocations/customer_allocation_main.php:96
+#: ../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/view/view_sales_order.php.orig:96
+#: ../sales/view/view_sales_order.php.orig:129
+#: ../sales/view/view_sales_order.php.orig:161
+#: ../sales/inquiry/customer_allocation_inquiry.php:148
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:148
+#: ../sales/inquiry/customer_inquiry.php:204
+#: ../sales/inquiry/customer_inquiry.php.orig:228
 msgid "Date"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/view_print_transaction.php:130
-#: /var/www/fa_unstable/devel/../admin/void_transaction.php:163
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:51
+#: ../admin/view_print_transaction.php:130
+#: ../admin/void_transaction.php:184
+#: ../includes/ui/ui_view.inc:51
+#: ../includes/ui/ui_view.inc.orig:51
 msgid "GL"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/void_transaction.php:29
+#: ../admin/void_transaction.php:29
 msgid "Void a Transaction"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/void_transaction.php:119
-#: /var/www/fa_unstable/devel/../admin/void_transaction.php:164
-#: /var/www/fa_unstable/devel/../includes/ui/ui_input.inc:136
-#: /var/www/fa_unstable/devel/../includes/ui/ui_input.inc:272
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:20
+#: ../admin/void_transaction.php:126
+#: ../admin/void_transaction.php:185
+#: ../includes/ui/ui_input.inc:137
+#: ../includes/ui/ui_input.inc:281
+#: ../includes/ui/ui_lists.inc:20
+#: ../includes/ui/ui_lists.inc.orig:20
 msgid "Select"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/void_transaction.php:147
+#: ../admin/void_transaction.php:157
 msgid "Transaction Type:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/void_transaction.php:183
+#: ../admin/void_transaction.php:204
 msgid "Transaction #:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/void_transaction.php:185
+#: ../admin/void_transaction.php:206
 msgid "Voiding Date:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/void_transaction.php:187
-#: /var/www/fa_unstable/devel/../dimensions/dimension_entry.php:283
-#: /var/www/fa_unstable/devel/../gl/bank_transfer.php:91
-#: /var/www/fa_unstable/devel/../gl/inquiry/journal_inquiry.php:56
-#: /var/www/fa_unstable/devel/../gl/manage/revaluate_currencies.php:103
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:308
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_add_finished.php:203
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:449
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_release.php:99
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:160
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:495
-#: /var/www/fa_unstable/devel/../purchasing/supplier_payment.php:298
-#: /var/www/fa_unstable/devel/../sales/customer_payments.php:291
+#: ../admin/void_transaction.php:208
+#: ../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
+#: ../includes/ui/ui_view.inc.orig:308
+#: ../manufacturing/work_order_add_finished.php:210
+#: ../manufacturing/work_order_costs.php:146
+#: ../manufacturing/work_order_entry.php:451
+#: ../manufacturing/work_order_release.php:100
+#: ../purchasing/includes/ui/invoice_ui.inc:180
+#: ../purchasing/includes/ui/po_ui.inc:492
+#: ../purchasing/po_entry_items.php:558
+#: ../purchasing/supplier_payment.php:313
+#: ../sales/customer_invoice.php:678
+#: ../sales/customer_payments.php:410
 msgid "Memo:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/void_transaction.php:192
-#: /var/www/fa_unstable/devel/../admin/void_transaction.php:201
+#: ../admin/void_transaction.php:213
+#: ../admin/void_transaction.php:222
 msgid "Void Transaction"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/void_transaction.php:197
-#: /var/www/fa_unstable/devel/../admin/void_transaction.php:276
+#: ../admin/void_transaction.php:218
+#: ../admin/void_transaction.php:297
 msgid "The entered transaction does not exist or cannot be voided."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/void_transaction.php:205
+#: ../admin/void_transaction.php:226
 msgid ""
 "Are you sure you want to void this transaction ? This action cannot be "
 "undone."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/void_transaction.php:207
-#: /var/www/fa_unstable/devel/../includes/ui/ui_controls.inc:560
+#: ../admin/void_transaction.php:228
+#: ../includes/ui/ui_controls.inc:593
 msgid "Proceed"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/void_transaction.php:221
+#: ../admin/void_transaction.php:242
 msgid "The selected transaction was closed for edition and cannot be voided."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/void_transaction.php:227
-#: /var/www/fa_unstable/devel/../gl/accruals.php:32
-#: /var/www/fa_unstable/devel/../gl/bank_transfer.php:108
-#: /var/www/fa_unstable/devel/../gl/gl_journal.php:154
-#: /var/www/fa_unstable/devel/../gl/manage/exchange_rates.php:33
-#: /var/www/fa_unstable/devel/../gl/manage/revaluate_currencies.php:50
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_add_finished.php:97
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_costs.php:82
-#: /var/www/fa_unstable/devel/../purchasing/po_receive_items.php:170
-#: /var/www/fa_unstable/devel/../purchasing/supplier_payment.php:179
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:89
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:335
+#: ../admin/void_transaction.php:248
+#: ../gl/accruals.php:32
+#: ../gl/bank_transfer.php:110
+#: ../gl/gl_journal.php:158
+#: ../gl/manage/close_period.php:34
+#: ../gl/manage/close_period.php.orig:34
+#: ../gl/manage/exchange_rates.php:33
+#: ../gl/manage/revaluate_currencies.php:53
+#: ../manufacturing/work_order_add_finished.php:98
+#: ../manufacturing/work_order_costs.php:80
+#: ../purchasing/po_receive_items.php:174
+#: ../purchasing/supplier_payment.php:179
+#: ../sales/customer_credit_invoice.php:91
+#: ../sales/sales_order_entry.php:345
+#: ../sales/manage/recurrent_invoices.php:41
+#: ../sales/manage/recurrent_invoices.php:46
+#: ../sales/manage/recurrent_invoices.php:51
 msgid "The entered date is invalid."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/void_transaction.php:233
-#: /var/www/fa_unstable/devel/../gl/accruals.php:38
-#: /var/www/fa_unstable/devel/../gl/bank_transfer.php:114
-#: /var/www/fa_unstable/devel/../gl/gl_bank.php:259
-#: /var/www/fa_unstable/devel/../gl/gl_journal.php:160
-#: /var/www/fa_unstable/devel/../gl/manage/revaluate_currencies.php:56
-#: /var/www/fa_unstable/devel/../inventory/adjustments.php:114
-#: /var/www/fa_unstable/devel/../inventory/transfers.php:111
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_add_finished.php:103
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_costs.php:88
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:159
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_issue.php:82
-#: /var/www/fa_unstable/devel/../purchasing/supplier_credit.php:176
-#: /var/www/fa_unstable/devel/../purchasing/supplier_invoice.php:174
-#: /var/www/fa_unstable/devel/../purchasing/supplier_payment.php:185
-#: /var/www/fa_unstable/devel/../sales/create_recurrent_invoices.php:92
-#: /var/www/fa_unstable/devel/../sales/credit_note_entry.php:157
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:93
-#: /var/www/fa_unstable/devel/../sales/customer_payments.php:100
+#: ../admin/void_transaction.php:254
 msgid "The entered date is not in fiscal year."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/void_transaction.php:240
+#: ../admin/void_transaction.php:261
 msgid "The transaction number is expected to be numeric and greater than zero."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/void_transaction.php:257
+#: ../admin/void_transaction.php:278
 msgid "The selected transaction has already been voided."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/void_transaction.php:270
+#: ../admin/void_transaction.php:291
 msgid "Selected transaction has been voided."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/db/fiscalyears_db.inc:115
+#: ../admin/db/fiscalyears_db.inc:136
 msgid ""
 "The Retained Earnings Account or the Profit and Loss Year Account has not "
 "been set in System and General GL Setup"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/db/fiscalyears_db.inc:139
-#: /var/www/fa_unstable/devel/../admin/db/fiscalyears_db.inc:141
+#: ../admin/db/fiscalyears_db.inc:141
+msgid ""
+"The Retained Earnings Account should be a Balance Account or the Profit and "
+"Loss Year Account should be an Expense Account (preferred the last one in "
+"the Expense Class)"
+msgstr ""
+
+#: ../admin/db/fiscalyears_db.inc:166
+#: ../admin/db/fiscalyears_db.inc:168
 msgid "Closing Year"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/db/fiscalyears_db.inc:187
-#: /var/www/fa_unstable/devel/../reporting/rep101.php:175
-#: /var/www/fa_unstable/devel/../reporting/rep201.php:167
-#: /var/www/fa_unstable/devel/../reporting/rep706.php:181
+#: ../admin/db/fiscalyears_db.inc:214
+#: ../reporting/rep101.php:175
+#: ../reporting/rep201.php:167
+#: ../reporting/rep706.php:181
 msgid "Open Balance"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/db/maintenance_db.inc:150
+#: ../admin/db/maintenance_db.inc:152
+#: ../admin/db/maintenance_db.inc.orig:150
 #, php-format
 msgid "Cannot open the extension setup file '%s' for writing."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/db/maintenance_db.inc:158
+#: ../admin/db/maintenance_db.inc:160
+#: ../admin/db/maintenance_db.inc.orig:158
 #, php-format
 msgid "Cannot write to the extensions setup file '%s'."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/db/maintenance_db.inc:176
+#: ../admin/db/maintenance_db.inc:178
+#: ../admin/db/maintenance_db.inc.orig:176
 msgid "Cannot update system extensions list."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/db/maintenance_db.inc:194
+#: ../admin/db/maintenance_db.inc:196
+#: ../admin/db/maintenance_db.inc.orig:194
 #, php-format
 msgid "Cannot update extensions list for company '%s'."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/db/maintenance_db.inc:231
+#: ../admin/db/maintenance_db.inc:233
+#: ../admin/db/maintenance_db.inc.orig:231
 msgid "Cannot open the languages file - "
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/db/maintenance_db.inc:238
+#: ../admin/db/maintenance_db.inc:240
+#: ../admin/db/maintenance_db.inc.orig:238
 msgid "Cannot write to the language file - "
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/db/maintenance_db.inc:248
+#: ../admin/db/maintenance_db.inc:250
+#: ../admin/db/maintenance_db.inc.orig:248
 msgid "The language files folder "
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/db/maintenance_db.inc:413
+#: ../admin/db/maintenance_db.inc:389
+#: ../admin/db/maintenance_db.inc.orig:386
 #, php-format
 msgid "SQL script execution failed in line %d: %s"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/db/users_db.inc:196
+#: ../admin/db/users_db.inc:210
 msgid "user online"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/db/users_db.inc:196
+#: ../admin/db/users_db.inc:210
 msgid "users online"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../admin/db/voiding_db.inc:107
-#: /var/www/fa_unstable/devel/../sales/includes/db/sales_invoice_db.inc:208
+#: ../admin/db/voiding_db.inc:114
+#: ../sales/includes/db/sales_invoice_db.inc:249
 msgid "Voided."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/customers.php:16
+#: ../applications/customers.php:16
 msgid "&Sales"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/customers.php:18
-#: /var/www/fa_unstable/devel/../applications/dimensions.php:21
-#: /var/www/fa_unstable/devel/../applications/generalledger.php:18
-#: /var/www/fa_unstable/devel/../applications/inventory.php:18
-#: /var/www/fa_unstable/devel/../applications/manufacturing.php:18
-#: /var/www/fa_unstable/devel/../applications/suppliers.php:18
+#: ../applications/customers.php:18
+#: ../applications/dimensions.php:21
+#: ../applications/generalledger.php:18
+#: ../applications/inventory.php:18
+#: ../applications/manufacturing.php:18
+#: ../applications/suppliers.php:18
 msgid "Transactions"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/customers.php:19
+#: ../applications/customers.php:19
 msgid "Sales &Quotation Entry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/customers.php:21
+#: ../applications/customers.php:21
 msgid "Sales &Order Entry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/customers.php:23
+#: ../applications/customers.php:23
 msgid "Direct &Delivery"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/customers.php:25
-#: /var/www/fa_unstable/devel/../applications/suppliers.php:25
+#: ../applications/customers.php:25
+#: ../applications/suppliers.php:25
 msgid "Direct &Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/customers.php:28
+#: ../applications/customers.php:28
 msgid "&Delivery Against Sales Orders"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/customers.php:30
+#: ../applications/customers.php:30
 msgid "&Invoice Against Sales Delivery"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/customers.php:33
+#: ../applications/customers.php:33
 msgid "&Template Delivery"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/customers.php:35
+#: ../applications/customers.php:35
 msgid "&Template Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/customers.php:37
+#: ../applications/customers.php:37
 msgid "&Create and Print Recurrent Invoices"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/customers.php:40
+#: ../applications/customers.php:40
 msgid "Customer &Payments"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/customers.php:42
+#: ../applications/customers.php:42
+msgid "Invoice &Prepaid Orders"
+msgstr ""
+
+#: ../applications/customers.php:44
 msgid "Customer &Credit Notes"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/customers.php:44
+#: ../applications/customers.php:46
 msgid "&Allocate Customer Payments or Credit Notes"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/customers.php:47
-#: /var/www/fa_unstable/devel/../applications/dimensions.php:27
-#: /var/www/fa_unstable/devel/../applications/generalledger.php:34
-#: /var/www/fa_unstable/devel/../applications/inventory.php:24
-#: /var/www/fa_unstable/devel/../applications/manufacturing.php:24
-#: /var/www/fa_unstable/devel/../applications/suppliers.php:38
+#: ../applications/customers.php:49
+#: ../applications/dimensions.php:27
+#: ../applications/generalledger.php:34
+#: ../applications/inventory.php:24
+#: ../applications/manufacturing.php:24
+#: ../applications/suppliers.php:38
 msgid "Inquiries and Reports"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/customers.php:48
+#: ../applications/customers.php:50
 msgid "Sales Quotation I&nquiry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/customers.php:50
+#: ../applications/customers.php:52
 msgid "Sales Order &Inquiry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/customers.php:52
+#: ../applications/customers.php:54
 msgid "Customer Transaction &Inquiry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/customers.php:55
+#: ../applications/customers.php:57
 msgid "Customer Allocation &Inquiry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/customers.php:58
+#: ../applications/customers.php:60
 msgid "Customer and Sales &Reports"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/customers.php:61
-#: /var/www/fa_unstable/devel/../applications/dimensions.php:34
-#: /var/www/fa_unstable/devel/../applications/generalledger.php:55
-#: /var/www/fa_unstable/devel/../applications/inventory.php:32
-#: /var/www/fa_unstable/devel/../applications/manufacturing.php:34
-#: /var/www/fa_unstable/devel/../applications/setup.php:54
-#: /var/www/fa_unstable/devel/../applications/suppliers.php:50
+#: ../applications/customers.php:63
+#: ../applications/dimensions.php:34
+#: ../applications/generalledger.php:55
+#: ../applications/inventory.php:32
+#: ../applications/manufacturing.php:34
+#: ../applications/setup.php:54
+#: ../applications/suppliers.php:50
 msgid "Maintenance"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/customers.php:62
+#: ../applications/customers.php:64
 msgid "Add and Manage &Customers"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/customers.php:64
+#: ../applications/customers.php:66
 msgid "Customer &Branches"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/customers.php:66
+#: ../applications/customers.php:68
 msgid "Sales &Groups"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/customers.php:68
+#: ../applications/customers.php:70
 msgid "Recurrent &Invoices"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/customers.php:70
+#: ../applications/customers.php:72
 msgid "Sales T&ypes"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/customers.php:72
+#: ../applications/customers.php:74
 msgid "Sales &Persons"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/customers.php:74
+#: ../applications/customers.php:76
 msgid "Sales &Areas"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/customers.php:76
+#: ../applications/customers.php:78
 msgid "Credit &Status Setup"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/dimensions.php:17
+#: ../applications/dimensions.php:17
 msgid "&Dimensions"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/dimensions.php:22
+#: ../applications/dimensions.php:22
 msgid "Dimension &Entry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/dimensions.php:24
+#: ../applications/dimensions.php:24
 msgid "&Outstanding Dimensions"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/dimensions.php:28
+#: ../applications/dimensions.php:28
 msgid "Dimension &Inquiry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/dimensions.php:31
+#: ../applications/dimensions.php:31
 msgid "Dimension &Reports"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/dimensions.php:35
+#: ../applications/dimensions.php:35
 msgid "Dimension &Tags"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/generalledger.php:16
+#: ../applications/generalledger.php:16
 msgid "&Banking and General Ledger"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/generalledger.php:19
+#: ../applications/generalledger.php:19
 msgid "&Payments"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/generalledger.php:21
+#: ../applications/generalledger.php:21
 msgid "&Deposits"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/generalledger.php:23
+#: ../applications/generalledger.php:23
 msgid "Bank Account &Transfers"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/generalledger.php:25
+#: ../applications/generalledger.php:25
 msgid "&Journal Entry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/generalledger.php:27
+#: ../applications/generalledger.php:27
 msgid "&Budget Entry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/generalledger.php:29
+#: ../applications/generalledger.php:29
 msgid "&Reconcile Bank Account"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/generalledger.php:31
+#: ../applications/generalledger.php:31
 msgid "Revenue / &Costs Accruals"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/generalledger.php:35
+#: ../applications/generalledger.php:35
 msgid "&Journal Inquiry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/generalledger.php:37
+#: ../applications/generalledger.php:37
 msgid "GL &Inquiry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/generalledger.php:39
+#: ../applications/generalledger.php:39
 msgid "Bank Account &Inquiry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/generalledger.php:41
+#: ../applications/generalledger.php:41
 msgid "Ta&x Inquiry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/generalledger.php:44
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:284
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:329
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:369
+#: ../applications/generalledger.php:44
+#: ../reporting/reports_main.php:297
+#: ../reporting/reports_main.php:342
+#: ../reporting/reports_main.php:382
 msgid "Trial &Balance"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/generalledger.php:46
+#: ../applications/generalledger.php:46
 msgid "Balance &Sheet Drilldown"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/generalledger.php:48
+#: ../applications/generalledger.php:48
 msgid "&Profit and Loss Drilldown"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/generalledger.php:50
+#: ../applications/generalledger.php:50
 msgid "Banking &Reports"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/generalledger.php:52
+#: ../applications/generalledger.php:52
 msgid "General Ledger &Reports"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/generalledger.php:56
+#: ../applications/generalledger.php:56
 msgid "Bank &Accounts"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/generalledger.php:58
+#: ../applications/generalledger.php:58
 msgid "&Quick Entries"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/generalledger.php:60
+#: ../applications/generalledger.php:60
 msgid "Account &Tags"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/generalledger.php:63
+#: ../applications/generalledger.php:63
 msgid "&Currencies"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/generalledger.php:65
+#: ../applications/generalledger.php:65
 msgid "&Exchange Rates"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/generalledger.php:68
+#: ../applications/generalledger.php:68
 msgid "&GL Accounts"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/generalledger.php:70
+#: ../applications/generalledger.php:70
 msgid "GL Account &Groups"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/generalledger.php:72
+#: ../applications/generalledger.php:72
 msgid "GL Account &Classes"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/generalledger.php:75
+#: ../applications/generalledger.php:74
+msgid "&Closing GL Transactions"
+msgstr ""
+
+#: ../applications/generalledger.php:76
 msgid "&Revaluation of Currency Accounts"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/inventory.php:16
+#: ../applications/inventory.php:16
 msgid "&Items and Inventory"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/inventory.php:19
+#: ../applications/inventory.php:19
 msgid "Inventory Location &Transfers"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/inventory.php:21
+#: ../applications/inventory.php:21
 msgid "Inventory &Adjustments"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/inventory.php:25
+#: ../applications/inventory.php:25
 msgid "Inventory Item &Movements"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/inventory.php:27
+#: ../applications/inventory.php:27
 msgid "Inventory Item &Status"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/inventory.php:29
+#: ../applications/inventory.php:29
 msgid "Inventory &Reports"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/inventory.php:33
+#: ../applications/inventory.php:33
 msgid "&Items"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/inventory.php:35
+#: ../applications/inventory.php:35
 msgid "&Foreign Item Codes"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/inventory.php:37
+#: ../applications/inventory.php:37
 msgid "Sales &Kits"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/inventory.php:39
+#: ../applications/inventory.php:39
 msgid "Item &Categories"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/inventory.php:41
+#: ../applications/inventory.php:41
 msgid "Inventory &Locations"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/inventory.php:43
+#: ../applications/inventory.php:43
 msgid "Inventory &Movement Types"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/inventory.php:45
+#: ../applications/inventory.php:45
 msgid "&Units of Measure"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/inventory.php:47
+#: ../applications/inventory.php:47
 msgid "&Reorder Levels"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/inventory.php:50
+#: ../applications/inventory.php:50
 msgid "Pricing and Costs"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/inventory.php:51
+#: ../applications/inventory.php:51
 msgid "Sales &Pricing"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/inventory.php:53
+#: ../applications/inventory.php:53
 msgid "Purchasing &Pricing"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/inventory.php:55
+#: ../applications/inventory.php:55
 msgid "Standard &Costs"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/manufacturing.php:16
+#: ../applications/manufacturing.php:16
 msgid "&Manufacturing"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/manufacturing.php:19
+#: ../applications/manufacturing.php:19
+#: ../sales/sales_order_entry.php:113
 msgid "Work &Order Entry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/manufacturing.php:21
+#: ../applications/manufacturing.php:21
 msgid "&Outstanding Work Orders"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/manufacturing.php:25
-#: /var/www/fa_unstable/devel/../manufacturing/inquiry/bom_cost_inquiry.php:16
+#: ../applications/manufacturing.php:25
+#: ../manufacturing/inquiry/bom_cost_inquiry.php:16
 msgid "Costed Bill Of Material Inquiry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/manufacturing.php:27
+#: ../applications/manufacturing.php:27
 msgid "Inventory Item Where Used &Inquiry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/manufacturing.php:29
+#: ../applications/manufacturing.php:29
 msgid "Work Order &Inquiry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/manufacturing.php:31
+#: ../applications/manufacturing.php:31
 msgid "Manufacturing &Reports"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/manufacturing.php:35
+#: ../applications/manufacturing.php:35
 msgid "&Bills Of Material"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/manufacturing.php:37
+#: ../applications/manufacturing.php:37
 msgid "&Work Centres"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/setup.php:16
+#: ../applications/setup.php:16
 msgid "S&etup"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/setup.php:19
+#: ../applications/setup.php:19
 msgid "&Company Setup"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/setup.php:21
+#: ../applications/setup.php:21
 msgid "&User Accounts Setup"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/setup.php:23
+#: ../applications/setup.php:23
 msgid "&Access Setup"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/setup.php:25
+#: ../applications/setup.php:25
 msgid "&Display Setup"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/setup.php:27
+#: ../applications/setup.php:27
 msgid "&Forms Setup"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/setup.php:29
+#: ../applications/setup.php:29
 msgid "&Taxes"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/setup.php:31
+#: ../applications/setup.php:31
 msgid "Tax &Groups"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/setup.php:33
+#: ../applications/setup.php:33
 msgid "Item Ta&x Types"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/setup.php:35
+#: ../applications/setup.php:35
 msgid "System and &General GL Setup"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/setup.php:37
+#: ../applications/setup.php:37
 msgid "&Fiscal Years"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/setup.php:39
+#: ../applications/setup.php:39
 msgid "&Print Profiles"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/setup.php:43
+#: ../applications/setup.php:43
 msgid "Pa&yment Terms"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/setup.php:45
+#: ../applications/setup.php:45
 msgid "Shi&pping Company"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/setup.php:47
+#: ../applications/setup.php:47
 msgid "&Points of Sale"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/setup.php:49
+#: ../applications/setup.php:49
 msgid "&Printers"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/setup.php:51
+#: ../applications/setup.php:51
 msgid "Contact &Categories"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/setup.php:55
+#: ../applications/setup.php:55
 msgid "&Void a Transaction"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/setup.php:57
+#: ../applications/setup.php:57
 msgid "View or &Print Transactions"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/setup.php:59
+#: ../applications/setup.php:59
 msgid "&Attach Documents"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/setup.php:61
+#: ../applications/setup.php:61
 msgid "System &Diagnostics"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/setup.php:64
+#: ../applications/setup.php:64
 msgid "&Backup and Restore"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/setup.php:66
+#: ../applications/setup.php:66
 msgid "Create/Update &Companies"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/setup.php:68
+#: ../applications/setup.php:68
 msgid "Install/Update &Languages"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/setup.php:70
+#: ../applications/setup.php:70
 msgid "Install/Activate &Extensions"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/setup.php:72
+#: ../applications/setup.php:72
 msgid "Install/Activate &Themes"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/setup.php:74
+#: ../applications/setup.php:74
 msgid "Install/Activate &Chart of Accounts"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/setup.php:76
+#: ../applications/setup.php:76
 msgid "Software &Upgrade"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/suppliers.php:16
+#: ../applications/suppliers.php:16
 msgid "&Purchases"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/suppliers.php:19
+#: ../applications/suppliers.php:19
 msgid "Purchase &Order Entry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/suppliers.php:21
+#: ../applications/suppliers.php:21
 msgid "&Outstanding Purchase Orders Maintenance"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/suppliers.php:23
+#: ../applications/suppliers.php:23
 msgid "Direct &GRN"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/suppliers.php:28
+#: ../applications/suppliers.php:28
 msgid "&Payments to Suppliers"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/suppliers.php:31
+#: ../applications/suppliers.php:31
 msgid "Supplier &Invoices"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/suppliers.php:33
+#: ../applications/suppliers.php:33
 msgid "Supplier &Credit Notes"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/suppliers.php:35
+#: ../applications/suppliers.php:35
 msgid "&Allocate Supplier Payments or Credit Notes"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/suppliers.php:39
+#: ../applications/suppliers.php:39
 msgid "Purchase Orders &Inquiry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/suppliers.php:41
+#: ../applications/suppliers.php:41
 msgid "Supplier Transaction &Inquiry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/suppliers.php:44
+#: ../applications/suppliers.php:44
 msgid "Supplier Allocation &Inquiry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/suppliers.php:47
+#: ../applications/suppliers.php:47
 msgid "Supplier and Purchasing &Reports"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../applications/suppliers.php:51
+#: ../applications/suppliers.php:51
 msgid "&Suppliers"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/dimension_entry.php:27
+#: ../dimensions/dimension_entry.php:27
 msgid "Dimension Entry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/dimension_entry.php:47
+#: ../dimensions/dimension_entry.php:47
 msgid "The dimension has been entered."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/dimension_entry.php:58
+#: ../dimensions/dimension_entry.php:58
 msgid "The dimension has been updated."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/dimension_entry.php:68
+#: ../dimensions/dimension_entry.php:68
 msgid "The dimension has been deleted."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/dimension_entry.php:78
+#: ../dimensions/dimension_entry.php:78
 msgid "The dimension has been closed. There can be no more changes to it."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/dimension_entry.php:88
+#: ../dimensions/dimension_entry.php:88
 msgid "The dimension has been re-opened. "
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/dimension_entry.php:98
+#: ../dimensions/dimension_entry.php:98
 msgid "Enter a &new dimension"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/dimension_entry.php:100
+#: ../dimensions/dimension_entry.php:100
 msgid "&Select an existing dimension"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/dimension_entry.php:116
+#: ../dimensions/dimension_entry.php:116
 msgid "The dimension reference must be entered."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/dimension_entry.php:123
-#: /var/www/fa_unstable/devel/../gl/bank_transfer.php:146
-#: /var/www/fa_unstable/devel/../gl/gl_bank.php:247
-#: /var/www/fa_unstable/devel/../gl/gl_journal.php:174
-#: /var/www/fa_unstable/devel/../gl/manage/revaluate_currencies.php:69
-#: /var/www/fa_unstable/devel/../inventory/adjustments.php:101
-#: /var/www/fa_unstable/devel/../inventory/transfers.php:99
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_add_finished.php:83
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:138
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_issue.php:95
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:346
-#: /var/www/fa_unstable/devel/../purchasing/po_receive_items.php:184
-#: /var/www/fa_unstable/devel/../purchasing/supplier_credit.php:156
-#: /var/www/fa_unstable/devel/../purchasing/supplier_invoice.php:154
-#: /var/www/fa_unstable/devel/../purchasing/supplier_payment.php:198
-#: /var/www/fa_unstable/devel/../sales/credit_note_entry.php:147
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:106
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:181
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:287
-#: /var/www/fa_unstable/devel/../sales/customer_payments.php:112
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:404
+#: ../dimensions/dimension_entry.php:123
+#: ../gl/bank_transfer.php:171
+#: ../gl/gl_bank.php:257
+#: ../gl/gl_journal.php:178
+#: ../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:97
+#: ../purchasing/po_entry_items.php:365
+#: ../purchasing/po_receive_items.php:193
+#: ../purchasing/supplier_credit.php:173
+#: ../purchasing/supplier_invoice.php:178
+#: ../purchasing/supplier_payment.php:208
+#: ../sales/credit_note_entry.php:151
+#: ../sales/customer_credit_invoice.php:108
+#: ../sales/customer_delivery.php:180
+#: ../sales/customer_invoice.php:338
+#: ../sales/customer_payments.php:158
+#: ../sales/customer_payments.php:165
+#: ../sales/customer_payments.php:246
+#: ../sales/sales_order_entry.php:420
 msgid "The entered reference is already in use."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/dimension_entry.php:131
+#: ../dimensions/dimension_entry.php:131
 msgid "The dimension name must be entered."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/dimension_entry.php:138
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:153
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:233
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:232
+#: ../dimensions/dimension_entry.php:138
+#: ../manufacturing/work_order_entry.php:154
+#: ../manufacturing/work_order_entry.php:234
+#: ../purchasing/po_entry_items.php:238
 msgid "The date entered is in an invalid format."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/dimension_entry.php:145
+#: ../dimensions/dimension_entry.php:145
 msgid "The required by date entered is in an invalid format."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/dimension_entry.php:190
+#: ../dimensions/dimension_entry.php:190
 msgid "This dimension cannot be deleted because it has already been processed."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/dimension_entry.php:234
+#: ../dimensions/dimension_entry.php:234
 msgid "The dimension sent is not valid."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/dimension_entry.php:261
-#: /var/www/fa_unstable/devel/../dimensions/dimension_entry.php:268
+#: ../dimensions/dimension_entry.php:261
+#: ../dimensions/dimension_entry.php:268
 msgid "Dimension Reference:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/dimension_entry.php:277
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:31
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:64
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:72
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:123
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:186
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:194
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:226
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:237
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:248
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:264
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:274
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:285
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:297
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:311
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:320
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:330
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:341
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:353
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:361
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:370
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:378
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:384
+#: ../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: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
 msgid "Start Date"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/dimension_entry.php:279
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:418
+#: ../dimensions/dimension_entry.php:279
+#: ../manufacturing/work_order_entry.php:420
 msgid "Date Required By"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/dimension_entry.php:281
+#: ../dimensions/dimension_entry.php:281
 msgid "Tags:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/dimension_entry.php:288
+#: ../dimensions/dimension_entry.php:288
 msgid "This Dimension is closed."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/dimension_entry.php:293
+#: ../dimensions/dimension_entry.php:293
 msgid "Save changes to dimension"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/dimension_entry.php:295
+#: ../dimensions/dimension_entry.php:295
 msgid "Re-open This Dimension"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/dimension_entry.php:295
+#: ../dimensions/dimension_entry.php:295
 msgid "Mark this dimension as re-opened"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/dimension_entry.php:297
+#: ../dimensions/dimension_entry.php:297
 msgid "Close This Dimension"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/dimension_entry.php:297
+#: ../dimensions/dimension_entry.php:297
 msgid "Mark this dimension as closed"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/dimension_entry.php:298
+#: ../dimensions/dimension_entry.php:298
 msgid "Delete This Dimension"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/dimension_entry.php:298
+#: ../dimensions/dimension_entry.php:298
 msgid "Delete unused dimension"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/dimension_entry.php:302
-#: /var/www/fa_unstable/devel/../includes/ui/simple_crud_class.inc:225
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:185
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:382
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:384
+#: ../dimensions/dimension_entry.php:302
+#: ../includes/ui/simple_crud_class.inc:225
+#: ../purchasing/includes/ui/invoice_ui.inc:206
+#: ../purchasing/includes/ui/invoice_ui.inc:412
+#: ../purchasing/includes/ui/invoice_ui.inc:414
 msgid "Add"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/includes/dimensions_ui.inc:24
+#: ../dimensions/includes/dimensions_ui.inc:24
 msgid "There are no transactions for this dimension for the selected period."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/includes/dimensions_ui.inc:28
+#: ../dimensions/includes/dimensions_ui.inc:28
 msgid "Balance for this Dimension"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/includes/dimensions_ui.inc:31
-#: /var/www/fa_unstable/devel/../gl/accruals.php:87
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_account_inquiry.php:128
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_trial_balance.php:63
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:227
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:329
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:138
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:244
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:246
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:248
-#: /var/www/fa_unstable/devel/../reporting/rep701.php:104
-#: /var/www/fa_unstable/devel/../reporting/rep705.php:234
-#: /var/www/fa_unstable/devel/../reporting/rep706.php:181
-#: /var/www/fa_unstable/devel/../reporting/rep707.php:206
-#: /var/www/fa_unstable/devel/../reporting/rep708.php:79
+#: ../dimensions/includes/dimensions_ui.inc:31
+#: ../gl/accruals.php:94
+#: ../gl/inquiry/gl_account_inquiry.php:129
+#: ../gl/inquiry/gl_trial_balance.php:170
+#: ../gl/manage/gl_quick_entries.php:241
+#: ../gl/manage/gl_quick_entries.php:333
+#: ../includes/sysnames.inc:165
+#: ../purchasing/includes/ui/invoice_ui.inc:265
+#: ../purchasing/includes/ui/invoice_ui.inc:267
+#: ../purchasing/includes/ui/invoice_ui.inc:269
+#: ../reporting/rep701.php:109
+#: ../reporting/rep705.php:234
+#: ../reporting/rep706.php:181
+#: ../reporting/rep707.php:206
+#: ../reporting/rep708.php:179
 msgid "Account"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/includes/dimensions_ui.inc:31
-#: /var/www/fa_unstable/devel/../gl/accruals.php:95
-#: /var/www/fa_unstable/devel/../gl/bank_account_reconcile.php:237
-#: /var/www/fa_unstable/devel/../gl/inquiry/bank_inquiry.php:68
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_account_inquiry.php:140
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_account_inquiry.php:142
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_trial_balance.php:69
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_trial_balance.php:71
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_trial_balance.php:73
-#: /var/www/fa_unstable/devel/../gl/view/accrual_trans.php:60
-#: /var/www/fa_unstable/devel/../gl/view/gl_trans_view.php:64
-#: /var/www/fa_unstable/devel/../gl/view/gl_trans_view.php:67
-#: /var/www/fa_unstable/devel/../gl/view/gl_trans_view.php:70
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:84
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:87
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:90
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_allocation_inquiry.php:133
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_inquiry.php:170
-#: /var/www/fa_unstable/devel/../reporting/rep601.php:77
-#: /var/www/fa_unstable/devel/../reporting/rep702.php:52
-#: /var/www/fa_unstable/devel/../reporting/rep704.php:79
-#: /var/www/fa_unstable/devel/../reporting/rep704.php:82
-#: /var/www/fa_unstable/devel/../reporting/rep704.php:85
-#: /var/www/fa_unstable/devel/../reporting/rep708.php:79
-#: /var/www/fa_unstable/devel/../reporting/rep708.php:80
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_allocation_inquiry.php:149
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_inquiry.php:221
+#: ../dimensions/includes/dimensions_ui.inc:31
+#: ../gl/accruals.php:102
+#: ../gl/bank_account_reconcile.php:235
+#: ../gl/inquiry/bank_inquiry.php:71
+#: ../gl/inquiry/gl_account_inquiry.php:141
+#: ../gl/inquiry/gl_account_inquiry.php:143
+#: ../gl/inquiry/gl_trial_balance.php: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:69
+#: ../gl/view/gl_trans_view.php:72
+#: ../gl/view/gl_trans_view.php:75
+#: ../gl/includes/ui/gl_journal_ui.inc:87
+#: ../gl/includes/ui/gl_journal_ui.inc:90
+#: ../gl/includes/ui/gl_journal_ui.inc:93
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:133
+#: ../purchasing/inquiry/supplier_inquiry.php:181
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:178
+#: ../reporting/rep601.php:77
+#: ../reporting/rep602.php:81
+#: ../reporting/rep702.php:52
+#: ../reporting/rep704.php:80
+#: ../reporting/rep704.php:83
+#: ../reporting/rep704.php:86
+#: ../reporting/rep708.php:179
+#: ../reporting/rep708.php:180
+#: ../sales/inquiry/customer_allocation_inquiry.php:152
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:152
+#: ../sales/inquiry/customer_inquiry.php:209
+#: ../sales/inquiry/customer_inquiry.php.orig:233
 msgid "Debit"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/includes/dimensions_ui.inc:31
-#: /var/www/fa_unstable/devel/../gl/accruals.php:95
-#: /var/www/fa_unstable/devel/../gl/bank_account_reconcile.php:238
-#: /var/www/fa_unstable/devel/../gl/inquiry/bank_inquiry.php:68
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_account_inquiry.php:140
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_account_inquiry.php:142
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_trial_balance.php:70
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_trial_balance.php:72
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_trial_balance.php:74
-#: /var/www/fa_unstable/devel/../gl/view/accrual_trans.php:60
-#: /var/www/fa_unstable/devel/../gl/view/gl_trans_view.php:64
-#: /var/www/fa_unstable/devel/../gl/view/gl_trans_view.php:67
-#: /var/www/fa_unstable/devel/../gl/view/gl_trans_view.php:70
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:84
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:87
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:90
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:59
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_allocation_inquiry.php:134
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_inquiry.php:171
-#: /var/www/fa_unstable/devel/../reporting/rep601.php:77
-#: /var/www/fa_unstable/devel/../reporting/rep702.php:52
-#: /var/www/fa_unstable/devel/../reporting/rep704.php:79
-#: /var/www/fa_unstable/devel/../reporting/rep704.php:82
-#: /var/www/fa_unstable/devel/../reporting/rep704.php:85
-#: /var/www/fa_unstable/devel/../reporting/rep708.php:79
-#: /var/www/fa_unstable/devel/../reporting/rep708.php:80
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_allocation_inquiry.php:150
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_inquiry.php:222
+#: ../dimensions/includes/dimensions_ui.inc:31
+#: ../gl/accruals.php:102
+#: ../gl/bank_account_reconcile.php:236
+#: ../gl/inquiry/bank_inquiry.php:71
+#: ../gl/inquiry/gl_account_inquiry.php:141
+#: ../gl/inquiry/gl_account_inquiry.php:143
+#: ../gl/inquiry/gl_trial_balance.php: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:69
+#: ../gl/view/gl_trans_view.php:72
+#: ../gl/view/gl_trans_view.php:75
+#: ../gl/includes/ui/gl_journal_ui.inc:87
+#: ../gl/includes/ui/gl_journal_ui.inc:90
+#: ../gl/includes/ui/gl_journal_ui.inc:93
+#: ../includes/sysnames.inc:85
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:134
+#: ../purchasing/inquiry/supplier_inquiry.php:182
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:179
+#: ../reporting/rep601.php:77
+#: ../reporting/rep602.php:81
+#: ../reporting/rep702.php:52
+#: ../reporting/rep704.php:80
+#: ../reporting/rep704.php:83
+#: ../reporting/rep704.php:86
+#: ../reporting/rep708.php:179
+#: ../reporting/rep708.php:180
+#: ../sales/inquiry/customer_allocation_inquiry.php:153
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:153
+#: ../sales/inquiry/customer_inquiry.php:210
+#: ../sales/inquiry/customer_inquiry.php.orig:234
 msgid "Credit"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/includes/dimensions_ui.inc:45
-#: /var/www/fa_unstable/devel/../dimensions/inquiry/search_dimensions.php:134
-#: /var/www/fa_unstable/devel/../gl/inquiry/bank_inquiry.php:68
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_account_inquiry.php:140
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_trial_balance.php:67
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_allocation_inquiry.php:136
-#: /var/www/fa_unstable/devel/../reporting/rep203.php:92
-#: /var/www/fa_unstable/devel/../reporting/rep204.php:82
-#: /var/www/fa_unstable/devel/../reporting/rep601.php:77
-#: /var/www/fa_unstable/devel/../reporting/rep701.php:104
-#: /var/www/fa_unstable/devel/../reporting/rep704.php:79
-#: /var/www/fa_unstable/devel/../reporting/rep704.php:82
-#: /var/www/fa_unstable/devel/../reporting/rep704.php:85
-#: /var/www/fa_unstable/devel/../reporting/rep708.php:71
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_allocation_inquiry.php:152
+#: ../dimensions/includes/dimensions_ui.inc:45
+#: ../dimensions/inquiry/search_dimensions.php:134
+#: ../gl/inquiry/bank_inquiry.php:71
+#: ../gl/inquiry/gl_account_inquiry.php:141
+#: ../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/rep602.php:81
+#: ../reporting/rep701.php:109
+#: ../reporting/rep704.php:80
+#: ../reporting/rep704.php:83
+#: ../reporting/rep704.php:86
+#: ../reporting/rep708.php:172
+#: ../sales/inquiry/customer_allocation_inquiry.php:155
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:155
 msgid "Balance"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/inquiry/search_dimensions.php:29
+#: ../dimensions/inquiry/search_dimensions.php:29
 msgid "Search Outstanding Dimensions"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/inquiry/search_dimensions.php:34
+#: ../dimensions/inquiry/search_dimensions.php:34
 msgid "Search Dimensions"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/inquiry/search_dimensions.php:73
-#: /var/www/fa_unstable/devel/../gl/bank_transfer.php:89
-#: /var/www/fa_unstable/devel/../gl/inquiry/journal_inquiry.php:45
-#: /var/www/fa_unstable/devel/../gl/manage/revaluate_currencies.php:102
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:102
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:104
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:30
-#: /var/www/fa_unstable/devel/../includes/ui/contacts_view.inc:83
-#: /var/www/fa_unstable/devel/../inventory/includes/item_adjustments_ui.inc:35
-#: /var/www/fa_unstable/devel/../inventory/includes/stock_transfers_ui.inc:40
-#: /var/www/fa_unstable/devel/../manufacturing/search_work_orders.php:67
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_add_finished.php:191
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:376
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:383
-#: /var/www/fa_unstable/devel/../manufacturing/includes/work_order_issue_ui.inc:152
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:92
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:144
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:149
-#: /var/www/fa_unstable/devel/../purchasing/supplier_payment.php:271
-#: /var/www/fa_unstable/devel/../sales/customer_payments.php:258
+#: ../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:26
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:104
+#: ../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_costs.php:134
+#: ../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:104
+#: ../purchasing/includes/ui/po_ui.inc:166
+#: ../purchasing/includes/ui/po_ui.inc:171
+#: ../purchasing/supplier_payment.php:286
+#: ../sales/customer_payments.php:379
 msgid "Reference:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/inquiry/search_dimensions.php:75
-#: /var/www/fa_unstable/devel/../includes/ui/allocation_cart.inc:279
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:1875
-#: /var/www/fa_unstable/devel/../reporting/rep101.php:112
-#: /var/www/fa_unstable/devel/../reporting/rep102.php:88
-#: /var/www/fa_unstable/devel/../reporting/rep104.php:95
-#: /var/www/fa_unstable/devel/../reporting/rep104.php:99
-#: /var/www/fa_unstable/devel/../reporting/rep105.php:93
-#: /var/www/fa_unstable/devel/../reporting/rep105.php:97
-#: /var/www/fa_unstable/devel/../reporting/rep201.php:100
-#: /var/www/fa_unstable/devel/../reporting/rep202.php:90
-#: /var/www/fa_unstable/devel/../reporting/rep203.php:72
-#: /var/www/fa_unstable/devel/../reporting/rep204.php:75
-#: /var/www/fa_unstable/devel/../reporting/rep301.php:86
-#: /var/www/fa_unstable/devel/../reporting/rep301.php:93
-#: /var/www/fa_unstable/devel/../reporting/rep302.php:103
-#: /var/www/fa_unstable/devel/../reporting/rep302.php:110
-#: /var/www/fa_unstable/devel/../reporting/rep303.php:84
-#: /var/www/fa_unstable/devel/../reporting/rep303.php:91
-#: /var/www/fa_unstable/devel/../reporting/rep304.php:96
-#: /var/www/fa_unstable/devel/../reporting/rep304.php:103
-#: /var/www/fa_unstable/devel/../reporting/rep304.php:108
-#: /var/www/fa_unstable/devel/../reporting/rep702.php:59
-#: /var/www/fa_unstable/devel/../reporting/rep710.php:84
-#: /var/www/fa_unstable/devel/../reporting/rep710.php:85
+#: ../dimensions/inquiry/search_dimensions.php:75
+#: ../includes/ui/allocation_cart.inc:286
+#: ../includes/ui/ui_lists.inc:1923
+#: ../includes/ui/ui_lists.inc.orig:1921
+#: ../reporting/rep101.php:112
+#: ../reporting/rep102.php:94
+#: ../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:90
+#: ../reporting/rep301.php:97
+#: ../reporting/rep302.php:103
+#: ../reporting/rep302.php:110
+#: ../reporting/rep303.php:84
+#: ../reporting/rep303.php:91
+#: ../reporting/rep304.php:96
+#: ../reporting/rep304.php:101
+#: ../reporting/rep304.php:106
+#: ../reporting/rep702.php:59
+#: ../reporting/rep710.php:84
+#: ../reporting/rep710.php:85
 msgid "All"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/inquiry/search_dimensions.php:76
-#: /var/www/fa_unstable/devel/../gl/inquiry/bank_inquiry.php:46
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_trial_balance.php:44
-#: /var/www/fa_unstable/devel/../gl/inquiry/journal_inquiry.php:48
-#: /var/www/fa_unstable/devel/../gl/inquiry/profit_loss.php:158
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:23
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:50
-#: /var/www/fa_unstable/devel/../inventory/inquiry/stock_movements.php:53
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_allocation_inquiry.php:50
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_inquiry.php:49
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_inquiry.php:46
+#: ../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:51
+#: ../gl/includes/ui/gl_bank_ui.inc:117
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:23
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:53
+#: ../inventory/inquiry/stock_movements.php:58
+#: ../inventory/inquiry/stock_movements.php.orig:60
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:50
+#: ../purchasing/inquiry/supplier_inquiry.php:50
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:50
+#: ../sales/inquiry/customer_inquiry.php:46
+#: ../sales/inquiry/customer_inquiry.php.orig:47
 msgid "From:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/inquiry/search_dimensions.php:77
-#: /var/www/fa_unstable/devel/../gl/inquiry/bank_inquiry.php:47
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_trial_balance.php:45
-#: /var/www/fa_unstable/devel/../gl/inquiry/journal_inquiry.php:49
-#: /var/www/fa_unstable/devel/../gl/inquiry/profit_loss.php:159
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:23
-#: /var/www/fa_unstable/devel/../inventory/inquiry/stock_movements.php:54
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_allocation_inquiry.php:51
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_inquiry.php:50
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_inquiry.php:47
+#: ../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:117
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:23
+#: ../inventory/inquiry/stock_movements.php:59
+#: ../inventory/inquiry/stock_movements.php.orig:61
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:51
+#: ../purchasing/inquiry/supplier_inquiry.php:51
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:51
+#: ../sales/inquiry/customer_inquiry.php:47
+#: ../sales/inquiry/customer_inquiry.php.orig:48
 msgid "To:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/inquiry/search_dimensions.php:79
-#: /var/www/fa_unstable/devel/../manufacturing/search_work_orders.php:71
+#: ../dimensions/inquiry/search_dimensions.php:79
+#: ../manufacturing/search_work_orders.php:71
 msgid "Only Overdue:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/inquiry/search_dimensions.php:83
-#: /var/www/fa_unstable/devel/../manufacturing/search_work_orders.php:74
+#: ../dimensions/inquiry/search_dimensions.php:83
+#: ../manufacturing/search_work_orders.php:74
 msgid "Only Open:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/inquiry/search_dimensions.php:132
-#: /var/www/fa_unstable/devel/../dimensions/view/view_dimension.php:54
-#: /var/www/fa_unstable/devel/../includes/ui/allocation_cart.inc:259
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:112
-#: /var/www/fa_unstable/devel/../purchasing/view/view_supp_credit.php:48
-#: /var/www/fa_unstable/devel/../purchasing/view/view_supp_invoice.php:51
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_allocation_inquiry.php:131
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_inquiry.php:168
-#: /var/www/fa_unstable/devel/../reporting/rep101.php:130
-#: /var/www/fa_unstable/devel/../reporting/rep201.php:118
-#: /var/www/fa_unstable/devel/../reporting/rep203.php:91
-#: /var/www/fa_unstable/devel/../reporting/rep501.php:85
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:38
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:108
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:418
-#: /var/www/fa_unstable/devel/../sales/view/view_dispatch.php:97
-#: /var/www/fa_unstable/devel/../sales/view/view_invoice.php:97
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_allocation_inquiry.php:146
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_inquiry.php:217
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:589
+#: ../dimensions/inquiry/search_dimensions.php:132
+#: ../dimensions/view/view_dimension.php:54
+#: ../includes/ui/allocation_cart.inc:264
+#: ../purchasing/includes/ui/invoice_ui.inc:123
+#: ../purchasing/view/view_supp_credit.php:48
+#: ../purchasing/view/view_supp_invoice.php:52
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:131
+#: ../purchasing/inquiry/supplier_inquiry.php:179
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:176
+#: ../reporting/rep101.php:130
+#: ../reporting/rep201.php:118
+#: ../reporting/rep203.php:91
+#: ../reporting/rep501.php:85
+#: ../reporting/includes/doctext.inc:112
+#: ../reporting/includes/doctext.inc:144
+#: ../reporting/includes/doctext.inc:165
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:188
+#: ../reporting/includes/doctext.inc:206
+#: ../reporting/includes/doctext.inc:208
+#: ../sales/customer_invoice.php:508
+#: ../sales/view/view_dispatch.php:97
+#: ../sales/view/view_invoice.php:96
+#: ../sales/inquiry/customer_allocation_inquiry.php:149
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:149
+#: ../sales/inquiry/customer_inquiry.php:205
+#: ../sales/inquiry/customer_inquiry.php.orig:229
+#: ../sales/includes/ui/sales_order_ui.inc:596
+#: ../sales/includes/ui/sales_order_ui.inc.orig:596
 msgid "Due Date"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/inquiry/search_dimensions.php:143
+#: ../dimensions/inquiry/search_dimensions.php:143
 msgid "Marked dimensions are overdue."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/view/view_dimension.php:20
+#: ../dimensions/view/view_dimension.php:20
 msgid "View Dimension"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/view/view_dimension.php:48
+#: ../dimensions/view/view_dimension.php:48
 msgid "The dimension number sent is not valid."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/view/view_dimension.php:72
+#: ../dimensions/view/view_dimension.php:72
 msgid "This dimension is closed."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/view/view_dimension.php:84
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_account_inquiry.php:70
-#: /var/www/fa_unstable/devel/../gl/inquiry/tax_inquiry.php:61
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search_completed.php:62
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search.php:64
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_allocation_inquiry.php:44
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_deliveries_view.php:104
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:229
+#: ../dimensions/view/view_dimension.php:84
+#: ../gl/inquiry/gl_account_inquiry.php:71
+#: ../gl/inquiry/tax_inquiry.php:61
+#: ../purchasing/inquiry/po_search_completed.php:62
+#: ../purchasing/inquiry/po_search_completed.php.orig:63
+#: ../purchasing/inquiry/po_search.php:64
+#: ../sales/inquiry/customer_allocation_inquiry.php:44
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:44
+#: ../sales/inquiry/sales_deliveries_view.php:104
+#: ../sales/inquiry/sales_deliveries_view.php.orig:104
+#: ../sales/inquiry/sales_orders_view.php:251
+#: ../sales/inquiry/sales_orders_view.php.orig:228
 msgid "from:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/view/view_dimension.php:85
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_account_inquiry.php:71
-#: /var/www/fa_unstable/devel/../gl/inquiry/tax_inquiry.php:62
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search_completed.php:63
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search.php:65
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_allocation_inquiry.php:45
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_deliveries_view.php:105
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:230
+#: ../dimensions/view/view_dimension.php:85
+#: ../gl/inquiry/gl_account_inquiry.php:72
+#: ../gl/inquiry/tax_inquiry.php:62
+#: ../purchasing/inquiry/po_search_completed.php:63
+#: ../purchasing/inquiry/po_search_completed.php.orig:64
+#: ../purchasing/inquiry/po_search.php:65
+#: ../sales/inquiry/customer_allocation_inquiry.php:45
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:45
+#: ../sales/inquiry/sales_deliveries_view.php:105
+#: ../sales/inquiry/sales_deliveries_view.php.orig:105
+#: ../sales/inquiry/sales_orders_view.php:252
+#: ../sales/inquiry/sales_orders_view.php.orig:229
 msgid "to:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../dimensions/view/view_dimension.php:86
-#: /var/www/fa_unstable/devel/../gl/inquiry/balance_sheet.php:124
-#: /var/www/fa_unstable/devel/../gl/inquiry/bank_inquiry.php:49
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_account_inquiry.php:84
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_trial_balance.php:49
-#: /var/www/fa_unstable/devel/../gl/inquiry/profit_loss.php:169
-#: /var/www/fa_unstable/devel/../gl/inquiry/tax_inquiry.php:63
+#: ../dimensions/view/view_dimension.php:86
+#: ../gl/inquiry/balance_sheet.php:131
+#: ../gl/inquiry/bank_inquiry.php:52
+#: ../gl/inquiry/gl_account_inquiry.php:85
+#: ../gl/inquiry/gl_trial_balance.php:58
+#: ../gl/inquiry/profit_loss.php:178
+#: ../gl/inquiry/tax_inquiry.php:63
 msgid "Show"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/accruals.php:20
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:243
+#: ../gl/accruals.php:20
+#: ../includes/access_levels.inc:245
 msgid "Revenue / Cost Accruals"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/accruals.php:44
+#: ../gl/accruals.php:38
+#: ../gl/bank_transfer.php:116
+#: ../gl/gl_bank.php:269
+#: ../gl/gl_journal.php:164
+#: ../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:86
+#: ../manufacturing/work_order_entry.php:160
+#: ../manufacturing/work_order_issue.php:84
+#: ../purchasing/po_entry_items.php:342
+#: ../purchasing/po_receive_items.php:179
+#: ../purchasing/supplier_credit.php:193
+#: ../purchasing/supplier_invoice.php:198
+#: ../purchasing/supplier_payment.php:185
+#: ../sales/create_recurrent_invoices.php:108
+#: ../sales/credit_note_entry.php:161
+#: ../sales/customer_credit_invoice.php:95
+#: ../sales/customer_delivery.php:161
+#: ../sales/customer_invoice.php:318
+#: ../sales/customer_payments.php:145
+#: ../sales/sales_order_entry.php:350
+msgid ""
+"The entered date is out of fiscal year or is closed for further data entry."
+msgstr ""
+
+#: ../gl/accruals.php:44
 msgid "The amount can not be 0."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/accruals.php:50
+#: ../gl/accruals.php:50
 msgid "The periods must be greater than 0."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/accruals.php:64
-msgid ""
-"Some of the period dates are outside the fiscal year. Create a new fiscal "
-"year first!"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../gl/accruals.php:89
-#: /var/www/fa_unstable/devel/../gl/accruals.php:91
-#: /var/www/fa_unstable/devel/../gl/accruals.php:199
-#: /var/www/fa_unstable/devel/../gl/accruals.php:201
-#: /var/www/fa_unstable/devel/../gl/gl_budget.php:71
-#: /var/www/fa_unstable/devel/../gl/gl_budget.php:72
-#: /var/www/fa_unstable/devel/../gl/gl_budget.php:76
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_account_inquiry.php:78
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_account_inquiry.php:80
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_account_inquiry.php:133
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_account_inquiry.php:135
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:251
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:253
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:339
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:341
-#: /var/www/fa_unstable/devel/../gl/view/accrual_trans.php:54
-#: /var/www/fa_unstable/devel/../gl/view/accrual_trans.php:56
-#: /var/www/fa_unstable/devel/../gl/view/gl_deposit_view.php:99
-#: /var/www/fa_unstable/devel/../gl/view/gl_deposit_view.php:102
-#: /var/www/fa_unstable/devel/../gl/view/gl_payment_view.php:98
-#: /var/www/fa_unstable/devel/../gl/view/gl_payment_view.php:101
-#: /var/www/fa_unstable/devel/../gl/view/gl_trans_view.php:63
-#: /var/www/fa_unstable/devel/../gl/view/gl_trans_view.php:66
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:124
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:125
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:127
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:83
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:84
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:86
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:43
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:139
-#: /var/www/fa_unstable/devel/../inventory/manage/item_categories.php:216
-#: /var/www/fa_unstable/devel/../inventory/manage/item_categories.php:218
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:352
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:354
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:244
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:246
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:135
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:136
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:138
-#: /var/www/fa_unstable/devel/../reporting/rep501.php:90
-#: /var/www/fa_unstable/devel/../reporting/rep704.php:78
-#: /var/www/fa_unstable/devel/../reporting/rep704.php:81
-#: /var/www/fa_unstable/devel/../reporting/rep704.php:92
-#: /var/www/fa_unstable/devel/../reporting/rep704.php:94
-#: /var/www/fa_unstable/devel/../reporting/rep704.php:102
-#: /var/www/fa_unstable/devel/../reporting/rep705.php:245
-#: /var/www/fa_unstable/devel/../reporting/rep705.php:247
-#: /var/www/fa_unstable/devel/../reporting/rep705.php:258
-#: /var/www/fa_unstable/devel/../reporting/rep706.php:190
-#: /var/www/fa_unstable/devel/../reporting/rep706.php:192
-#: /var/www/fa_unstable/devel/../reporting/rep706.php:200
-#: /var/www/fa_unstable/devel/../reporting/rep707.php:214
-#: /var/www/fa_unstable/devel/../reporting/rep707.php:216
-#: /var/www/fa_unstable/devel/../reporting/rep707.php:224
-#: /var/www/fa_unstable/devel/../reporting/rep708.php:88
-#: /var/www/fa_unstable/devel/../reporting/rep708.php:90
-#: /var/www/fa_unstable/devel/../reporting/rep708.php:97
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:252
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:253
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:258
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:259
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:266
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:267
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:277
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:278
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:289
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:290
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:301
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:306
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:313
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:323
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:334
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:393
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:401
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:393
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:420
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:234
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:236
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_credit_ui.inc:132
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_credit_ui.inc:137
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:441
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:446
+#: ../gl/accruals.php:71
+msgid ""
+"Some of the period dates are outside the fiscal year or are closed for "
+"further data entry. Create a new fiscal year first!"
+msgstr ""
+
+#: ../gl/accruals.php:86
+#, php-format
+msgid "Accruals for %s"
+msgstr ""
+
+#: ../gl/accruals.php:96
+#: ../gl/accruals.php:98
+#: ../gl/accruals.php:207
+#: ../gl/accruals.php:209
+#: ../gl/gl_budget.php:71
+#: ../gl/gl_budget.php:72
+#: ../gl/gl_budget.php:76
+#: ../gl/inquiry/balance_sheet.php:128
+#: ../gl/inquiry/balance_sheet.php:130
+#: ../gl/inquiry/gl_account_inquiry.php:79
+#: ../gl/inquiry/gl_account_inquiry.php:81
+#: ../gl/inquiry/gl_account_inquiry.php:134
+#: ../gl/inquiry/gl_account_inquiry.php:136
+#: ../gl/inquiry/gl_trial_balance.php: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:68
+#: ../gl/view/gl_trans_view.php:71
+#: ../gl/includes/ui/gl_bank_ui.inc:150
+#: ../gl/includes/ui/gl_bank_ui.inc:151
+#: ../gl/includes/ui/gl_bank_ui.inc:153
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:124
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:125
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:127
+#: ../gl/includes/ui/gl_journal_ui.inc:86
+#: ../gl/includes/ui/gl_journal_ui.inc:87
+#: ../gl/includes/ui/gl_journal_ui.inc:89
+#: ../includes/sysnames.inc:43
+#: ../includes/sysnames.inc:166
+#: ../inventory/manage/item_categories.php:216
+#: ../inventory/manage/item_categories.php:218
+#: ../inventory/manage/items.php:350
+#: ../inventory/manage/items.php:352
+#: ../inventory/manage/items.php.orig:343
+#: ../inventory/manage/items.php.orig:345
+#: ../purchasing/includes/ui/invoice_ui.inc:265
+#: ../purchasing/includes/ui/invoice_ui.inc:267
+#: ../purchasing/manage/suppliers.php:145
+#: ../purchasing/manage/suppliers.php:146
+#: ../purchasing/manage/suppliers.php:148
+#: ../purchasing/manage/suppliers.php.orig:148
+#: ../purchasing/manage/suppliers.php.orig:149
+#: ../purchasing/manage/suppliers.php.orig:151
+#: ../reporting/rep501.php:90
+#: ../reporting/rep704.php:79
+#: ../reporting/rep704.php:82
+#: ../reporting/rep704.php:93
+#: ../reporting/rep704.php:95
+#: ../reporting/rep704.php:103
+#: ../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:188
+#: ../reporting/rep708.php:190
+#: ../reporting/rep708.php:197
+#: ../reporting/reports_main.php:265
+#: ../reporting/reports_main.php:266
+#: ../reporting/reports_main.php:271
+#: ../reporting/reports_main.php:272
+#: ../reporting/reports_main.php:279
+#: ../reporting/reports_main.php:280
+#: ../reporting/reports_main.php:290
+#: ../reporting/reports_main.php:291
+#: ../reporting/reports_main.php:302
+#: ../reporting/reports_main.php:303
+#: ../reporting/reports_main.php:314
+#: ../reporting/reports_main.php:319
+#: ../reporting/reports_main.php:326
+#: ../reporting/reports_main.php:336
+#: ../reporting/reports_main.php:347
+#: ../sales/customer_delivery.php:403
+#: ../sales/customer_delivery.php:411
+#: ../sales/customer_invoice.php:473
+#: ../sales/customer_invoice.php:516
+#: ../sales/manage/customers.php:269
+#: ../sales/manage/customers.php:271
+#: ../sales/manage/sav.customers.php:269
+#: ../sales/manage/sav.customers.php:271
+#: ../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
+#: ../sales/includes/ui/sales_order_ui.inc.orig:451
+#: ../sales/includes/ui/sales_order_ui.inc.orig:456
 msgid "Dimension"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/accruals.php:95
-#: /var/www/fa_unstable/devel/../gl/accruals.php:209
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_account_inquiry.php:140
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_account_inquiry.php:142
-#: /var/www/fa_unstable/devel/../gl/inquiry/journal_inquiry.php:125
-#: /var/www/fa_unstable/devel/../gl/view/accrual_trans.php:60
-#: /var/www/fa_unstable/devel/../gl/view/gl_deposit_view.php:100
-#: /var/www/fa_unstable/devel/../gl/view/gl_deposit_view.php:103
-#: /var/www/fa_unstable/devel/../gl/view/gl_deposit_view.php:106
-#: /var/www/fa_unstable/devel/../gl/view/gl_payment_view.php:99
-#: /var/www/fa_unstable/devel/../gl/view/gl_payment_view.php:102
-#: /var/www/fa_unstable/devel/../gl/view/gl_payment_view.php:105
-#: /var/www/fa_unstable/devel/../gl/view/gl_trans_view.php:64
-#: /var/www/fa_unstable/devel/../gl/view/gl_trans_view.php:67
-#: /var/www/fa_unstable/devel/../gl/view/gl_trans_view.php:70
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:125
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:128
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:131
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:271
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:84
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:87
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:90
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:240
-#: /var/www/fa_unstable/devel/../inventory/includes/item_adjustments_ui.inc:181
-#: /var/www/fa_unstable/devel/../inventory/includes/stock_transfers_ui.inc:161
-#: /var/www/fa_unstable/devel/../manufacturing/includes/work_order_issue_ui.inc:165
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:244
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:246
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:248
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:375
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:517
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:549
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_credit_ui.inc:336
+#: ../gl/accruals.php:102
+#: ../gl/accruals.php:217
+#: ../gl/inquiry/gl_account_inquiry.php:141
+#: ../gl/inquiry/gl_account_inquiry.php:143
+#: ../gl/inquiry/journal_inquiry.php:133
+#: ../gl/view/accrual_trans.php:60
+#: ../gl/view/gl_deposit_view.php:100
+#: ../gl/view/gl_deposit_view.php:103
+#: ../gl/view/gl_deposit_view.php:106
+#: ../gl/view/gl_payment_view.php:99
+#: ../gl/view/gl_payment_view.php:102
+#: ../gl/view/gl_payment_view.php:105
+#: ../gl/view/gl_trans_view.php:69
+#: ../gl/view/gl_trans_view.php:72
+#: ../gl/view/gl_trans_view.php:75
+#: ../gl/includes/ui/gl_bank_ui.inc:151
+#: ../gl/includes/ui/gl_bank_ui.inc:154
+#: ../gl/includes/ui/gl_bank_ui.inc:157
+#: ../gl/includes/ui/gl_bank_ui.inc:297
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:125
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:128
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:131
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:271
+#: ../gl/includes/ui/gl_journal_ui.inc:87
+#: ../gl/includes/ui/gl_journal_ui.inc:90
+#: ../gl/includes/ui/gl_journal_ui.inc:93
+#: ../gl/includes/ui/gl_journal_ui.inc:276
+#: ../inventory/includes/item_adjustments_ui.inc:181
+#: ../inventory/includes/stock_transfers_ui.inc:161
+#: ../manufacturing/view/wo_costs_view.php:46
+#: ../manufacturing/includes/work_order_issue_ui.inc:169
+#: ../purchasing/includes/ui/invoice_ui.inc:265
+#: ../purchasing/includes/ui/invoice_ui.inc:267
+#: ../purchasing/includes/ui/invoice_ui.inc:269
+#: ../sales/customer_credit_invoice.php:366
+#: ../sales/customer_delivery.php:527
+#: ../sales/includes/ui/sales_credit_ui.inc:339
 msgid "Memo"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/accruals.php:158
+#: ../gl/accruals.php:166
 msgid "Revenue / Cost Accruals have been processed."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/accruals.php:164
+#: ../gl/accruals.php:172
 msgid "Showing GL Transactions."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/accruals.php:176
+#: ../gl/accruals.php:184
 msgid "Weekly"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/accruals.php:177
+#: ../gl/accruals.php:185
 msgid "Bi-weekly"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/accruals.php:178
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:226
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:57
-#: /var/www/fa_unstable/devel/../sales/create_recurrent_invoices.php:98
-#: /var/www/fa_unstable/devel/../sales/manage/recurrent_invoices.php:85
+#: ../gl/accruals.php:186
+#: ../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 ""
 
-#: /var/www/fa_unstable/devel/../gl/accruals.php:179
+#: ../gl/accruals.php:187
 msgid "Quarterly"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/accruals.php:191
+#: ../gl/accruals.php:199
 msgid "First date of Accruals"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/accruals.php:193
+#: ../gl/accruals.php:201
 msgid "Accrued Balance Account"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/accruals.php:196
+#: ../gl/accruals.php:204
 msgid "Revenue / Cost Account"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/accruals.php:204
-#: /var/www/fa_unstable/devel/../gl/gl_budget.php:91
-#: /var/www/fa_unstable/devel/../gl/gl_budget.php:93
-#: /var/www/fa_unstable/devel/../gl/inquiry/journal_inquiry.php:124
-#: /var/www/fa_unstable/devel/../gl/inquiry/tax_inquiry.php:82
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:251
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:253
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:255
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:335
-#: /var/www/fa_unstable/devel/../gl/view/bank_transfer_view.php:70
-#: /var/www/fa_unstable/devel/../gl/view/bank_transfer_view.php:80
-#: /var/www/fa_unstable/devel/../gl/view/gl_deposit_view.php:67
-#: /var/www/fa_unstable/devel/../gl/view/gl_deposit_view.php:100
-#: /var/www/fa_unstable/devel/../gl/view/gl_deposit_view.php:103
-#: /var/www/fa_unstable/devel/../gl/view/gl_deposit_view.php:106
-#: /var/www/fa_unstable/devel/../gl/view/gl_payment_view.php:65
-#: /var/www/fa_unstable/devel/../gl/view/gl_payment_view.php:99
-#: /var/www/fa_unstable/devel/../gl/view/gl_payment_view.php:102
-#: /var/www/fa_unstable/devel/../gl/view/gl_payment_view.php:105
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:125
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:128
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:131
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:106
-#: /var/www/fa_unstable/devel/../includes/ui/allocation_cart.inc:259
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:1141
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:236
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:244
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:246
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:248
-#: /var/www/fa_unstable/devel/../purchasing/view/view_supp_payment.php:60
-#: /var/www/fa_unstable/devel/../purchasing/view/view_supp_payment.php:69
-#: /var/www/fa_unstable/devel/../reporting/rep102.php:228
-#: /var/www/fa_unstable/devel/../reporting/rep202.php:234
-#: /var/www/fa_unstable/devel/../reporting/rep706.php:303
-#: /var/www/fa_unstable/devel/../reporting/rep707.php:321
-#: /var/www/fa_unstable/devel/../reporting/rep710.php:76
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:150
-#: /var/www/fa_unstable/devel/../sales/view/view_receipt.php:44
+#: ../gl/accruals.php:212
+#: ../gl/gl_budget.php:91
+#: ../gl/gl_budget.php:93
+#: ../gl/inquiry/journal_inquiry.php:132
+#: ../gl/inquiry/tax_inquiry.php:82
+#: ../gl/manage/gl_quick_entries.php:261
+#: ../gl/manage/gl_quick_entries.php:263
+#: ../gl/manage/gl_quick_entries.php:265
+#: ../gl/manage/gl_quick_entries.php:339
+#: ../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:151
+#: ../gl/includes/ui/gl_bank_ui.inc:154
+#: ../gl/includes/ui/gl_bank_ui.inc:157
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:125
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:128
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:131
+#: ../includes/sysnames.inc:133
+#: ../includes/ui/allocation_cart.inc:264
+#: ../includes/ui/ui_lists.inc:1182
+#: ../includes/ui/ui_lists.inc.orig:1182
+#: ../manufacturing/view/wo_costs_view.php:46
+#: ../manufacturing/includes/manufacturing_ui.inc:236
+#: ../purchasing/includes/ui/invoice_ui.inc:265
+#: ../purchasing/includes/ui/invoice_ui.inc:267
+#: ../purchasing/includes/ui/invoice_ui.inc:269
+#: ../purchasing/view/view_supp_payment.php:60
+#: ../purchasing/view/view_supp_payment.php:72
+#: ../reporting/rep102.php:241
+#: ../reporting/rep107.php:194
+#: ../reporting/rep107.php:251
+#: ../reporting/rep109.php:192
+#: ../reporting/rep110.php:195
+#: ../reporting/rep111.php:177
+#: ../reporting/rep113.php:181
+#: ../reporting/rep202.php:249
+#: ../reporting/rep209.php:200
+#: ../reporting/rep706.php:303
+#: ../reporting/rep707.php:321
+#: ../reporting/rep710.php:76
+#: ../sales/view/view_receipt.php:44
 msgid "Amount"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/accruals.php:204
+#: ../gl/accruals.php:212
 msgid "Search Amount"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/accruals.php:206
+#: ../gl/accruals.php:214
 msgid "Frequency"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/accruals.php:208
+#: ../gl/accruals.php:216
 msgid "Periods"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/accruals.php:212
+#: ../gl/accruals.php:220
 msgid "Show GL Rows"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/accruals.php:213
+#: ../gl/accruals.php:221
 msgid "Process Accruals"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/accruals.php:214
+#: ../gl/accruals.php:222
 msgid "Are you sure you want to post accruals?"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/bank_account_reconcile.php:33
+#: ../gl/bank_account_reconcile.php:33
 msgid "Reconcile Bank Account"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/bank_account_reconcile.php:35
-#: /var/www/fa_unstable/devel/../gl/bank_transfer.php:30
-#: /var/www/fa_unstable/devel/../gl/gl_bank.php:49
-#: /var/www/fa_unstable/devel/../gl/inquiry/bank_inquiry.php:30
-#: /var/www/fa_unstable/devel/../purchasing/supplier_payment.php:42
-#: /var/www/fa_unstable/devel/../sales/customer_payments.php:39
+#: ../gl/bank_account_reconcile.php:35
+#: ../gl/bank_transfer.php:30
+#: ../gl/gl_bank.php:49
+#: ../gl/inquiry/bank_inquiry.php:30
+#: ../purchasing/supplier_payment.php:42
+#: ../sales/customer_payments.php:39
 msgid "There are no bank accounts defined in the system."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/bank_account_reconcile.php:39
+#: ../gl/bank_account_reconcile.php:39
 msgid "Invalid reconcile date format"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/bank_account_reconcile.php:56
+#: ../gl/bank_account_reconcile.php:56
 msgid "Reconcile this transaction"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/bank_account_reconcile.php:166
-#: /var/www/fa_unstable/devel/../gl/inquiry/bank_inquiry.php:44
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_account_inquiry.php:69
+#: ../gl/bank_account_reconcile.php:164
+#: ../gl/inquiry/bank_inquiry.php:47
+#: ../gl/inquiry/gl_account_inquiry.php:70
 msgid "Account:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/bank_account_reconcile.php:168
+#: ../gl/bank_account_reconcile.php:166
 msgid "Bank Statement:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/bank_account_reconcile.php:169
+#: ../gl/bank_account_reconcile.php:167
+#: ../inventory/purchasing_data.php.orig:235
 msgid "New"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/bank_account_reconcile.php:198
+#: ../gl/bank_account_reconcile.php:196
 msgid "Reconcile Date"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/bank_account_reconcile.php:198
+#: ../gl/bank_account_reconcile.php:196
 msgid "Beginning<br>Balance"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/bank_account_reconcile.php:199
+#: ../gl/bank_account_reconcile.php:197
 msgid "Ending<br>Balance"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/bank_account_reconcile.php:199
+#: ../gl/bank_account_reconcile.php:197
 msgid "Account<br>Total"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/bank_account_reconcile.php:199
+#: ../gl/bank_account_reconcile.php:197
 msgid "Reconciled<br>Amount"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/bank_account_reconcile.php:199
+#: ../gl/bank_account_reconcile.php:197
+#: ../reporting/rep602.php:205
 msgid "Difference"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/bank_account_reconcile.php:203
+#: ../gl/bank_account_reconcile.php:201
 msgid "Date of bank statement to reconcile"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/bank_account_reconcile.php:239
-#: /var/www/fa_unstable/devel/../gl/inquiry/bank_inquiry.php:68
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_account_inquiry.php:140
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_account_inquiry.php:142
-#: /var/www/fa_unstable/devel/../gl/view/accrual_trans.php:60
-#: /var/www/fa_unstable/devel/../gl/view/gl_trans_view.php:36
-#: /var/www/fa_unstable/devel/../reporting/rep601.php:76
-#: /var/www/fa_unstable/devel/../reporting/rep704.php:79
-#: /var/www/fa_unstable/devel/../reporting/rep704.php:81
-#: /var/www/fa_unstable/devel/../reporting/rep704.php:84
+#: ../gl/bank_account_reconcile.php:237
+#: ../gl/inquiry/bank_inquiry.php:71
+#: ../gl/inquiry/gl_account_inquiry.php:141
+#: ../gl/inquiry/gl_account_inquiry.php:143
+#: ../gl/view/accrual_trans.php:60
+#: ../reporting/rep601.php:76
+#: ../reporting/rep602.php:80
+#: ../reporting/rep704.php:80
+#: ../reporting/rep704.php:82
+#: ../reporting/rep704.php:85
 msgid "Person/Item"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/bank_account_reconcile.php:249
+#: ../gl/bank_account_reconcile.php:247
 msgid "Reconcile"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/bank_transfer.php:28
+#: ../gl/bank_transfer.php:28
 msgid "Transfer between Bank Accounts"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/bank_transfer.php:39
-#: /var/www/fa_unstable/devel/../gl/manage/revaluate_currencies.php:34
+#: ../gl/bank_transfer.php:39
+#: ../gl/manage/revaluate_currencies.php:35
 msgid "Transfer has been entered"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/bank_transfer.php:41
-#: /var/www/fa_unstable/devel/../gl/manage/revaluate_currencies.php:36
+#: ../gl/bank_transfer.php:41
+#: ../gl/manage/revaluate_currencies.php:37
 msgid "&View the GL Journal Entries for this Transfer"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/bank_transfer.php:43
+#: ../gl/bank_transfer.php:43
 msgid "Enter &Another Transfer"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/bank_transfer.php:66
+#: ../gl/bank_transfer.php:66
 msgid "From Account:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/bank_transfer.php:68
+#: ../gl/bank_transfer.php:70
 msgid "To Account:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/bank_transfer.php:70
+#: ../gl/bank_transfer.php:72
 msgid "Transfer Date:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/bank_transfer.php:76
-#: /var/www/fa_unstable/devel/../gl/bank_transfer.php:83
-#: /var/www/fa_unstable/devel/../sales/customer_payments.php:289
+#: ../gl/bank_transfer.php:78
+#: ../gl/bank_transfer.php:85
+#: ../sales/customer_payments.php:408
 msgid "Amount:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/bank_transfer.php:77
-#: /var/www/fa_unstable/devel/../gl/bank_transfer.php:84
-#: /var/www/fa_unstable/devel/../purchasing/supplier_payment.php:284
-#: /var/www/fa_unstable/devel/../sales/customer_payments.php:274
+#: ../gl/bank_transfer.php:79
+#: ../gl/bank_transfer.php:86
+#: ../purchasing/supplier_payment.php:299
+#: ../sales/customer_payments.php:393
 msgid "Bank Charge:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/bank_transfer.php:95
+#: ../gl/bank_transfer.php:97
 msgid "Enter Transfer"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/bank_transfer.php:121
-#: /var/www/fa_unstable/devel/../gl/bank_transfer.php:128
-#: /var/www/fa_unstable/devel/../purchasing/supplier_payment.php:130
-#: /var/www/fa_unstable/devel/../purchasing/supplier_payment.php:136
+#: ../gl/bank_transfer.php:123
+#: ../gl/bank_transfer.php:153
+#: ../purchasing/supplier_payment.php:130
+#: ../purchasing/supplier_payment.php:136
 msgid "The entered amount is invalid or less than zero."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/bank_transfer.php:133
-#: /var/www/fa_unstable/devel/../purchasing/supplier_payment.php:144
-#: /var/www/fa_unstable/devel/../sales/customer_payments.php:131
+#: ../gl/bank_transfer.php:128
+#: ../gl/gl_bank.php:227
+msgid "The total bank amount cannot be 0."
+msgstr ""
+
+#: ../gl/bank_transfer.php:139
+#, php-format
+msgid "The total bank amount exceeds allowed limit (%s) for source account."
+msgstr ""
+
+#: ../gl/bank_transfer.php:145
+#: ../gl/gl_bank.php:244
+#, php-format
+msgid ""
+"The bank transaction would result in exceed of authorized overdraft limit "
+"for transaction: %s #%s on %s."
+msgstr ""
+
+#: ../gl/bank_transfer.php:158
+#: ../purchasing/supplier_payment.php:144
+#: ../sales/customer_payments.php:184
 msgid ""
 "The Bank Charge Account has not been set in System and General GL Setup."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/bank_transfer.php:139
-#: /var/www/fa_unstable/devel/../gl/gl_bank.php:241
-#: /var/www/fa_unstable/devel/../gl/gl_journal.php:166
-#: /var/www/fa_unstable/devel/../gl/manage/revaluate_currencies.php:62
-#: /var/www/fa_unstable/devel/../inventory/adjustments.php:94
-#: /var/www/fa_unstable/devel/../inventory/transfers.php:93
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_add_finished.php:76
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:131
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_issue.php:88
-#: /var/www/fa_unstable/devel/../purchasing/po_receive_items.php:177
-#: /var/www/fa_unstable/devel/../purchasing/supplier_payment.php:191
-#: /var/www/fa_unstable/devel/../sales/credit_note_entry.php:143
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:100
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:175
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:281
-#: /var/www/fa_unstable/devel/../sales/customer_payments.php:106
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:398
+#: ../gl/bank_transfer.php:164
+#: ../gl/gl_bank.php:251
+#: ../gl/gl_journal.php:170
+#: ../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:90
+#: ../purchasing/po_receive_items.php:186
+#: ../purchasing/supplier_payment.php:201
+#: ../sales/credit_note_entry.php:147
+#: ../sales/customer_credit_invoice.php:102
+#: ../sales/customer_delivery.php:174
+#: ../sales/customer_invoice.php:332
+#: ../sales/customer_payments.php:151
+#: ../sales/sales_order_entry.php:414
 msgid "You must enter a reference."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/bank_transfer.php:153
+#: ../gl/bank_transfer.php:178
 msgid "The source and destination bank accouts cannot be the same."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_bank.php:33
+#: ../gl/gl_bank.php:34
 msgid "Bank Account Payment Entry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_bank.php:37
+#: ../gl/gl_bank.php:37
 msgid "Bank Account Deposit Entry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_bank.php:40
+#: ../gl/gl_bank.php:40
 msgid "Modify Bank Account Entry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_bank.php:43
+#: ../gl/gl_bank.php:43
 msgid "Modify Bank Deposit Entry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_bank.php:75
-#: /var/www/fa_unstable/devel/../gl/gl_bank.php:91
+#: ../gl/gl_bank.php:73
+#, php-format
+msgid "Payment %d has been entered"
+msgstr ""
+
+#: ../gl/gl_bank.php:75
+#: ../gl/gl_bank.php:93
 msgid "&View the GL Postings for this Payment"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_bank.php:77
-#: /var/www/fa_unstable/devel/../gl/gl_bank.php:93
+#: ../gl/gl_bank.php:77
+#: ../gl/gl_bank.php:95
 msgid "Enter Another &Payment"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_bank.php:79
-#: /var/www/fa_unstable/devel/../gl/gl_bank.php:95
+#: ../gl/gl_bank.php:79
+#: ../gl/gl_bank.php:97
 msgid "Enter A &Deposit"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_bank.php:107
+#: ../gl/gl_bank.php:81
+#: ../gl/gl_journal.php:62
+#: ../inventory/adjustments.php:50
+#: ../manufacturing/work_order_entry.php:68
+#: ../purchasing/po_entry_items.php:112
+#: ../purchasing/po_entry_items.php:136
+#: ../purchasing/supplier_credit.php:84
+#: ../purchasing/supplier_invoice.php:74
+#: ../sales/credit_note_entry.php:77
+#: ../sales/customer_credit_invoice.php:62
+#: ../sales/customer_invoice.php:68
+#: ../sales/sales_order_entry.php:227
+msgid "Add an Attachment"
+msgstr ""
+
+#: ../gl/gl_bank.php:107
+#, php-format
+msgid "Deposit %d has been entered"
+msgstr ""
+
+#: ../gl/gl_bank.php:109
 msgid "View the GL Postings for this Deposit"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_bank.php:109
+#: ../gl/gl_bank.php:111
 msgid "Enter Another Deposit"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_bank.php:111
+#: ../gl/gl_bank.php:113
 msgid "Enter A Payment"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_bank.php:122
+#: ../gl/gl_bank.php:122
+#, php-format
+msgid "Deposit %d has been modified"
+msgstr ""
+
+#: ../gl/gl_bank.php:124
 msgid "&View the GL Postings for this Deposit"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_bank.php:124
+#: ../gl/gl_bank.php:126
 msgid "Enter Another &Deposit"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_bank.php:126
+#: ../gl/gl_bank.php:128
 msgid "Enter A &Payment"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_bank.php:228
+#: ../gl/gl_bank.php:221
 msgid "You must enter at least one payment line."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_bank.php:234
-msgid "The total bank amount cannot be 0."
+#: ../gl/gl_bank.php:238
+#: ../purchasing/supplier_payment.php:194
+#, php-format
+msgid "The total bank amount exceeds allowed limit (%s)."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_bank.php:253
+#: ../gl/gl_bank.php:263
 msgid "The entered date for the payment is invalid."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_bank.php:322
-msgid "The source and destination accouts cannot be the same."
+#: ../gl/gl_bank.php:275
+msgid "You have to select customer and customer branch."
+msgstr ""
+
+#: ../gl/gl_bank.php:279
+msgid "You have to select supplier."
+msgstr ""
+
+#: ../gl/gl_bank.php:325
+msgid "The amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_bank.php:404
+#: ../gl/gl_bank.php:397
 msgid "Payment Items"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_bank.php:404
+#: ../gl/gl_bank.php:397
 msgid "Deposit Items"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_bank.php:412
+#: ../gl/gl_bank.php:405
 msgid "Process Payment"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_bank.php:412
+#: ../gl/gl_bank.php:405
 msgid "Process Deposit"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_budget.php:18
+#: ../gl/gl_budget.php:18
 msgid "Budget Entry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_budget.php:26
-#: /var/www/fa_unstable/devel/../gl/manage/gl_accounts.php:23
+#: ../gl/gl_budget.php:26
+#: ../gl/manage/gl_accounts.php:23
 msgid ""
 "There are no account groups defined. Please define at least one account "
 "group before entering accounts."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_budget.php:45
+#: ../gl/gl_budget.php:45
 msgid "The Budget has been saved."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_budget.php:47
+#: ../gl/gl_budget.php:47
 msgid "The Budget has been deleted."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_budget.php:64
-#: /var/www/fa_unstable/devel/../gl/manage/gl_accounts.php:227
-#: /var/www/fa_unstable/devel/../gl/manage/gl_accounts.php:237
+#: ../gl/gl_budget.php:64
+#: ../gl/manage/gl_accounts.php:229
+#: ../gl/manage/gl_accounts.php:239
 msgid "Account Code:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_budget.php:84
-#: /var/www/fa_unstable/devel/../gl/manage/exchange_rates.php:142
+#: ../gl/gl_budget.php:84
+#: ../gl/manage/exchange_rates.php:142
 msgid "Get"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_budget.php:91
-#: /var/www/fa_unstable/devel/../gl/gl_budget.php:93
-#: /var/www/fa_unstable/devel/../gl/inquiry/profit_loss.php:218
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:226
-#: /var/www/fa_unstable/devel/../reporting/rep101.php:136
-#: /var/www/fa_unstable/devel/../reporting/rep105.php:116
-#: /var/www/fa_unstable/devel/../reporting/rep106.php:90
-#: /var/www/fa_unstable/devel/../reporting/rep201.php:124
-#: /var/www/fa_unstable/devel/../reporting/rep304.php:121
-#: /var/www/fa_unstable/devel/../reporting/rep305.php:77
-#: /var/www/fa_unstable/devel/../reporting/rep601.php:82
-#: /var/www/fa_unstable/devel/../reporting/rep702.php:57
-#: /var/www/fa_unstable/devel/../reporting/rep704.php:90
-#: /var/www/fa_unstable/devel/../reporting/rep704.php:100
-#: /var/www/fa_unstable/devel/../reporting/rep704.php:108
-#: /var/www/fa_unstable/devel/../reporting/rep706.php:181
-#: /var/www/fa_unstable/devel/../reporting/rep706.php:189
-#: /var/www/fa_unstable/devel/../reporting/rep706.php:199
-#: /var/www/fa_unstable/devel/../reporting/rep706.php:207
-#: /var/www/fa_unstable/devel/../reporting/rep707.php:206
-#: /var/www/fa_unstable/devel/../reporting/rep707.php:213
-#: /var/www/fa_unstable/devel/../reporting/rep707.php:223
-#: /var/www/fa_unstable/devel/../reporting/rep707.php:231
-#: /var/www/fa_unstable/devel/../reporting/rep708.php:87
-#: /var/www/fa_unstable/devel/../reporting/rep708.php:96
-#: /var/www/fa_unstable/devel/../reporting/rep708.php:103
-#: /var/www/fa_unstable/devel/../reporting/rep709.php:102
-#: /var/www/fa_unstable/devel/../reporting/rep710.php:83
+#: ../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:119
+#: ../reporting/rep305.php:100
+#: ../reporting/rep601.php:82
+#: ../reporting/rep602.php:86
+#: ../reporting/rep702.php:57
+#: ../reporting/rep704.php:91
+#: ../reporting/rep704.php:101
+#: ../reporting/rep704.php:109
+#: ../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:187
+#: ../reporting/rep708.php:196
+#: ../reporting/rep708.php:203
+#: ../reporting/rep709.php:104
+#: ../reporting/rep710.php:83
 msgid "Period"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_budget.php:91
+#: ../gl/gl_budget.php:91
 msgid "Dim. incl."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_budget.php:91
-#: /var/www/fa_unstable/devel/../gl/gl_budget.php:93
+#: ../gl/gl_budget.php:91
+#: ../gl/gl_budget.php:93
 msgid "Last Year"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_budget.php:127
-#: /var/www/fa_unstable/devel/../gl/inquiry/balance_sheet.php:96
-#: /var/www/fa_unstable/devel/../gl/inquiry/balance_sheet.php:193
-#: /var/www/fa_unstable/devel/../gl/inquiry/balance_sheet.php:224
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_trial_balance.php:135
-#: /var/www/fa_unstable/devel/../gl/inquiry/profit_loss.php:111
-#: /var/www/fa_unstable/devel/../gl/inquiry/profit_loss.php:270
-#: /var/www/fa_unstable/devel/../gl/view/gl_deposit_view.php:132
-#: /var/www/fa_unstable/devel/../gl/view/gl_payment_view.php:131
-#: /var/www/fa_unstable/devel/../gl/view/gl_trans_view.php:104
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:174
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:141
-#: /var/www/fa_unstable/devel/../inventory/includes/item_adjustments_ui.inc:63
-#: /var/www/fa_unstable/devel/../inventory/includes/item_adjustments_ui.inc:102
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:178
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:305
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:464
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:534
-#: /var/www/fa_unstable/devel/../purchasing/po_receive_items.php:59
-#: /var/www/fa_unstable/devel/../purchasing/view/view_po.php:140
-#: /var/www/fa_unstable/devel/../purchasing/allocations/supplier_allocation_main.php:100
-#: /var/www/fa_unstable/devel/../reporting/rep101.php:237
-#: /var/www/fa_unstable/devel/../reporting/rep106.php:82
-#: /var/www/fa_unstable/devel/../reporting/rep106.php:120
-#: /var/www/fa_unstable/devel/../reporting/rep106.php:168
-#: /var/www/fa_unstable/devel/../reporting/rep201.php:221
-#: /var/www/fa_unstable/devel/../reporting/rep203.php:92
-#: /var/www/fa_unstable/devel/../reporting/rep203.php:167
-#: /var/www/fa_unstable/devel/../reporting/rep204.php:109
-#: /var/www/fa_unstable/devel/../reporting/rep204.php:137
-#: /var/www/fa_unstable/devel/../reporting/rep301.php:125
-#: /var/www/fa_unstable/devel/../reporting/rep301.php:162
-#: /var/www/fa_unstable/devel/../reporting/rep304.php:144
-#: /var/www/fa_unstable/devel/../reporting/rep304.php:186
-#: /var/www/fa_unstable/devel/../reporting/rep305.php:72
-#: /var/www/fa_unstable/devel/../reporting/rep305.php:96
-#: /var/www/fa_unstable/devel/../reporting/rep305.php:127
-#: /var/www/fa_unstable/devel/../reporting/rep705.php:152
-#: /var/www/fa_unstable/devel/../reporting/rep705.php:309
-#: /var/www/fa_unstable/devel/../reporting/rep706.php:106
-#: /var/www/fa_unstable/devel/../reporting/rep706.php:249
-#: /var/www/fa_unstable/devel/../reporting/rep706.php:284
-#: /var/www/fa_unstable/devel/../reporting/rep707.php:115
-#: /var/www/fa_unstable/devel/../reporting/rep707.php:291
-#: /var/www/fa_unstable/devel/../reporting/rep708.php:181
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:103
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:111
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:292
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:431
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:441
-#: /var/www/fa_unstable/devel/../sales/allocations/customer_allocation_main.php:99
-#: /var/www/fa_unstable/devel/../sales/view/view_credit.php:91
-#: /var/www/fa_unstable/devel/../sales/view/view_dispatch.php:113
-#: /var/www/fa_unstable/devel/../sales/view/view_invoice.php:115
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:94
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:127
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:159
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:200
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_credit_ui.inc:168
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:148
+#: ../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:115
+#: ../gl/includes/ui/gl_bank_ui.inc:200
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:174
+#: ../gl/includes/ui/gl_journal_ui.inc:153
+#: ../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:329
+#: ../purchasing/includes/ui/invoice_ui.inc:495
+#: ../purchasing/includes/ui/invoice_ui.inc:566
+#: ../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:115
+#: ../reporting/rep106.php:158
+#: ../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:130
+#: ../reporting/rep301.php:167
+#: ../reporting/rep304.php:142
+#: ../reporting/rep304.php:184
+#: ../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:235
+#: ../reporting/includes/doctext.inc:30
+#: ../reporting/includes/doctext.inc:192
+#: ../sales/customer_credit_invoice.php:283
+#: ../sales/customer_delivery.php:441
+#: ../sales/customer_invoice.php:540
+#: ../sales/customer_invoice.php:543
+#: ../sales/allocations/customer_allocation_main.php:99
+#: ../sales/view/view_credit.php:91
+#: ../sales/view/view_dispatch.php:113
+#: ../sales/view/view_invoice.php:116
+#: ../sales/view/view_sales_order.php:109
+#: ../sales/view/view_sales_order.php:142
+#: ../sales/view/view_sales_order.php:179
+#: ../sales/view/view_sales_order.php:220
+#: ../sales/view/view_sales_order.php.orig:96
+#: ../sales/view/view_sales_order.php.orig:129
+#: ../sales/view/view_sales_order.php.orig:161
+#: ../sales/view/view_sales_order.php.orig:202
+#: ../sales/includes/ui/sales_credit_ui.inc:168
+#: ../sales/includes/ui/sales_order_ui.inc:142
+#: ../sales/includes/ui/sales_order_ui.inc.orig:142
 msgid "Total"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_journal.php:32
+#: ../gl/gl_journal.php:32
 #, php-format
 msgid "Modifying Journal Transaction # %d."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_journal.php:36
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:22
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:123
+#: ../gl/gl_journal.php:36
+#: ../includes/sysnames.inc:22
+#: ../includes/sysnames.inc:150
 msgid "Journal Entry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_journal.php:54
+#: ../gl/gl_journal.php:55
 msgid "Journal entry has been entered"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_journal.php:56
-#: /var/www/fa_unstable/devel/../gl/gl_journal.php:69
+#: ../gl/gl_journal.php:57
+#: ../gl/gl_journal.php:72
 msgid "&View this Journal Entry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_journal.php:59
+#: ../gl/gl_journal.php:60
 msgid "Enter &New Journal Entry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_journal.php:67
+#: ../gl/gl_journal.php:70
 msgid "Journal entry has been updated"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_journal.php:71
+#: ../gl/gl_journal.php:74
 msgid "Return to Journal &Inquiry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_journal.php:84
+#: ../gl/gl_journal.php:87
 msgid ""
 "You can edit directly only journal entries created via Journal Entry page."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_journal.php:85
+#: ../gl/gl_journal.php:88
 msgid "Entry &New Journal Entry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_journal.php:141
+#: ../gl/gl_journal.php:145
 msgid "You must enter at least one journal line."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_journal.php:147
+#: ../gl/gl_journal.php:151
+#: ../includes/ui/gl_cart.inc:128
 msgid ""
 "The journal must balance (debits equal to credits) before it can be "
 "processed."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_journal.php:209
-#: /var/www/fa_unstable/devel/../gl/gl_journal.php:216
+#: ../gl/gl_journal.php:213
+#: ../gl/gl_journal.php:220
 msgid "Dimension is closed."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_journal.php:223
+#: ../gl/gl_journal.php:227
 msgid "You must enter either a debit amount or a credit amount."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_journal.php:230
+#: ../gl/gl_journal.php:234
 msgid "The debit amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_journal.php:235
+#: ../gl/gl_journal.php:239
 msgid "The credit amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_journal.php:241
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:646
-#: /var/www/fa_unstable/devel/../purchasing/supplier_credit.php:119
-#: /var/www/fa_unstable/devel/../purchasing/supplier_invoice.php:119
+#: ../gl/gl_journal.php:245
+#: ../includes/ui/ui_view.inc:673
+#: ../includes/ui/ui_view.inc.orig:672
+#: ../purchasing/supplier_credit.php:136
+#: ../purchasing/supplier_invoice.php:143
 msgid "Cannot post to GL account used by more than one tax type."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_journal.php:248
+#: ../gl/gl_journal.php:252
 msgid ""
 "You cannot make a journal entry for a bank account. Please use one of the "
 "banking functions for bank transactions."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_journal.php:327
+#: ../gl/gl_journal.php:331
 msgid "Rows"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_journal.php:333
+#: ../gl/gl_journal.php:337
 msgid "Process Journal Entry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/gl_journal.php:334
+#: ../gl/gl_journal.php:338
 msgid "Process journal entry only if debits equal to credits"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/balance_sheet.php:27
+#: ../gl/inquiry/balance_sheet.php:27
 msgid "Balance Sheet Drilldown"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/balance_sheet.php:123
+#: ../gl/inquiry/balance_sheet.php:126
 msgid "As at:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/balance_sheet.php:216
-#: /var/www/fa_unstable/devel/../gl/inquiry/profit_loss.php:281
-#: /var/www/fa_unstable/devel/../reporting/rep705.php:319
-#: /var/www/fa_unstable/devel/../reporting/rep706.php:272
-#: /var/www/fa_unstable/devel/../reporting/rep706.php:297
-#: /var/www/fa_unstable/devel/../reporting/rep707.php:303
-#: /var/www/fa_unstable/devel/../reporting/rep707.php:309
+#: ../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
 msgid "Calculated Return"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/balance_sheet.php:224
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:94
-#: /var/www/fa_unstable/devel/../reporting/rep706.php:284
+#: ../gl/inquiry/balance_sheet.php:236
+#: ../includes/sysnames.inc:121
+#: ../reporting/rep706.php:284
 msgid "Liabilities"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/balance_sheet.php:224
-#: /var/www/fa_unstable/devel/../reporting/rep706.php:284
+#: ../gl/inquiry/balance_sheet.php:236
+#: ../reporting/rep706.php:284
 msgid " and "
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/balance_sheet.php:224
-#: /var/www/fa_unstable/devel/../reporting/rep706.php:284
+#: ../gl/inquiry/balance_sheet.php:236
+#: ../reporting/rep706.php:284
 msgid "Equities"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/bank_inquiry.php:28
-#: /var/www/fa_unstable/devel/../reporting/rep601.php:69
+#: ../gl/inquiry/bank_inquiry.php:28
+#: ../reporting/rep601.php:69
 msgid "Bank Statement"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/bank_inquiry.php:75
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_account_inquiry.php:161
-#: /var/www/fa_unstable/devel/../reporting/rep601.php:99
-#: /var/www/fa_unstable/devel/../reporting/rep704.php:137
+#: ../gl/inquiry/bank_inquiry.php:78
+#: ../gl/inquiry/gl_account_inquiry.php:162
+#: ../reporting/rep601.php:99
+#: ../reporting/rep602.php:103
+#: ../reporting/rep704.php:138
 msgid "Opening Balance"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/bank_inquiry.php:120
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_account_inquiry.php:210
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_trial_balance.php:145
-#: /var/www/fa_unstable/devel/../reporting/rep601.php:150
-#: /var/www/fa_unstable/devel/../reporting/rep704.php:185
-#: /var/www/fa_unstable/devel/../reporting/rep708.php:190
+#: ../gl/inquiry/bank_inquiry.php:123
+#: ../gl/inquiry/gl_account_inquiry.php:211
+#: ../gl/inquiry/gl_trial_balance.php:219
+#: ../reporting/rep601.php:150
+#: ../reporting/rep602.php:157
+#: ../reporting/rep704.php:186
+#: ../reporting/rep708.php:244
 msgid "Ending Balance"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_account_inquiry.php:30
+#: ../gl/inquiry/gl_account_inquiry.php:31
 msgid "General Ledger Inquiry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_account_inquiry.php:69
+#: ../gl/inquiry/gl_account_inquiry.php:70
 msgid "All Accounts"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_account_inquiry.php:82
+#: ../gl/inquiry/gl_account_inquiry.php:83
 msgid "Amount min:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_account_inquiry.php:83
+#: ../gl/inquiry/gl_account_inquiry.php:84
 msgid "Amount max:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_account_inquiry.php:219
+#: ../gl/inquiry/gl_account_inquiry.php:220
 msgid ""
 "No general ledger transactions have been created for the specified criteria."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_trial_balance.php:27
-#: /var/www/fa_unstable/devel/../reporting/rep708.php:106
+#: ../gl/inquiry/gl_trial_balance.php:28
+#: ../reporting/rep708.php:206
 msgid "Trial Balance"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_trial_balance.php:46
+#: ../gl/inquiry/gl_trial_balance.php:55
 msgid "No zero values"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_trial_balance.php:47
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:288
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:333
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:373
+#: ../gl/inquiry/gl_trial_balance.php:56
+#: ../reporting/reports_main.php:301
+#: ../reporting/reports_main.php:346
+#: ../reporting/reports_main.php:386
 msgid "Only balances"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_trial_balance.php:64
-#: /var/www/fa_unstable/devel/../gl/manage/bank_accounts.php:102
-#: /var/www/fa_unstable/devel/../gl/view/gl_trans_view.php:63
-#: /var/www/fa_unstable/devel/../gl/view/gl_trans_view.php:66
-#: /var/www/fa_unstable/devel/../gl/view/gl_trans_view.php:69
-#: /var/www/fa_unstable/devel/../reporting/rep701.php:104
-#: /var/www/fa_unstable/devel/../reporting/rep702.php:51
-#: /var/www/fa_unstable/devel/../reporting/rep705.php:234
-#: /var/www/fa_unstable/devel/../reporting/rep706.php:181
-#: /var/www/fa_unstable/devel/../reporting/rep707.php:206
-#: /var/www/fa_unstable/devel/../reporting/rep708.php:79
+#: ../gl/inquiry/gl_trial_balance.php:88
+#: ../gl/inquiry/gl_trial_balance.php:140
+#: ../reporting/rep706.php:302
+#: ../reporting/rep707.php:320
+#: ../reporting/rep708.php:51
+#: ../reporting/rep708.php:117
+#: ../sales/create_recurrent_invoices.php:115
+#: ../sales/manage/recurrent_invoices.php:102
+msgid "Group"
+msgstr ""
+
+#: ../gl/inquiry/gl_trial_balance.php:158
+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:109
+#: ../gl/view/gl_trans_view.php:68
+#: ../gl/view/gl_trans_view.php:71
+#: ../gl/view/gl_trans_view.php:74
+#: ../reporting/rep701.php:109
+#: ../reporting/rep702.php:51
+#: ../reporting/rep705.php:234
+#: ../reporting/rep706.php:181
+#: ../reporting/rep707.php:206
+#: ../reporting/rep708.php:179
 msgid "Account Name"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_trial_balance.php:65
-#: /var/www/fa_unstable/devel/../reporting/rep708.php:71
+#: ../gl/inquiry/gl_trial_balance.php:172
+#: ../reporting/rep708.php:172
 msgid "Brought Forward"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/gl_trial_balance.php:66
-#: /var/www/fa_unstable/devel/../reporting/rep708.php:71
+#: ../gl/inquiry/gl_trial_balance.php:173
+#: ../reporting/rep708.php:172
 msgid "This Period"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/journal_inquiry.php:27
+#: ../gl/inquiry/gl_trial_balance.php:192
+msgid "Class"
+msgstr ""
+
+#: ../gl/inquiry/gl_trial_balance.php:227
+#: ../reporting/rep708.php:265
+msgid ""
+"The Opening Balance is not in balance, probably due to a non closed Previous "
+"Fiscalyear."
+msgstr ""
+
+#: ../gl/inquiry/journal_inquiry.php:27
 msgid "Journal Inquiry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/journal_inquiry.php:45
+#: ../gl/inquiry/journal_inquiry.php:45
 msgid "Enter reference fragment or leave empty"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/journal_inquiry.php:51
+#: ../gl/inquiry/journal_inquiry.php:51
 msgid "Show closed:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/journal_inquiry.php:56
+#: ../gl/inquiry/journal_inquiry.php:56
 msgid "Enter memo fragment or leave empty"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/journal_inquiry.php:122
+#: ../gl/inquiry/journal_inquiry.php:130
 msgid "Trans #"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/journal_inquiry.php:126
-#: /var/www/fa_unstable/devel/../reporting/rep710.php:75
-#: /var/www/fa_unstable/devel/../reporting/rep710.php:85
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:387
+#: ../gl/inquiry/journal_inquiry.php:134
+#: ../reporting/rep710.php:75
+#: ../reporting/rep710.php:85
+#: ../reporting/reports_main.php:400
 msgid "User"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/profit_loss.php:27
+#: ../gl/inquiry/profit_loss.php:27
 msgid "Profit & Loss Drilldown"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/profit_loss.php:163
-#: /var/www/fa_unstable/devel/../reporting/rep707.php:206
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:230
+#: ../gl/inquiry/profit_loss.php:168
+#: ../reporting/rep707.php:206
+#: ../reporting/includes/reports_classes.inc:234
 msgid "Accumulated"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/profit_loss.php:163
-#: /var/www/fa_unstable/devel/../reporting/rep707.php:251
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:230
+#: ../gl/inquiry/profit_loss.php:168
+#: ../reporting/rep707.php:251
+#: ../reporting/includes/reports_classes.inc:234
 msgid "Period Y-1"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/profit_loss.php:163
-#: /var/www/fa_unstable/devel/../reporting/rep707.php:242
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:230
+#: ../gl/inquiry/profit_loss.php:168
+#: ../reporting/rep707.php:242
+#: ../reporting/includes/reports_classes.inc:234
 msgid "Budget"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/profit_loss.php:164
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:276
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:322
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:363
+#: ../gl/inquiry/profit_loss.php:169
+#: ../reporting/reports_main.php:289
+#: ../reporting/reports_main.php:335
+#: ../reporting/reports_main.php:376
 msgid "Compare to"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/profit_loss.php:217
+#: ../gl/inquiry/profit_loss.php:230
 msgid "Group/Account Name"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/profit_loss.php:220
-#: /var/www/fa_unstable/devel/../reporting/rep707.php:206
+#: ../gl/inquiry/profit_loss.php:233
+#: ../reporting/rep707.php:206
 msgid "Achieved %"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/tax_inquiry.php:30
+#: ../gl/inquiry/tax_inquiry.php:30
 msgid "Tax Inquiry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/tax_inquiry.php:82
-#: /var/www/fa_unstable/devel/../reporting/rep709.php:168
+#: ../gl/inquiry/tax_inquiry.php:82
+#: ../reporting/rep709.php:172
 msgid "Outputs"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/tax_inquiry.php:82
-#: /var/www/fa_unstable/devel/../reporting/rep709.php:168
+#: ../gl/inquiry/tax_inquiry.php:82
+#: ../reporting/rep709.php:172
 msgid "Inputs"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/tax_inquiry.php:100
+#: ../gl/inquiry/tax_inquiry.php:100
 msgid "Charged on sales"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/tax_inquiry.php:100
-#: /var/www/fa_unstable/devel/../reporting/rep709.php:168
+#: ../gl/inquiry/tax_inquiry.php:100
+#: ../reporting/rep709.php:172
 msgid "Output Tax"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/tax_inquiry.php:106
+#: ../gl/inquiry/tax_inquiry.php:106
 msgid "Paid on purchases"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/tax_inquiry.php:106
-#: /var/www/fa_unstable/devel/../reporting/rep709.php:168
+#: ../gl/inquiry/tax_inquiry.php:106
+#: ../reporting/rep709.php:172
 msgid "Input Tax"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/tax_inquiry.php:112
+#: ../gl/inquiry/tax_inquiry.php:112
 msgid "Net payable or collectible"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/inquiry/tax_inquiry.php:119
-#: /var/www/fa_unstable/devel/../reporting/rep709.php:199
+#: ../gl/inquiry/tax_inquiry.php:119
+#: ../reporting/rep709.php:203
 msgid "Total payable or refund"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/bank_accounts.php:16
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:225
+#: ../gl/manage/bank_accounts.php:16
+#: ../reporting/reports_main.php:238
 msgid "Bank Accounts"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/bank_accounts.php:33
+#: ../gl/manage/bank_accounts.php:33
 msgid "The bank account name cannot be empty."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/bank_accounts.php:47
+#: ../gl/manage/bank_accounts.php:39
+msgid "The GL account selected is already in use. Select another GL account."
+msgstr ""
+
+#: ../gl/manage/bank_accounts.php:52
 msgid "Bank account has been updated"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/bank_accounts.php:56
+#: ../gl/manage/bank_accounts.php:61
 msgid "New bank account has been added"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../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 ""
 
-#: /var/www/fa_unstable/devel/../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 ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/bank_accounts.php:83
+#: ../gl/manage/bank_accounts.php:87
 msgid "Selected bank account has been deleted"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/bank_accounts.php:102
-#: /var/www/fa_unstable/devel/../gl/view/bank_transfer_view.php:69
-#: /var/www/fa_unstable/devel/../gl/view/bank_transfer_view.php:78
-#: /var/www/fa_unstable/devel/../gl/view/gl_deposit_view.php:66
-#: /var/www/fa_unstable/devel/../gl/view/gl_payment_view.php:64
-#: /var/www/fa_unstable/devel/../inventory/prices.php:133
-#: /var/www/fa_unstable/devel/../inventory/purchasing_data.php:127
-#: /var/www/fa_unstable/devel/../purchasing/view/view_supp_credit.php:49
-#: /var/www/fa_unstable/devel/../purchasing/view/view_supp_invoice.php:53
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search_completed.php:117
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search.php:131
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_allocation_inquiry.php:132
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_allocation_inquiry.php:142
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_inquiry.php:72
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_inquiry.php:169
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_inquiry.php:180
-#: /var/www/fa_unstable/devel/../purchasing/allocations/supplier_allocation_main.php:99
-#: /var/www/fa_unstable/devel/../purchasing/allocations/supplier_allocation_main.php:107
-#: /var/www/fa_unstable/devel/../reporting/rep101.php:138
-#: /var/www/fa_unstable/devel/../reporting/rep102.php:123
-#: /var/www/fa_unstable/devel/../reporting/rep102.php:128
-#: /var/www/fa_unstable/devel/../reporting/rep104.php:114
-#: /var/www/fa_unstable/devel/../reporting/rep201.php:126
-#: /var/www/fa_unstable/devel/../reporting/rep202.php:126
-#: /var/www/fa_unstable/devel/../reporting/rep203.php:99
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:248
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:338
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:390
-#: /var/www/fa_unstable/devel/../sales/allocations/customer_allocation_main.php:98
-#: /var/www/fa_unstable/devel/../sales/allocations/customer_allocation_main.php:106
-#: /var/www/fa_unstable/devel/../sales/view/view_credit.php:70
-#: /var/www/fa_unstable/devel/../sales/view/view_dispatch.php:86
-#: /var/www/fa_unstable/devel/../sales/view/view_invoice.php:86
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_allocation_inquiry.php:148
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_allocation_inquiry.php:158
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_inquiry.php:76
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_inquiry.php:220
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_inquiry.php:233
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_deliveries_view.php:184
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:263
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:277
+#: ../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:54
+#: ../purchasing/inquiry/po_search_completed.php:126
+#: ../purchasing/inquiry/po_search_completed.php.orig:125
+#: ../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:73
+#: ../purchasing/inquiry/supplier_inquiry.php:180
+#: ../purchasing/inquiry/supplier_inquiry.php:192
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:73
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:177
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:189
+#: ../purchasing/allocations/supplier_allocation_main.php:99
+#: ../purchasing/allocations/supplier_allocation_main.php:107
+#: ../reporting/rep101.php:138
+#: ../reporting/rep102.php:131
+#: ../reporting/rep102.php:137
+#: ../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:348
+#: ../sales/customer_invoice.php:468
+#: ../sales/allocations/customer_allocation_main.php:98
+#: ../sales/allocations/customer_allocation_main.php:106
+#: ../sales/view/view_credit.php:70
+#: ../sales/view/view_dispatch.php:86
+#: ../sales/view/view_invoice.php:86
+#: ../sales/inquiry/customer_allocation_inquiry.php:151
+#: ../sales/inquiry/customer_allocation_inquiry.php:161
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:151
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:161
+#: ../sales/inquiry/customer_inquiry.php:76
+#: ../sales/inquiry/customer_inquiry.php:208
+#: ../sales/inquiry/customer_inquiry.php:221
+#: ../sales/inquiry/customer_inquiry.php.orig:77
+#: ../sales/inquiry/customer_inquiry.php.orig:232
+#: ../sales/inquiry/customer_inquiry.php.orig:245
+#: ../sales/inquiry/sales_deliveries_view.php:189
+#: ../sales/inquiry/sales_deliveries_view.php.orig:189
+#: ../sales/inquiry/sales_orders_view.php:294
+#: ../sales/inquiry/sales_orders_view.php:308
+#: ../sales/inquiry/sales_orders_view.php.orig:271
+#: ../sales/inquiry/sales_orders_view.php.orig:285
 msgid "Currency"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/bank_accounts.php:102
+#: ../gl/manage/bank_accounts.php:109
 msgid "GL Account"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/bank_accounts.php:103
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:77
+#: ../gl/manage/bank_accounts.php:110
+#: ../reporting/includes/doctext.inc:260
 msgid "Bank"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/bank_accounts.php:103
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:480
+#: ../gl/manage/bank_accounts.php:110
+#: ../includes/ui/ui_view.inc:488
+#: ../includes/ui/ui_view.inc.orig:488
 msgid "Number"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/bank_accounts.php:103
+#: ../gl/manage/bank_accounts.php:110
 msgid "Bank Address"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/bank_accounts.php:103
+#: ../gl/manage/bank_accounts.php:110
 msgid "Dflt"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/bank_accounts.php:159
+#: ../gl/manage/bank_accounts.php:167
 msgid "Bank Account Name:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/bank_accounts.php:163
-#: /var/www/fa_unstable/devel/../gl/manage/bank_accounts.php:167
+#: ../gl/manage/bank_accounts.php:171
+#: ../gl/manage/bank_accounts.php:175
 msgid "Account Type:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/bank_accounts.php:171
-#: /var/www/fa_unstable/devel/../gl/manage/bank_accounts.php:175
+#: ../gl/manage/bank_accounts.php:179
+#: ../gl/manage/bank_accounts.php:183
 msgid "Bank Account Currency:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/bank_accounts.php:178
+#: ../gl/manage/bank_accounts.php:186
 msgid "Default currency account:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/bank_accounts.php:181
-#: /var/www/fa_unstable/devel/../gl/manage/bank_accounts.php:183
+#: ../gl/manage/bank_accounts.php:189
+#: ../gl/manage/bank_accounts.php:191
 msgid "Bank Account GL Code:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/bank_accounts.php:185
+#: ../gl/manage/bank_accounts.php:194
 msgid "Bank Name:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/bank_accounts.php:186
+#: ../gl/manage/bank_accounts.php:195
+#: ../sales/manage/customer_branches.php:255
 msgid "Bank Account Number:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/bank_accounts.php:187
+#: ../gl/manage/bank_accounts.php:196
 msgid "Bank Address:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/currencies.php:16
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:223
+#: ../gl/manage/close_period.php:25
+#: ../gl/manage/close_period.php.orig:25
+msgid "Closing GL Transactions"
+msgstr ""
+
+#: ../gl/manage/close_period.php:40
+#: ../gl/manage/close_period.php.orig:40
+msgid "Selected date is not in fiscal year or the year is closed."
+msgstr ""
+
+#: ../gl/manage/close_period.php:47
+#: ../gl/manage/close_period.php.orig:47
+msgid "The entered date is earlier than date already selected as closing date."
+msgstr ""
+
+#: ../gl/manage/close_period.php:51
+#: ../gl/manage/close_period.php.orig:51
+msgid "You are not allowed to reopen already closed transactions."
+msgstr ""
+
+#: ../gl/manage/close_period.php:69
+#: ../gl/manage/close_period.php.orig: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
+#: ../gl/manage/close_period.php.orig: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
+#: ../gl/manage/close_period.php.orig:101
+msgid "End date of closing period:"
+msgstr ""
+
+#: ../gl/manage/close_period.php:104
+#: ../gl/manage/close_period.php.orig:104
+msgid "Close Transactions"
+msgstr ""
+
+#: ../gl/manage/currencies.php:16
+#: ../includes/access_levels.inc:223
 msgid "Currencies"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/currencies.php:29
+#: ../gl/manage/currencies.php:29
 msgid "The currency abbreviation must be entered."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/currencies.php:35
+#: ../gl/manage/currencies.php:35
 msgid "The currency name must be entered."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/currencies.php:41
+#: ../gl/manage/currencies.php:41
 msgid "The currency symbol must be entered."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/currencies.php:47
+#: ../gl/manage/currencies.php:47
 msgid "The hundredths name must be entered."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/currencies.php:69
+#: ../gl/manage/currencies.php:69
 msgid "Selected currency settings has been updated"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/currencies.php:76
+#: ../gl/manage/currencies.php:76
 msgid "New currency has been added"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../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 ""
 
-#: /var/www/fa_unstable/devel/../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 ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/currencies.php:106
+#: ../gl/manage/currencies.php:104
 msgid ""
 "Cannot delete this currency, because the company preferences uses this "
 "currency."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../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 ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/currencies.php:128
+#: ../gl/manage/currencies.php:126
 msgid "Selected currency has been deleted"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/currencies.php:141
+#: ../gl/manage/currencies.php:139
 msgid "Abbreviation"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/currencies.php:141
+#: ../gl/manage/currencies.php:139
 msgid "Symbol"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/currencies.php:141
+#: ../gl/manage/currencies.php:139
 msgid "Currency Name"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/currencies.php:142
+#: ../gl/manage/currencies.php:140
 msgid "Hundredths name"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/currencies.php:142
+#: ../gl/manage/currencies.php:140
 msgid "Country"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/currencies.php:142
+#: ../gl/manage/currencies.php:140
 msgid "Auto update"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/currencies.php:177
+#: ../gl/manage/currencies.php:175
 msgid "The marked currency is the home currency which cannot be deleted."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/currencies.php:203
-#: /var/www/fa_unstable/devel/../gl/manage/currencies.php:208
+#: ../gl/manage/currencies.php:201
+#: ../gl/manage/currencies.php:206
 msgid "Currency Abbreviation:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/currencies.php:211
+#: ../gl/manage/currencies.php:209
 msgid "Currency Symbol:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/currencies.php:212
+#: ../gl/manage/currencies.php:210
 msgid "Currency Name:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/currencies.php:213
+#: ../gl/manage/currencies.php:211
 msgid "Hundredths Name:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/currencies.php:214
+#: ../gl/manage/currencies.php:212
 msgid "Country:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/currencies.php:215
+#: ../gl/manage/currencies.php:213
 msgid "Automatic exchange rate update:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/exchange_rates.php:24
+#: ../gl/manage/exchange_rates.php:24
 msgid "Exchange Rates"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/exchange_rates.php:39
+#: ../gl/manage/exchange_rates.php:39
 msgid "The exchange rate cannot be zero or a negative number."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/exchange_rates.php:45
+#: ../gl/manage/exchange_rates.php:45
 msgid "The exchange rate for the date is already there."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/exchange_rates.php:127
-#: /var/www/fa_unstable/devel/../gl/manage/exchange_rates.php:133
+#: ../gl/manage/exchange_rates.php:127
+#: ../gl/manage/exchange_rates.php:133
 msgid "Date to Use From:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/exchange_rates.php:141
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:288
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:290
+#: ../gl/manage/exchange_rates.php:141
+#: ../includes/ui/ui_view.inc:288
+#: ../includes/ui/ui_view.inc:290
+#: ../includes/ui/ui_view.inc.orig:288
+#: ../includes/ui/ui_view.inc.orig:290
 msgid "Exchange Rate:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/exchange_rates.php:142
+#: ../gl/manage/exchange_rates.php:142
 msgid "Get current ECB rate"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/exchange_rates.php:148
+#: ../gl/manage/exchange_rates.php:148
 msgid "Exchange rates are entered against the company currency."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/exchange_rates.php:179
+#: ../gl/manage/exchange_rates.php:179
 msgid "Select a currency :"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/exchange_rates.php:195
+#: ../gl/manage/exchange_rates.php:195
 msgid "Date to Use From"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/exchange_rates.php:196
+#: ../gl/manage/exchange_rates.php:196
 msgid "Exchange Rate"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/exchange_rates.php:205
+#: ../gl/manage/exchange_rates.php:205
 msgid "The selected currency is the company currency."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/exchange_rates.php:206
+#: ../gl/manage/exchange_rates.php:206
 msgid ""
 "The company currency is the base currency so exchange rates cannot be set "
 "for it."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_classes.php:16
+#: ../gl/manage/gl_account_classes.php:16
 msgid "GL Account Classes"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_classes.php:36
+#: ../gl/manage/gl_account_classes.php:31
+msgid "The account class ID cannot be empty."
+msgstr ""
+
+#: ../gl/manage/gl_account_classes.php:37
 msgid "The account class name cannot be empty."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_classes.php:56
+#: ../gl/manage/gl_account_classes.php:57
 msgid "Selected account class settings has been updated"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_classes.php:61
+#: ../gl/manage/gl_account_classes.php:62
 msgid "New account class has been added"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_classes.php:76
+#: ../gl/manage/gl_account_classes.php:77
 msgid ""
 "Cannot delete this account class because GL account types have been created "
 "referring to it."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_classes.php:92
+#: ../gl/manage/gl_account_classes.php:93
 msgid "Selected account class has been deleted"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_classes.php:109
+#: ../gl/manage/gl_account_classes.php:110
 msgid "Class ID"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_classes.php:109
+#: ../gl/manage/gl_account_classes.php:110
 msgid "Class Name"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_classes.php:109
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_types.php:122
+#: ../gl/manage/gl_account_classes.php:110
+#: ../gl/manage/gl_account_types.php:128
 msgid "Class Type"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_classes.php:111
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_classes.php:168
-#: /var/www/fa_unstable/devel/../reporting/rep706.php:211
+#: ../gl/manage/gl_account_classes.php:112
+#: ../gl/manage/gl_account_classes.php:169
+#: ../reporting/rep706.php:211
 msgid "Balance Sheet"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_classes.php:156
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_classes.php:162
+#: ../gl/manage/gl_account_classes.php:157
+#: ../gl/manage/gl_account_classes.php:163
 msgid "Class ID:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_classes.php:165
+#: ../gl/manage/gl_account_classes.php:166
 msgid "Class Name:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_classes.php:170
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_types.php:186
+#: ../gl/manage/gl_account_classes.php:171
+#: ../gl/manage/gl_account_types.php:192
 msgid "Class Type:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_accounts.php:16
-#: /var/www/fa_unstable/devel/../reporting/rep701.php:110
+#: ../gl/manage/gl_accounts.php:16
+#: ../reporting/rep701.php:115
 msgid "Chart of Accounts"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_accounts.php:53
+#: ../gl/manage/gl_accounts.php:53
 msgid "The account code must be entered."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_accounts.php:59
+#: ../gl/manage/gl_accounts.php:59
 msgid "The account name cannot be empty."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_accounts.php:65
+#: ../gl/manage/gl_accounts.php:65
 msgid "The account code must be numeric."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_accounts.php:86
+#: ../gl/manage/gl_accounts.php:81
+msgid "The account belongs to a bank account and cannot be inactivated."
+msgstr ""
+
+#: ../gl/manage/gl_accounts.php:90
 msgid "Account data has been updated."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_accounts.php:95
+#: ../gl/manage/gl_accounts.php:99
 msgid "New account has been added."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_accounts.php:113
+#: ../gl/manage/gl_accounts.php:116
 msgid ""
 "Cannot delete this account because transactions have been created using this "
 "account."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_accounts.php:119
+#: ../gl/manage/gl_accounts.php:122
 msgid ""
 "Cannot delete this account because it is used as one of the company default "
 "GL accounts."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_accounts.php:125
+#: ../gl/manage/gl_accounts.php:128
 msgid "Cannot delete this account because it is used by a bank account."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_accounts.php:131
+#: ../gl/manage/gl_accounts.php:134
 msgid ""
 "Cannot delete this account because it is used by one or more Item Categories."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_accounts.php:137
+#: ../gl/manage/gl_accounts.php:140
 msgid "Cannot delete this account because it is used by one or more Items."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_accounts.php:143
+#: ../gl/manage/gl_accounts.php:146
 msgid "Cannot delete this account because it is used by one or more Taxes."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_accounts.php:149
+#: ../gl/manage/gl_accounts.php:152
 msgid ""
 "Cannot delete this account because it is used by one or more Customer "
 "Branches."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_accounts.php:155
+#: ../gl/manage/gl_accounts.php:157
 msgid "Cannot delete this account because it is used by one or more suppliers."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_accounts.php:161
+#: ../gl/manage/gl_accounts.php:163
 msgid ""
 "Cannot delete this account because it is used by one or more Quick Entry "
 "Lines."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_accounts.php:179
+#: ../gl/manage/gl_accounts.php:181
 msgid "Selected account has been deleted"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_accounts.php:194
+#: ../gl/manage/gl_accounts.php:196
 msgid "New account"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_accounts.php:240
+#: ../gl/manage/gl_accounts.php:242
 msgid "Account Code 2:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_accounts.php:242
+#: ../gl/manage/gl_accounts.php:244
 msgid "Account Name:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_accounts.php:244
+#: ../gl/manage/gl_accounts.php:246
 msgid "Account Group:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_accounts.php:246
+#: ../gl/manage/gl_accounts.php:248
 msgid "Account Tags:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_accounts.php:248
+#: ../gl/manage/gl_accounts.php:250
 msgid "Account status:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_accounts.php:253
+#: ../gl/manage/gl_accounts.php:255
 msgid "Add Account"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_accounts.php:257
+#: ../gl/manage/gl_accounts.php:259
 msgid "Update Account"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_accounts.php:258
+#: ../gl/manage/gl_accounts.php:260
 msgid "Delete account"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_types.php:16
+#: ../gl/manage/gl_account_types.php:16
 msgid "GL Account Groups"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_types.php:29
+#: ../gl/manage/gl_account_types.php:29
 msgid "The account group id cannot be empty."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_types.php:35
+#: ../gl/manage/gl_account_types.php:35
 msgid "The account group name cannot be empty."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_types.php:43
+#: ../gl/manage/gl_account_types.php:42
+msgid "This account group id is already in use."
+msgstr ""
+
+#: ../gl/manage/gl_account_types.php:50
 msgid "You cannot set an account group to be a subgroup of itself."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_types.php:61
+#: ../gl/manage/gl_account_types.php:68
 msgid "Selected account type has been updated"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_types.php:66
+#: ../gl/manage/gl_account_types.php:73
 msgid "New account type has been added"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_types.php:83
+#: ../gl/manage/gl_account_types.php:89
 msgid ""
 "Cannot delete this account group because GL accounts have been created "
 "referring to it."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_types.php:89
+#: ../gl/manage/gl_account_types.php:95
 msgid ""
 "Cannot delete this account group because GL account groups have been created "
 "referring to it."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_types.php:105
+#: ../gl/manage/gl_account_types.php:111
 msgid "Selected account group has been deleted"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_types.php:122
+#: ../gl/manage/gl_account_types.php:128
 msgid "Group ID"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_types.php:122
-#: /var/www/fa_unstable/devel/../sales/manage/sales_groups.php:85
+#: ../gl/manage/gl_account_types.php:128
+#: ../sales/manage/sales_groups.php:85
 msgid "Group Name"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_types.php:122
+#: ../gl/manage/gl_account_types.php:128
 msgid "Subgroup Of"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_types.php:181
+#: ../gl/manage/gl_account_types.php:187
 msgid "ID:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_account_types.php:184
+#: ../gl/manage/gl_account_types.php:190
 msgid "Subgroup Of:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:16
+#: ../gl/manage/gl_quick_entries.php:16
 msgid "Quick Entries"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:58
-#: /var/www/fa_unstable/devel/../includes/ui/simple_crud_class.inc:221
-#: /var/www/fa_unstable/devel/../includes/ui/ui_input.inc:201
+#: ../gl/manage/gl_quick_entries.php:58
+#: ../includes/ui/simple_crud_class.inc:221
+#: ../includes/ui/ui_input.inc:205
 msgid "Add new"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:73
+#: ../gl/manage/gl_quick_entries.php:73
 msgid "The Quick Entry description cannot be empty."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:80
+#: ../gl/manage/gl_quick_entries.php:80
 msgid "You can only use Balance Based together with Journal Entries."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:86
+#: ../gl/manage/gl_quick_entries.php:86
 msgid "The base amount description cannot be empty."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:106
+#: ../gl/manage/gl_quick_entries.php:106
 msgid "Selected quick entry has been updated"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:112
+#: ../gl/manage/gl_quick_entries.php:112
 msgid "New quick entry has been added"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:124
+#: ../gl/manage/gl_quick_entries.php:124
 msgid "Selected quick entry line has been updated"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:130
+#: ../gl/manage/gl_quick_entries.php:130
 msgid "New quick entry line has been added"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:142
+#: ../gl/manage/gl_quick_entries.php:142
 msgid "Selected quick entry has been deleted"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:147
+#: ../gl/manage/gl_quick_entries.php:147
 msgid "The Quick Entry has Quick Entry Lines. Cannot be deleted."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:155
+#: ../gl/manage/gl_quick_entries.php:163
 msgid "Selected quick entry line has been deleted"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:163
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:232
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:233
+#: ../gl/manage/gl_quick_entries.php:171
 msgid "Base Amount"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:220
+#: ../gl/manage/gl_quick_entries.php:226
 msgid "Entry Type"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:223
+#: ../gl/manage/gl_quick_entries.php:230
 msgid "Balance Based"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:226
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:57
+#: ../gl/manage/gl_quick_entries.php:240
+#: ../gl/includes/ui/gl_journal_ui.inc:57
 msgid "Yearly"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:233
+#: ../gl/manage/gl_quick_entries.php:245
 msgid "Base Amount Description"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:234
+#: ../gl/manage/gl_quick_entries.php:246
 msgid "Default Base Amount"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:245
+#: ../gl/manage/gl_quick_entries.php:255
 msgid "Quick Entry Lines"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:251
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:253
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:255
+#: ../gl/manage/gl_quick_entries.php:261
+#: ../gl/manage/gl_quick_entries.php:263
+#: ../gl/manage/gl_quick_entries.php:265
 msgid "Post"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:251
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:253
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:255
+#: ../gl/manage/gl_quick_entries.php:261
+#: ../gl/manage/gl_quick_entries.php:263
+#: ../gl/manage/gl_quick_entries.php:265
 msgid "Account/Tax Type"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:316
+#: ../gl/manage/gl_quick_entries.php:320
 msgid "Posted"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:325
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:431
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:441
+#: ../gl/manage/gl_quick_entries.php:329
+#: ../sales/customer_delivery.php:441
+#: ../sales/customer_invoice.php:540
+#: ../sales/customer_invoice.php:543
 msgid "Tax Type"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/gl_quick_entries.php:333
+#: ../gl/manage/gl_quick_entries.php:337
 msgid "Part"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/revaluate_currencies.php:23
+#: ../gl/manage/revaluate_currencies.php:23
 msgid "Revaluation of Currency Accounts"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/revaluate_currencies.php:31
+#: ../gl/manage/revaluate_currencies.php:32
 msgid "No Revaluation was needed"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/revaluate_currencies.php:101
+#: ../gl/manage/revaluate_currencies.php:40
+#, php-format
+msgid "%d Journal Entries for AR/AP accounts have been added"
+msgstr ""
+
+#: ../gl/manage/revaluate_currencies.php:104
 msgid "Date for Revaluation:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/manage/revaluate_currencies.php:106
+#: ../gl/manage/revaluate_currencies.php:109
 msgid "Revaluate Currencies"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/view/accrual_trans.php:16
+#: ../gl/view/accrual_trans.php:16
 msgid "Search General Ledger Transactions for account: "
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/view/accrual_trans.php:41
-#: /var/www/fa_unstable/devel/../gl/view/gl_trans_view.php:26
+#: ../gl/view/accrual_trans.php:41
+#: ../gl/view/gl_trans_view.php:26
 msgid ""
 "The script must be called with a valid transaction type and transaction "
 "number to review the general ledger postings for."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/view/bank_transfer_view.php:17
+#: ../gl/view/bank_transfer_view.php:17
 msgid "View Bank Transfer"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/view/bank_transfer_view.php:67
-#: /var/www/fa_unstable/devel/../gl/view/gl_payment_view.php:62
-#: /var/www/fa_unstable/devel/../purchasing/view/view_supp_payment.php:54
+#: ../gl/view/bank_transfer_view.php:67
+#: ../gl/view/gl_payment_view.php:62
+#: ../purchasing/view/view_supp_payment.php:54
 msgid "From Bank Account"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/view/bank_transfer_view.php:76
-#: /var/www/fa_unstable/devel/../gl/view/gl_deposit_view.php:64
+#: ../gl/view/bank_transfer_view.php:76
+#: ../gl/view/gl_deposit_view.php:64
 msgid "To Bank Account"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/view/bank_transfer_view.php:84
+#: ../gl/view/bank_transfer_view.php:84
 msgid "Transfer Type"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/view/bank_transfer_view.php:92
-#: /var/www/fa_unstable/devel/../inventory/view/view_transfer.php:76
+#: ../gl/view/bank_transfer_view.php:92
+#: ../inventory/view/view_transfer.php:76
 msgid "This transfer has been voided."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/view/gl_deposit_view.php:17
+#: ../gl/view/gl_deposit_view.php:17
 msgid "View Bank Deposit"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/view/gl_deposit_view.php:48
+#: ../gl/view/gl_deposit_view.php:48
 msgid "GL Deposit"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/view/gl_deposit_view.php:71
-#: /var/www/fa_unstable/devel/../gl/includes/db/gl_db_banking.inc:99
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:78
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:85
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:97
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:104
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:110
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:116
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:151
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:157
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:206
+#: ../gl/view/gl_deposit_view.php:71
+#: ../gl/includes/db/gl_db_banking.inc:211
+#: ../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:219
 msgid "From"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/view/gl_deposit_view.php:72
+#: ../gl/view/gl_deposit_view.php:72
 msgid "Deposit Type"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/view/gl_deposit_view.php:81
+#: ../gl/view/gl_deposit_view.php:81
 msgid "This deposit has been voided."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/view/gl_deposit_view.php:87
+#: ../gl/view/gl_deposit_view.php:87
 msgid "There are no items for this deposit."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/view/gl_deposit_view.php:92
+#: ../gl/view/gl_deposit_view.php:92
 msgid "Items for this Deposit"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/view/gl_deposit_view.php:94
-#: /var/www/fa_unstable/devel/../gl/view/gl_payment_view.php:92
+#: ../gl/view/gl_deposit_view.php:94
+#: ../gl/view/gl_payment_view.php:92
 msgid "Item Amounts are Shown in :"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/view/gl_deposit_view.php:99
-#: /var/www/fa_unstable/devel/../gl/view/gl_deposit_view.php:102
-#: /var/www/fa_unstable/devel/../gl/view/gl_deposit_view.php:105
-#: /var/www/fa_unstable/devel/../gl/view/gl_payment_view.php:98
-#: /var/www/fa_unstable/devel/../gl/view/gl_payment_view.php:101
-#: /var/www/fa_unstable/devel/../gl/view/gl_payment_view.php:104
-#: /var/www/fa_unstable/devel/../gl/view/gl_trans_view.php:63
-#: /var/www/fa_unstable/devel/../gl/view/gl_trans_view.php:66
-#: /var/www/fa_unstable/devel/../gl/view/gl_trans_view.php:69
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:124
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:127
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:130
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:83
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:86
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:89
-#: /var/www/fa_unstable/devel/../reporting/rep701.php:104
+#: ../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:68
+#: ../gl/view/gl_trans_view.php:71
+#: ../gl/view/gl_trans_view.php:74
+#: ../gl/includes/ui/gl_bank_ui.inc:150
+#: ../gl/includes/ui/gl_bank_ui.inc:153
+#: ../gl/includes/ui/gl_bank_ui.inc:156
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:124
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:127
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:130
+#: ../gl/includes/ui/gl_journal_ui.inc:86
+#: ../gl/includes/ui/gl_journal_ui.inc:89
+#: ../gl/includes/ui/gl_journal_ui.inc:92
+#: ../reporting/rep701.php:109
 msgid "Account Code"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/view/gl_deposit_view.php:99
-#: /var/www/fa_unstable/devel/../gl/view/gl_deposit_view.php:102
-#: /var/www/fa_unstable/devel/../gl/view/gl_deposit_view.php:105
-#: /var/www/fa_unstable/devel/../gl/view/gl_payment_view.php:98
-#: /var/www/fa_unstable/devel/../gl/view/gl_payment_view.php:101
-#: /var/www/fa_unstable/devel/../gl/view/gl_payment_view.php:104
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:124
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:127
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:130
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:83
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:86
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:89
+#: ../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:150
+#: ../gl/includes/ui/gl_bank_ui.inc:153
+#: ../gl/includes/ui/gl_bank_ui.inc:156
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:124
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:127
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:130
+#: ../gl/includes/ui/gl_journal_ui.inc:86
+#: ../gl/includes/ui/gl_journal_ui.inc:89
+#: ../gl/includes/ui/gl_journal_ui.inc:92
 msgid "Account Description"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/view/gl_payment_view.php:17
+#: ../gl/view/gl_payment_view.php:17
 msgid "View Bank Payment"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/view/gl_payment_view.php:46
+#: ../gl/view/gl_payment_view.php:46
 msgid "GL Payment"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/view/gl_payment_view.php:69
+#: ../gl/view/gl_payment_view.php:69
 msgid "Pay To"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/view/gl_payment_view.php:70
-#: /var/www/fa_unstable/devel/../purchasing/view/view_supp_payment.php:61
-#: /var/www/fa_unstable/devel/../sales/view/view_receipt.php:48
+#: ../gl/view/gl_payment_view.php:70
+#: ../purchasing/view/view_supp_payment.php:64
+#: ../purchasing/view/view_supp_payment.php:78
+#: ../sales/view/view_receipt.php:48
 msgid "Payment Type"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/view/gl_payment_view.php:79
-#: /var/www/fa_unstable/devel/../purchasing/view/view_supp_payment.php:76
+#: ../gl/view/gl_payment_view.php:79
+#: ../purchasing/view/view_supp_payment.php:85
 msgid "This payment has been voided."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/view/gl_payment_view.php:85
+#: ../gl/view/gl_payment_view.php:85
 msgid "There are no items for this payment."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/view/gl_payment_view.php:90
+#: ../gl/view/gl_payment_view.php:90
 msgid "Items for this Payment"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/view/gl_trans_view.php:16
-#: /var/www/fa_unstable/devel/../gl/view/gl_trans_view.php:35
+#: ../gl/view/gl_trans_view.php:16
+#: ../gl/view/gl_trans_view.php:35
 msgid "General Ledger Transaction Details"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/view/gl_trans_view.php:54
+#: ../gl/view/gl_trans_view.php:39
+#: ../gl/includes/ui/gl_journal_ui.inc:97
+msgid "Counterparty"
+msgstr ""
+
+#: ../gl/view/gl_trans_view.php:59
 msgid "No general ledger transactions have been created for"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/view/gl_trans_view.php:54
+#: ../gl/view/gl_trans_view.php:59
 msgid "number"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/view/gl_trans_view.php:118
+#: ../gl/view/gl_trans_view.php:129
 msgid "This transaction has been voided."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/includes/db/gl_db_banking.inc:44
-#: /var/www/fa_unstable/devel/../gl/includes/db/gl_db_banking.inc:47
+#: ../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
 msgid "Exchange Variance"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/includes/db/gl_db_banking.inc:99
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:79
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:86
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:98
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:105
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:111
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:117
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:152
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:158
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:207
+#: ../gl/includes/db/gl_db_banking.inc:211
+#: ../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:220
 msgid "To"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:25
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:27
-#: /var/www/fa_unstable/devel/../inventory/includes/item_adjustments_ui.inc:39
-#: /var/www/fa_unstable/devel/../inventory/includes/stock_transfers_ui.inc:42
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_add_finished.php:201
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_costs.php:142
-#: /var/www/fa_unstable/devel/../purchasing/allocations/supplier_allocate.php:54
-#: /var/www/fa_unstable/devel/../sales/allocations/customer_allocate.php:53
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_credit_ui.inc:121
+#: ../gl/includes/db/gl_db_banking.inc:427
+#: ../purchasing/includes/db/invoice_db.inc:136
+msgid "Document reentered."
+msgstr ""
+
+#: ../gl/includes/db/gl_db_rates.inc:130
+#, php-format
+msgid ""
+"Cannot retrieve currency rate from %s page. Please set the rate manually."
+msgstr ""
+
+#: ../gl/includes/ui/gl_bank_ui.inc:24
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:28
+#: ../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:133
+#: ../purchasing/allocations/supplier_allocate.php:54
+#: ../sales/allocations/customer_allocate.php:53
+#: ../sales/includes/ui/sales_credit_ui.inc:121
 msgid "Date:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:50
+#: ../gl/includes/ui/gl_bank_ui.inc:51
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:53
 msgid "Pay To:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:55
+#: ../gl/includes/ui/gl_bank_ui.inc:56
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:58
 msgid "To the Order of:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:62
-#: /var/www/fa_unstable/devel/../inventory/purchasing_data.php:182
-#: /var/www/fa_unstable/devel/../inventory/purchasing_data.php:186
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:73
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:80
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:108
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:113
+#: ../gl/includes/ui/gl_bank_ui.inc:63
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:65
+#: ../inventory/purchasing_data.php:184
+#: ../inventory/purchasing_data.php:188
+#: ../inventory/purchasing_data.php.orig:112
+#: ../purchasing/includes/ui/invoice_ui.inc:80
+#: ../purchasing/includes/ui/invoice_ui.inc:88
+#: ../purchasing/includes/ui/invoice_ui.inc:90
+#: ../purchasing/includes/ui/po_ui.inc:125
+#: ../purchasing/includes/ui/po_ui.inc:130
 msgid "Supplier:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:65
-#: /var/www/fa_unstable/devel/../sales/manage/recurrent_invoices.php:151
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_credit_ui.inc:29
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:284
+#: ../gl/includes/ui/gl_bank_ui.inc:66
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:68
+#: ../sales/manage/recurrent_invoices.php:169
+#: ../sales/includes/ui/sales_credit_ui.inc:29
+#: ../sales/includes/ui/sales_order_ui.inc:278
+#: ../sales/includes/ui/sales_order_ui.inc.orig:278
 msgid "Customer:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:69
-#: /var/www/fa_unstable/devel/../sales/customer_payments.php:239
-#: /var/www/fa_unstable/devel/../sales/manage/recurrent_invoices.php:154
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_credit_ui.inc:37
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:291
+#: ../gl/includes/ui/gl_bank_ui.inc:70
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:72
+#: ../sales/customer_payments.php:360
+#: ../sales/manage/recurrent_invoices.php:172
+#: ../sales/includes/ui/sales_credit_ui.inc:37
+#: ../sales/includes/ui/sales_order_ui.inc:285
+#: ../sales/includes/ui/sales_order_ui.inc.orig:285
 msgid "Branch:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:87
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:58
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:62
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:230
+#: ../gl/includes/ui/gl_bank_ui.inc:84
+#: ../gl/includes/ui/gl_bank_ui.inc:87
+#: ../sales/customer_payments.php:369
+msgid "This customer account is on hold."
+msgstr ""
+
+#: ../gl/includes/ui/gl_bank_ui.inc:99
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:90
+#: ../gl/includes/ui/gl_journal_ui.inc:58
+#: ../gl/includes/ui/gl_journal_ui.inc:62
+#: ../purchasing/includes/ui/invoice_ui.inc:251
 msgid "Go"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:159
-#: /var/www/fa_unstable/devel/../includes/ui/simple_crud_class.inc:52
-#: /var/www/fa_unstable/devel/../inventory/includes/item_adjustments_ui.inc:88
-#: /var/www/fa_unstable/devel/../inventory/includes/stock_transfers_ui.inc:80
-#: /var/www/fa_unstable/devel/../manufacturing/includes/work_order_issue_ui.inc:59
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:510
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:241
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_credit_ui.inc:198
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:209
+#: ../gl/includes/ui/gl_bank_ui.inc:185
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:159
+#: ../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:542
+#: ../purchasing/includes/ui/po_ui.inc:274
+#: ../sales/includes/ui/sales_credit_ui.inc:198
+#: ../sales/includes/ui/sales_order_ui.inc:203
+#: ../sales/includes/ui/sales_order_ui.inc.orig:203
 msgid "Edit document line"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:161
-#: /var/www/fa_unstable/devel/../includes/ui/simple_crud_class.inc:54
-#: /var/www/fa_unstable/devel/../inventory/includes/item_adjustments_ui.inc:90
-#: /var/www/fa_unstable/devel/../inventory/includes/stock_transfers_ui.inc:82
-#: /var/www/fa_unstable/devel/../manufacturing/includes/work_order_issue_ui.inc:61
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:284
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:243
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_credit_ui.inc:200
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:211
+#: ../gl/includes/ui/gl_bank_ui.inc:187
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:161
+#: ../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:305
+#: ../purchasing/includes/ui/po_ui.inc:276
+#: ../sales/includes/ui/sales_credit_ui.inc:200
+#: ../sales/includes/ui/sales_order_ui.inc:205
+#: ../sales/includes/ui/sales_order_ui.inc.orig:205
 msgid "Remove line from document"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:250
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:222
-#: /var/www/fa_unstable/devel/../includes/ui/simple_crud_class.inc:56
-#: /var/www/fa_unstable/devel/../inventory/includes/item_adjustments_ui.inc:158
-#: /var/www/fa_unstable/devel/../inventory/includes/stock_transfers_ui.inc:138
-#: /var/www/fa_unstable/devel/../manufacturing/includes/work_order_issue_ui.inc:128
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:409
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_credit_ui.inc:291
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:552
+#: ../gl/includes/ui/gl_bank_ui.inc:276
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:250
+#: ../gl/includes/ui/gl_journal_ui.inc:258
+#: ../includes/ui/simple_crud_class.inc:56
+#: ../inventory/includes/item_adjustments_ui.inc:158
+#: ../inventory/includes/stock_transfers_ui.inc:138
+#: ../manufacturing/includes/work_order_issue_ui.inc:132
+#: ../purchasing/includes/ui/po_ui.inc:458
+#: ../sales/includes/ui/sales_credit_ui.inc:294
+#: ../sales/includes/ui/sales_order_ui.inc:556
+#: ../sales/includes/ui/sales_order_ui.inc.orig:556
 msgid "Confirm changes"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:252
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:224
-#: /var/www/fa_unstable/devel/../includes/ui/simple_crud_class.inc:58
-#: /var/www/fa_unstable/devel/../inventory/includes/item_adjustments_ui.inc:160
-#: /var/www/fa_unstable/devel/../inventory/includes/stock_transfers_ui.inc:140
-#: /var/www/fa_unstable/devel/../manufacturing/includes/work_order_issue_ui.inc:130
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:411
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_credit_ui.inc:293
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:554
+#: ../gl/includes/ui/gl_bank_ui.inc:278
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:252
+#: ../gl/includes/ui/gl_journal_ui.inc:260
+#: ../includes/ui/simple_crud_class.inc:58
+#: ../inventory/includes/item_adjustments_ui.inc:160
+#: ../inventory/includes/stock_transfers_ui.inc:140
+#: ../manufacturing/includes/work_order_issue_ui.inc:134
+#: ../purchasing/includes/ui/po_ui.inc:460
+#: ../sales/includes/ui/sales_credit_ui.inc:296
+#: ../sales/includes/ui/sales_order_ui.inc:558
+#: ../sales/includes/ui/sales_order_ui.inc.orig:558
 msgid "Cancel changes"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:257
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:228
-#: /var/www/fa_unstable/devel/../inventory/includes/item_adjustments_ui.inc:166
-#: /var/www/fa_unstable/devel/../inventory/includes/stock_transfers_ui.inc:146
-#: /var/www/fa_unstable/devel/../manufacturing/includes/work_order_issue_ui.inc:136
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:417
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_credit_ui.inc:299
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:560
+#: ../gl/includes/ui/gl_bank_ui.inc:283
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:257
+#: ../gl/includes/ui/gl_journal_ui.inc:264
+#: ../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:466
+#: ../sales/includes/ui/sales_credit_ui.inc:302
+#: ../sales/includes/ui/sales_order_ui.inc:564
+#: ../sales/includes/ui/sales_order_ui.inc.orig:564
 msgid "Add Item"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_bank_ui.inc:258
-#: /var/www/fa_unstable/devel/../inventory/includes/item_adjustments_ui.inc:167
-#: /var/www/fa_unstable/devel/../inventory/includes/stock_transfers_ui.inc:147
-#: /var/www/fa_unstable/devel/../manufacturing/includes/work_order_issue_ui.inc:137
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:418
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_credit_ui.inc:300
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:561
+#: ../gl/includes/ui/gl_bank_ui.inc:284
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:258
+#: ../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:467
+#: ../sales/includes/ui/sales_credit_ui.inc:303
+#: ../sales/includes/ui/sales_order_ui.inc:565
+#: ../sales/includes/ui/sales_order_ui.inc.orig:565
 msgid "Add new item to document"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:38
+#: ../gl/includes/ui/gl_journal_ui.inc:38
 msgid "Reverse Transaction:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:46
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:72
+#: ../gl/includes/ui/gl_journal_ui.inc:46
+#: ../includes/sysnames.inc:98
 msgid "Quick Entry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:57
+#: ../gl/includes/ui/gl_journal_ui.inc:57
 msgid "balance from account"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:123
+#: ../gl/includes/ui/gl_journal_ui.inc:135
 msgid "Edit journal line"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:125
+#: ../gl/includes/ui/gl_journal_ui.inc:137
 msgid "Remove line from journal"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../gl/includes/ui/gl_journal_ui.inc:229
+#: ../gl/includes/ui/gl_journal_ui.inc:200
+#: ../gl/includes/ui/gl_journal_ui.inc:232
+msgid "[Select account]"
+msgstr ""
+
+#: ../gl/includes/ui/gl_journal_ui.inc:265
 msgid "Add new line to journal"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:56
+#: ../includes/access_levels.inc:56
 msgid "System administration"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:57
+#: ../includes/access_levels.inc:57
 msgid "Company setup"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:58
+#: ../includes/access_levels.inc:58
 msgid "Special maintenance"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:59
+#: ../includes/access_levels.inc:59
 msgid "Sales configuration"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:60
+#: ../includes/access_levels.inc:60
 msgid "Sales transactions"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:61
+#: ../includes/access_levels.inc:61
 msgid "Sales related reports"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:62
+#: ../includes/access_levels.inc:62
 msgid "Purchase configuration"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:63
+#: ../includes/access_levels.inc:63
 msgid "Purchase transactions"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:64
+#: ../includes/access_levels.inc:64
 msgid "Purchase analytics"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:65
+#: ../includes/access_levels.inc:65
 msgid "Inventory configuration"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:66
+#: ../includes/access_levels.inc:66
 msgid "Inventory operations"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:67
+#: ../includes/access_levels.inc:67
 msgid "Inventory analytics"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:68
+#: ../includes/access_levels.inc:68
 msgid "Manufacturing configuration"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:69
-msgid "Manufacturing transations"
+#: ../includes/access_levels.inc:69
+msgid "Manufacturing transactions"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:70
+#: ../includes/access_levels.inc:70
 msgid "Manufacturing analytics"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:71
+#: ../includes/access_levels.inc:71
 msgid "Dimensions configuration"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:72
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:350
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:210
+#: ../includes/access_levels.inc:72
+#: ../inventory/manage/items.php:348
+#: ../inventory/manage/items.php.orig:341
+#: ../reporting/reports_main.php:223
 msgid "Dimensions"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:73
+#: ../includes/access_levels.inc:73
 msgid "Banking & GL configuration"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:74
+#: ../includes/access_levels.inc:74
 msgid "Banking & GL transactions"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:75
+#: ../includes/access_levels.inc:75
 msgid "Banking & GL analytics"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:93
+#: ../includes/access_levels.inc:93
 msgid "Install/update companies"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:94
+#: ../includes/access_levels.inc:94
 msgid "Install/update languages"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:95
+#: ../includes/access_levels.inc:95
 msgid "Install/upgrade modules"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:96
+#: ../includes/access_levels.inc:96
 msgid "Software upgrades"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:100
+#: ../includes/access_levels.inc:100
 msgid "Company parameters"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:101
+#: ../includes/access_levels.inc:101
 msgid "Access levels edition"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:102
+#: ../includes/access_levels.inc:102
 msgid "Users setup"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:103
+#: ../includes/access_levels.inc:103
 msgid "Point of sales definitions"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:104
+#: ../includes/access_levels.inc:104
 msgid "Printers configuration"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:105
+#: ../includes/access_levels.inc:105
 msgid "Print profiles"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:106
+#: ../includes/access_levels.inc:106
 msgid "Payment terms"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:107
+#: ../includes/access_levels.inc:107
 msgid "Shipping ways"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:108
+#: ../includes/access_levels.inc:108
 msgid "Credit status definitions changes"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:109
+#: ../includes/access_levels.inc:109
 msgid "Inventory locations changes"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:110
+#: ../includes/access_levels.inc:110
 msgid "Inventory movement types"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:111
+#: ../includes/access_levels.inc:111
 msgid "Manufacture work centres"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:112
+#: ../includes/access_levels.inc:112
 msgid "Forms setup"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:113
+#: ../includes/access_levels.inc:113
 msgid "Contact categories"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:117
+#: ../includes/access_levels.inc:117
 msgid "Voiding transactions"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:118
+#: ../includes/access_levels.inc:118
 msgid "Database backup/restore"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:119
+#: ../includes/access_levels.inc:119
 msgid "Common view/print transactions interface"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:120
+#: ../includes/access_levels.inc:120
 msgid "Attaching documents"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:121
+#: ../includes/access_levels.inc:121
 msgid "Display preferences"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:122
+#: ../includes/access_levels.inc:122
 msgid "Password changes"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:127
+#: ../includes/access_levels.inc:127
 msgid "Sales types"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:128
+#: ../includes/access_levels.inc:128
 msgid "Sales prices edition"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:129
+#: ../includes/access_levels.inc:129
 msgid "Sales staff maintenance"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:130
+#: ../includes/access_levels.inc:130
 msgid "Sales areas maintenance"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:131
+#: ../includes/access_levels.inc:131
 msgid "Sales groups changes"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:132
+#: ../includes/access_levels.inc:132
 msgid "Sales templates"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:133
+#: ../includes/access_levels.inc:133
 msgid "Recurrent invoices definitions"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:135
+#: ../includes/access_levels.inc:135
 msgid "Sales transactions view"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:136
+#: ../includes/access_levels.inc:136
 msgid "Sales customer and branches changes"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:137
+#: ../includes/access_levels.inc:137
 msgid "Sales quotations"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:138
+#: ../includes/access_levels.inc:138
 msgid "Sales orders edition"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:139
+#: ../includes/access_levels.inc:139
 msgid "Sales deliveries edition"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:140
+#: ../includes/access_levels.inc:140
 msgid "Sales invoices edition"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:141
+#: ../includes/access_levels.inc:141
 msgid "Sales credit notes against invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:142
+#: ../includes/access_levels.inc:142
 msgid "Sales freehand credit notes"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:143
+#: ../includes/access_levels.inc:143
 msgid "Customer payments entry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:144
+#: ../includes/access_levels.inc:144
 msgid "Customer payments allocation"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:146
+#: ../includes/access_levels.inc:146
 msgid "Sales analytical reports"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:147
+#: ../includes/access_levels.inc:147
 msgid "Sales document bulk reports"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:148
+#: ../includes/access_levels.inc:148
 msgid "Sales prices listing"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:149
+#: ../includes/access_levels.inc:149
 msgid "Sales staff listing"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:150
+#: ../includes/access_levels.inc:150
 msgid "Customer bulk listing"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:151
+#: ../includes/access_levels.inc:151
 msgid "Customer status report"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:152
+#: ../includes/access_levels.inc:152
 msgid "Customer payments report"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:157
+#: ../includes/access_levels.inc:157
 msgid "Purchase price changes"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:159
+#: ../includes/access_levels.inc:159
 msgid "Supplier transactions view"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:160
+#: ../includes/access_levels.inc:160
 msgid "Suppliers changes"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:161
+#: ../includes/access_levels.inc:161
 msgid "Purchase order entry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:162
+#: ../includes/access_levels.inc:162
 msgid "Purchase receive"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:163
+#: ../includes/access_levels.inc:163
 msgid "Supplier invoices"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:164
+#: ../includes/access_levels.inc:164
 msgid "Deleting GRN items during invoice entry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:165
+#: ../includes/access_levels.inc:165
 msgid "Supplier credit notes"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:166
+#: ../includes/access_levels.inc:166
 msgid "Supplier payments"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:167
+#: ../includes/access_levels.inc:167
 msgid "Supplier payments allocations"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:169
+#: ../includes/access_levels.inc:169
 msgid "Supplier analytical reports"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:170
+#: ../includes/access_levels.inc:170
 msgid "Supplier document bulk reports"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:171
+#: ../includes/access_levels.inc:171
 msgid "Supplier payments report"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:175
+#: ../includes/access_levels.inc:175
 msgid "Stock items add/edit"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:176
+#: ../includes/access_levels.inc:176
 msgid "Sales kits"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:177
+#: ../includes/access_levels.inc:177
 msgid "Item categories"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:178
+#: ../includes/access_levels.inc:178
 msgid "Units of measure"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:180
+#: ../includes/access_levels.inc:180
 msgid "Stock status view"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:181
+#: ../includes/access_levels.inc:181
 msgid "Stock transactions view"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:182
+#: ../includes/access_levels.inc:182
 msgid "Foreign item codes entry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:183
+#: ../includes/access_levels.inc:183
 msgid "Inventory location transfers"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:184
+#: ../includes/access_levels.inc:184
 msgid "Inventory adjustments"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:186
+#: ../includes/access_levels.inc:186
 msgid "Reorder levels"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:187
+#: ../includes/access_levels.inc:187
 msgid "Items analytical reports and inquiries"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:188
+#: ../includes/access_levels.inc:188
 msgid "Inventory valuation report"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:193
+#: ../includes/access_levels.inc:193
 msgid "Bill of Materials"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:195
+#: ../includes/access_levels.inc:195
 msgid "Manufacturing operations view"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:196
+#: ../includes/access_levels.inc:196
 msgid "Work order entry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:197
+#: ../includes/access_levels.inc:197
 msgid "Material issues entry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:198
+#: ../includes/access_levels.inc:198
 msgid "Final product receive"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:199
+#: ../includes/access_levels.inc:199
 msgid "Work order releases"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:201
+#: ../includes/access_levels.inc:201
 msgid "Work order analytical reports and inquiries"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:202
+#: ../includes/access_levels.inc:202
 msgid "Manufacturing cost inquiry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:203
+#: ../includes/access_levels.inc:203
 msgid "Work order bulk reports"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:204
+#: ../includes/access_levels.inc:204
 msgid "Bill of materials reports"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:208
+#: ../includes/access_levels.inc:208
 msgid "Dimension tags"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:210
+#: ../includes/access_levels.inc:210
 msgid "Dimension view"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:212
+#: ../includes/access_levels.inc:212
 msgid "Dimension entry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:214
+#: ../includes/access_levels.inc:214
 msgid "Dimension reports"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:218
+#: ../includes/access_levels.inc:218
 msgid "Item tax type definitions"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:219
+#: ../includes/access_levels.inc:219
 msgid "GL accounts edition"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:220
+#: ../includes/access_levels.inc:220
 msgid "GL account groups"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:221
+#: ../includes/access_levels.inc:221
 msgid "GL account classes"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:222
+#: ../includes/access_levels.inc:222
 msgid "Quick GL entry definitions"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:224
+#: ../includes/access_levels.inc:224
 msgid "Bank accounts"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:225
+#: ../includes/access_levels.inc:225
 msgid "Tax rates"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:226
+#: ../includes/access_levels.inc:226
 msgid "Tax groups"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:227
+#: ../includes/access_levels.inc:227
 msgid "Fiscal years maintenance"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:228
+#: ../includes/access_levels.inc:228
 msgid "Company GL setup"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:229
+#: ../includes/access_levels.inc:229
 msgid "GL Account tags"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:230
+#: ../includes/access_levels.inc:230
+msgid "Closing GL transactions"
+msgstr ""
+
+#: ../includes/access_levels.inc:231
+msgid "Reopening GL transactions"
+msgstr ""
+
+#: ../includes/access_levels.inc:232
 msgid "Allow entry on non closed Fiscal years"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:232
+#: ../includes/access_levels.inc:234
 msgid "Bank transactions view"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:233
+#: ../includes/access_levels.inc:235
 msgid "GL postings view"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:234
+#: ../includes/access_levels.inc:236
 msgid "Exchange rate table changes"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:235
+#: ../includes/access_levels.inc:237
 msgid "Bank payments"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:236
+#: ../includes/access_levels.inc:238
 msgid "Bank deposits"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:237
+#: ../includes/access_levels.inc:239
 msgid "Bank account transfers"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:238
+#: ../includes/access_levels.inc:240
 msgid "Bank reconciliation"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:239
+#: ../includes/access_levels.inc:241
 msgid "Manual journal entries"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:240
+#: ../includes/access_levels.inc:242
 msgid "Journal entries to bank related accounts"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:241
+#: ../includes/access_levels.inc:243
 msgid "Budget edition"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:242
+#: ../includes/access_levels.inc:244
 msgid "Item standard costs"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:245
+#: ../includes/access_levels.inc:247
 msgid "GL analytical reports and inquiries"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:246
+#: ../includes/access_levels.inc:248
 msgid "Tax reports and inquiries"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:247
+#: ../includes/access_levels.inc:249
 msgid "Bank reports and inquiries"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/access_levels.inc:248
+#: ../includes/access_levels.inc:250
 msgid "GL reports and inquiries"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/banking.inc:100
+#: ../includes/banking.inc:100
 #, php-format
 msgid ""
 "Cannot retrieve exchange rate for currency %s as of %s. Please add exchange "
 "rate manually on Exchange Rates page."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/current_user.inc:75
+#: ../includes/current_user.inc:88
 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 ""
 
-#: /var/www/fa_unstable/devel/../includes/current_user.inc:76
-#: /var/www/fa_unstable/devel/../includes/ui/ui_controls.inc:173
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:843
+#: ../includes/current_user.inc:89
+#: ../includes/ui/ui_controls.inc:197
+#: ../includes/ui/ui_view.inc:844
+#: ../includes/ui/ui_view.inc.orig:843
 msgid "Back"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/current_user.inc:86
+#: ../includes/current_user.inc:99
 msgid "System is available for site admin only until full database upgrade"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/current_user.inc:437
+#: ../includes/current_user.inc:462
 msgid "Requesting data..."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/errors.inc:71
+#: ../includes/data_checks.inc:495
+#, php-format
+msgid "%s #%s is closed for further edition."
+msgstr ""
+
+#: ../includes/errors.inc:123
 msgid "in file"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/errors.inc:71
+#: ../includes/errors.inc:123
 msgid "at line "
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/errors.inc:118
+#: ../includes/errors.inc:177
 msgid "Debug mode database warning:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/errors.inc:120
+#: ../includes/errors.inc:179
 msgid "DATABASE ERROR :"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/errors.inc:149
+#: ../includes/errors.inc:210
 msgid ""
 "The entered information is a duplicate. Please go back and enter different "
 "values."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/main.inc:42
+#: ../includes/main.inc:44
 msgid "This page is usable only with javascript enabled browsers."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/packages.inc:304
+#: ../includes/packages.inc:190
+#, php-format
+msgid "No key field '%s' in file '%s'"
+msgstr ""
+
+#: ../includes/packages.inc:295
+#: ../includes/packages.inc:329
+#, php-format
+msgid "Cannot delete outdated '%s' file."
+msgstr ""
+
+#: ../includes/packages.inc:299
 msgid "Release file in repository is invalid, or public key is outdated."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/packages.inc:320
+#: ../includes/packages.inc:316
 msgid "Repository version does not match application version."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/packages.inc:334
+#: ../includes/packages.inc:333
 #, php-format
 msgid ""
 "Security alert: broken index file in repository '%s'. Please inform "
 "repository administrator about this issue."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/packages.inc:367
+#: ../includes/packages.inc:366
 #, php-format
 msgid ""
 "Security alert: broken package '%s' in repository. Please inform repository "
 "administrator about this issue."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/packages.inc:599
-#: /var/www/fa_unstable/devel/../includes/packages.inc:645
+#: ../includes/packages.inc:621
+#: ../includes/packages.inc:672
 #, php-format
 msgid "Package '%s' not found."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/session.inc:39
+#: ../includes/session.inc:133
 msgid "Incorrect Password"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/session.inc:40
+#: ../includes/session.inc:134
 msgid "The user and password combination is not valid for the system."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/session.inc:42
+#: ../includes/session.inc:136
 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 ""
 
-#: /var/www/fa_unstable/devel/../includes/session.inc:43
+#: ../includes/session.inc:137
 msgid "Try again"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/session.inc:62
+#: ../includes/session.inc:156
 msgid "Security settings have not been defined for your user account."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/session.inc:63
+#: ../includes/session.inc:157
 msgid "Please contact your system administrator."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/session.inc:64
+#: ../includes/session.inc:158
 msgid ""
 "Please remove $security_groups and $security_headings arrays from config.php "
 "file!"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/session.inc:66
+#: ../includes/session.inc:160
 msgid ""
 "Access to application has been blocked until database upgrade is completed "
 "by system administrator."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/session.inc:80
+#: ../includes/session.inc:174
 msgid ""
 "The security settings on your account do not permit you to access this "
 "function"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/session.inc:89
+#: ../includes/session.inc:183
 msgid ""
 "System is blocked after source upgrade until database is updated on System/"
 "Software Upgrade page"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:23
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:122
+#: ../includes/sysnames.inc:23
+#: ../includes/sysnames.inc:149
 msgid "Bank Payment"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:24
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:121
+#: ../includes/sysnames.inc:24
+#: ../includes/sysnames.inc:148
 msgid "Bank Deposit"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:25
+#: ../includes/sysnames.inc:25
 msgid "Funds Transfer"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:26
+#: ../includes/sysnames.inc:26
 msgid "Sales Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:27
-#: /var/www/fa_unstable/devel/../sales/credit_note_entry.php:37
+#: ../includes/sysnames.inc:27
+#: ../sales/credit_note_entry.php:37
 msgid "Customer Credit Note"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:28
+#: ../includes/sysnames.inc:28
 msgid "Customer Payment"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:29
+#: ../includes/sysnames.inc:29
 msgid "Delivery Note"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:30
+#: ../includes/sysnames.inc:30
 msgid "Location Transfer"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:31
+#: ../includes/sysnames.inc:31
 msgid "Inventory Adjustment"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:32
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:297
-#: /var/www/fa_unstable/devel/../purchasing/view/view_po.php:30
+#: ../includes/sysnames.inc:32
+#: ../purchasing/includes/ui/po_ui.inc:330
+#: ../purchasing/view/view_po.php:30
 msgid "Purchase Order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:33
+#: ../includes/sysnames.inc:33
 msgid "Supplier Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:34
-#: /var/www/fa_unstable/devel/../purchasing/supplier_credit.php:28
+#: ../includes/sysnames.inc:34
+#: ../purchasing/supplier_credit.php:58
 msgid "Supplier Credit Note"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:35
+#: ../includes/sysnames.inc:35
 msgid "Supplier Payment"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:36
-#: /var/www/fa_unstable/devel/../purchasing/view/view_grn.php:33
+#: ../includes/sysnames.inc:36
+#: ../purchasing/view/view_grn.php:33
 msgid "Purchase Order Delivery"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:37
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:69
+#: ../includes/sysnames.inc:37
+#: ../includes/sysnames.inc:95
 msgid "Work Order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:38
+#: ../includes/sysnames.inc:38
 msgid "Work Order Issue"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:39
+#: ../includes/sysnames.inc:39
 msgid "Work Order Production"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:40
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:134
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:156
+#: ../includes/sysnames.inc:40
+#: ../sales/inquiry/sales_orders_view.php:151
+#: ../sales/inquiry/sales_orders_view.php:173
+#: ../sales/inquiry/sales_orders_view.php.orig:138
+#: ../sales/inquiry/sales_orders_view.php.orig:160
 msgid "Sales Order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:41
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:590
+#: ../includes/sysnames.inc:41
+#: ../sales/sales_order_entry.php:625
 msgid "Sales Quotation"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:42
+#: ../includes/sysnames.inc:42
 msgid "Cost Update"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:50
+#: ../includes/sysnames.inc:47
+msgid "GJ"
+msgstr ""
+
+#: ../includes/sysnames.inc:48
+msgid "BP"
+msgstr ""
+
+#: ../includes/sysnames.inc:49
+msgid "BD"
+msgstr ""
+
+#: ../includes/sysnames.inc:50
+msgid "BT"
+msgstr ""
+
+#: ../includes/sysnames.inc:51
+msgid "SI"
+msgstr ""
+
+#: ../includes/sysnames.inc:52
+msgid "CN"
+msgstr ""
+
+#: ../includes/sysnames.inc:53
+msgid "CP"
+msgstr ""
+
+#: ../includes/sysnames.inc:54
+#: ../sales/customer_invoice.php:545
+msgid "DN"
+msgstr ""
+
+#: ../includes/sysnames.inc:55
+msgid "IT"
+msgstr ""
+
+#: ../includes/sysnames.inc:56
+msgid "IA"
+msgstr ""
+
+#: ../includes/sysnames.inc:57
+msgid "PO"
+msgstr ""
+
+#: ../includes/sysnames.inc:58
+msgid "PI"
+msgstr ""
+
+#: ../includes/sysnames.inc:59
+msgid "PC"
+msgstr ""
+
+#: ../includes/sysnames.inc:60
+msgid "SP"
+msgstr ""
+
+#: ../includes/sysnames.inc:61
+#: ../reporting/rep204.php:82
+#: ../reporting/rep305.php:95
+msgid "GRN"
+msgstr ""
+
+#: ../includes/sysnames.inc:62
+msgid "WO"
+msgstr ""
+
+#: ../includes/sysnames.inc:63
+msgid "WI"
+msgstr ""
+
+#: ../includes/sysnames.inc:64
+msgid "WP"
+msgstr ""
+
+#: ../includes/sysnames.inc:65
+msgid "SO"
+msgstr ""
+
+#: ../includes/sysnames.inc:66
+msgid "SQ"
+msgstr ""
+
+#: ../includes/sysnames.inc:67
+msgid "CU"
+msgstr ""
+
+#: ../includes/sysnames.inc:68
+msgid "Dim"
+msgstr ""
+
+#: ../includes/sysnames.inc:76
 msgid "Savings Account"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:51
+#: ../includes/sysnames.inc:77
 msgid "Chequing Account"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:52
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_costs.php:151
+#: ../includes/sysnames.inc:78
+#: ../manufacturing/work_order_costs.php:145
 msgid "Credit Account"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:53
+#: ../includes/sysnames.inc:79
 msgid "Cash Account"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:57
+#: ../includes/sysnames.inc:83
 msgid "Transfer"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:58
+#: ../includes/sysnames.inc:84
 msgid "Cheque"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:60
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:154
+#: ../includes/sysnames.inc:86
+#: ../includes/sysnames.inc:181
 msgid "Cash"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:70
-#: /var/www/fa_unstable/devel/../reporting/rep101.php:137
-#: /var/www/fa_unstable/devel/../reporting/rep102.php:115
-#: /var/www/fa_unstable/devel/../reporting/rep102.php:122
-#: /var/www/fa_unstable/devel/../reporting/rep105.php:107
-#: /var/www/fa_unstable/devel/../reporting/rep106.php:81
-#: /var/www/fa_unstable/devel/../reporting/rep304.php:114
-#: /var/www/fa_unstable/devel/../reporting/rep304.php:124
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:29
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:33
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:40
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:91
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:190
-#: /var/www/fa_unstable/devel/../sales/create_recurrent_invoices.php:98
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:246
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:336
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:369
-#: /var/www/fa_unstable/devel/../sales/allocations/customer_allocation_main.php:97
-#: /var/www/fa_unstable/devel/../sales/allocations/customer_allocation_main.php:105
-#: /var/www/fa_unstable/devel/../sales/manage/recurrent_invoices.php:85
-#: /var/www/fa_unstable/devel/../sales/view/view_credit.php:47
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_allocation_inquiry.php:147
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_allocation_inquiry.php:157
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_inquiry.php:218
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_inquiry.php:232
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_deliveries_view.php:175
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:255
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:269
+#: ../includes/sysnames.inc:96
+#: ../includes/sysnames.inc:195
+#: ../reporting/rep101.php:137
+#: ../reporting/rep102.php:123
+#: ../reporting/rep102.php:130
+#: ../reporting/rep105.php:107
+#: ../reporting/rep106.php:81
+#: ../reporting/rep114.php:93
+#: ../reporting/rep304.php:112
+#: ../reporting/rep304.php:122
+#: ../reporting/reports_main.php:32
+#: ../reporting/reports_main.php:36
+#: ../reporting/reports_main.php:43
+#: ../reporting/reports_main.php:108
+#: ../reporting/reports_main.php:203
+#: ../sales/create_recurrent_invoices.php:115
+#: ../sales/customer_credit_invoice.php:237
+#: ../sales/customer_delivery.php:346
+#: ../sales/customer_invoice.php:444
+#: ../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:150
+#: ../sales/inquiry/customer_allocation_inquiry.php:160
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:150
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:160
+#: ../sales/inquiry/customer_inquiry.php:206
+#: ../sales/inquiry/customer_inquiry.php:220
+#: ../sales/inquiry/customer_inquiry.php.orig:230
+#: ../sales/inquiry/customer_inquiry.php.orig:244
+#: ../sales/inquiry/sales_deliveries_view.php:180
+#: ../sales/inquiry/sales_deliveries_view.php.orig:180
+#: ../sales/inquiry/sales_orders_view.php:286
+#: ../sales/inquiry/sales_orders_view.php:300
+#: ../sales/inquiry/sales_orders_view.php.orig:263
+#: ../sales/inquiry/sales_orders_view.php.orig:277
 msgid "Customer"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:71
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:146
-#: /var/www/fa_unstable/devel/../inventory/purchasing_data.php:127
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/grn_ui.inc:20
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:290
-#: /var/www/fa_unstable/devel/../purchasing/view/view_supp_credit.php:42
-#: /var/www/fa_unstable/devel/../purchasing/view/view_supp_invoice.php:45
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search_completed.php:113
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search.php:127
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_allocation_inquiry.php:128
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_allocation_inquiry.php:141
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_inquiry.php:165
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_inquiry.php:179
-#: /var/www/fa_unstable/devel/../purchasing/allocations/supplier_allocation_main.php:98
-#: /var/www/fa_unstable/devel/../purchasing/allocations/supplier_allocation_main.php:106
-#: /var/www/fa_unstable/devel/../reporting/rep201.php:125
-#: /var/www/fa_unstable/devel/../reporting/rep202.php:118
-#: /var/www/fa_unstable/devel/../reporting/rep202.php:125
-#: /var/www/fa_unstable/devel/../reporting/rep203.php:98
-#: /var/www/fa_unstable/devel/../reporting/rep204.php:88
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:121
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:125
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:132
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:141
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:147
+#: ../includes/sysnames.inc:97
+#: ../includes/sysnames.inc:173
+#: ../includes/sysnames.inc:196
+#: ../inventory/purchasing_data.php:129
+#: ../purchasing/includes/ui/grn_ui.inc:20
+#: ../purchasing/includes/ui/po_ui.inc:323
+#: ../purchasing/view/view_supp_credit.php:42
+#: ../purchasing/view/view_supp_invoice.php:46
+#: ../purchasing/inquiry/po_search_completed.php:122
+#: ../purchasing/inquiry/po_search_completed.php.orig:121
+#: ../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:176
+#: ../purchasing/inquiry/supplier_inquiry.php:191
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:173
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:188
+#: ../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 ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:79
+#: ../includes/sysnames.inc:105
 msgid "Assemble"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:80
+#: ../includes/sysnames.inc:106
 msgid "Unassemble"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:81
+#: ../includes/sysnames.inc:107
 msgid "Advanced Manufacture"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:85
+#: ../includes/sysnames.inc:111
 msgid "Labour Cost"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:86
+#: ../includes/sysnames.inc:112
 msgid "Overhead Cost"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:93
+#: ../includes/sysnames.inc:113
+msgid "Materials"
+msgstr ""
+
+#: ../includes/sysnames.inc:120
 msgid "Assets"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:95
+#: ../includes/sysnames.inc:122
 msgid "Equity"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:96
+#: ../includes/sysnames.inc:123
 msgid "Income"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:97
+#: ../includes/sysnames.inc:124
 msgid "Cost of Goods Sold"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:98
+#: ../includes/sysnames.inc:125
 msgid "Expense"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:105
+#: ../includes/sysnames.inc:132
 msgid "Remainder"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:107
+#: ../includes/sysnames.inc:134
 msgid "Amount, increase base"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:108
+#: ../includes/sysnames.inc:135
 msgid "Amount, reduce base"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:109
+#: ../includes/sysnames.inc:136
 msgid "% amount of base"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:110
+#: ../includes/sysnames.inc:137
 msgid "% amount of base, increase base"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:111
+#: ../includes/sysnames.inc:138
 msgid "% amount of base, reduce base"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:112
+#: ../includes/sysnames.inc:139
 msgid "Taxes added"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:113
+#: ../includes/sysnames.inc:140
 msgid "Taxes added, increase base"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:114
+#: ../includes/sysnames.inc:141
 msgid "Taxes added, reduce base"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:115
+#: ../includes/sysnames.inc:142
 msgid "Taxes included"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:116
+#: ../includes/sysnames.inc:143
 msgid "Taxes included, increase base"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:117
+#: ../includes/sysnames.inc:144
 msgid "Taxes included, reduce base"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:124
+#: ../includes/sysnames.inc:151
 msgid "Supplier Invoice/Credit"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:130
-#: /var/www/fa_unstable/devel/../manufacturing/search_work_orders.php:165
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:278
+#: ../includes/sysnames.inc:157
+#: ../manufacturing/search_work_orders.php:165
+#: ../manufacturing/includes/manufacturing_ui.inc:278
 msgid "Manufactured"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:131
+#: ../includes/sysnames.inc:158
 msgid "Purchased"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:132
+#: ../includes/sysnames.inc:159
 msgid "Service"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:145
+#: ../includes/sysnames.inc:172
 msgid "Customer branch"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:147
+#: ../includes/sysnames.inc:174
 msgid "Shipper"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:148
+#: ../includes/sysnames.inc:175
 msgid "Company internal"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:153
+#: ../includes/sysnames.inc:180
 msgid "Prepayment"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:155
+#: ../includes/sysnames.inc:182
 msgid "After No. of Days"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/sysnames.inc:156
+#: ../includes/sysnames.inc:183
 msgid "Day In Following Month"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:15
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:210
-#: /var/www/fa_unstable/devel/../reporting/rep705.php:250
-#: /var/www/fa_unstable/devel/../reporting/rep705.php:261
-#: /var/www/fa_unstable/devel/../reporting/rep705.php:270
+#: ../includes/sysnames.inc:187
+msgid "Sum per line taxes"
+msgstr ""
+
+#: ../includes/sysnames.inc:188
+msgid "Taxes from totals"
+msgstr ""
+
+#: ../includes/system_tests.inc:15
+#: ../includes/ui/ui_view.inc:210
+#: ../includes/ui/ui_view.inc.orig:210
+#: ../reporting/rep705.php:250
+#: ../reporting/rep705.php:261
+#: ../reporting/rep705.php:270
 msgid "Info"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:16
+#: ../includes/system_tests.inc:16
 msgid "Optional"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:17
+#: ../includes/system_tests.inc:17
 msgid "Recommended"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:18
+#: ../includes/system_tests.inc:18
 msgid "Required "
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:24
+#: ../includes/system_tests.inc:24
 msgid "MySQL version"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:28
+#: ../includes/system_tests.inc:28
 msgid "Upgrade MySQL server to version at least 4.1"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:35
+#: ../includes/system_tests.inc:35
 msgid "PHP MySQL extension"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:40
+#: ../includes/system_tests.inc:40
 msgid "Your PHP has to have MySQL extension enabled."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:46
+#: ../includes/system_tests.inc:46
 msgid "PHP version"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:50
+#: ../includes/system_tests.inc:50
 msgid "Upgrade PHP to version at least 4.3.3"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:57
+#: ../includes/system_tests.inc:57
 msgid "Server system"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:67
+#: ../includes/system_tests.inc:67
 msgid "Session save path"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:79
+#: ../includes/system_tests.inc:79
 msgid "Removed install wizard folder"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:82
+#: ../includes/system_tests.inc:82
 msgid "Not removed"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:83
+#: ../includes/system_tests.inc:83
 msgid "Remove or rename install wizard folder for security reasons."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:90
+#: ../includes/system_tests.inc:90
 msgid "Browser type"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:94
+#: ../includes/system_tests.inc:94
 msgid "Any browser is supported"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:101
+#: ../includes/system_tests.inc:101
 msgid "Http server type"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:105
+#: ../includes/system_tests.inc:105
 msgid "Any server is supported"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:112
+#: ../includes/system_tests.inc:112
 msgid "Native gettext"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:116
+#: ../includes/system_tests.inc:116
 msgid "In case of no gettext support, php emulation is used"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:124
+#: ../includes/system_tests.inc:124
 msgid "Debugging mode"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:128
+#: ../includes/system_tests.inc:128
 msgid "To switch debugging on set $go_debug>0 in config.php file"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:137
+#: ../includes/system_tests.inc:137
 msgid "Error logging"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:145
+#: ../includes/system_tests.inc:145
 msgid "Disabled"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:148
+#: ../includes/system_tests.inc:148
 msgid "To switch error logging set $error_logging in config.php file"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:151
+#: ../includes/system_tests.inc:151
 msgid "Log file is not writeable"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:161
+#: ../includes/system_tests.inc:161
 msgid "Current database version"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:165
+#: ../includes/system_tests.inc:165
 msgid "Database structure seems to be not upgraded to current version"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:180
+#: ../includes/system_tests.inc:180
 msgid "Company subdirectories consistency"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:193
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:200
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:208
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:225
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:340
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:349
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:358
+#: ../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
 #, php-format
 msgid "'%s' is not writeable"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:221
+#: ../includes/system_tests.inc:221
 msgid "Temporary directory"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:233
+#: ../includes/system_tests.inc:233
 msgid "Language configuration consistency"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:242
+#: ../includes/system_tests.inc:242
 msgid "Languages folder should be writeable."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:251
+#: ../includes/system_tests.inc:251
 msgid "Languages configuration file should be writeable."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:270
+#: ../includes/system_tests.inc:270
 #, php-format
 msgid "Missing %s translation file."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:275
+#: ../includes/system_tests.inc:275
 #, php-format
 msgid "Missing system locale: %s"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:288
+#: ../includes/system_tests.inc:288
 msgid "Main config file"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:295
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:317
+#: ../includes/system_tests.inc:295
+#: ../includes/system_tests.inc:317
 #, php-format
 msgid "Can't write '%s' file. Check FA directory write permissions."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:296
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:318
+#: ../includes/system_tests.inc:296
+#: ../includes/system_tests.inc:318
 #, php-format
 msgid "'%s' file exists."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:300
+#: ../includes/system_tests.inc:300
 #, php-format
 msgid "'%s' file should be read-only"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:309
+#: ../includes/system_tests.inc:309
 msgid "Database auth file"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:322
+#: ../includes/system_tests.inc:322
 #, php-format
 msgid ""
 "'%s' file should be read-only if you do not plan to add or change companies"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:333
+#: ../includes/system_tests.inc:333
 msgid "Extensions system"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:363
+#: ../includes/system_tests.inc:363
 msgid "Extensions configuration files and directories should be writeable"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:375
+#: ../includes/system_tests.inc:375
 #, php-format
 msgid "Non-standard theme directory '%s' is not writable"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:385
+#: ../includes/system_tests.inc:385
 msgid ""
 "OpenSSL PHP extension have to be enabled to use extension repository system."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:388
+#: ../includes/system_tests.inc:388
 msgid ""
 "OpenSSL have to be available on your server to use extension repository "
 "system."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:411
+#: ../includes/system_tests.inc:411
 msgid "Test"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:411
+#: ../includes/system_tests.inc:411
 msgid "Test type"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:411
-#: /var/www/fa_unstable/devel/../includes/ui/view_package.php:37
-#: /var/www/fa_unstable/devel/../reporting/rep204.php:83
-#: /var/www/fa_unstable/devel/../reporting/rep301.php:99
+#: ../includes/system_tests.inc:411
+#: ../includes/ui/view_package.php:37
+#: ../reporting/rep204.php:83
+#: ../reporting/rep301.php:103
 msgid "Value"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:411
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:36
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:45
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:53
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:61
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:69
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:75
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:83
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:89
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:95
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:102
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:108
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:114
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:119
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:128
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:137
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:144
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:148
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:155
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:161
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:169
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:174
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:183
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:191
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:196
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:203
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:209
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:217
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:228
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:234
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:240
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:254
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:261
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:271
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:282
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:291
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:302
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:308
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:317
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:327
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:335
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:345
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:350
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:358
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:367
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:374
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:381
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:388
-#: /var/www/fa_unstable/devel/../reporting/includes/excel_report.inc:280
-#: /var/www/fa_unstable/devel/../reporting/includes/excel_report.inc:413
-#: /var/www/fa_unstable/devel/../reporting/includes/pdf_report.inc:346
-#: /var/www/fa_unstable/devel/../reporting/includes/pdf_report.inc:615
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:83
+#: ../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: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:222
+#: ../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/includes/excel_report.inc:295
+#: ../reporting/includes/excel_report.inc:428
+#: ../reporting/includes/pdf_report.inc:346
+#: ../reporting/includes/pdf_report.inc:618
+#: ../sales/view/view_sales_order.php:98
+#: ../sales/view/view_sales_order.php.orig:85
 msgid "Comments"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/system_tests.inc:435
+#: ../includes/system_tests.inc:435
 msgid "Ok"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/db/audit_trail_db.inc:93
+#: ../includes/db/audit_trail_db.inc:99
 msgid ""
 "Some transactions journal GL postings were not indexed due to lack of audit "
 "trail record."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/db/inventory_db.inc:227
-#, php-format
-msgid "Cost was %s changed to %s for item '%s'"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../includes/db/inventory_db.inc:285
+#: ../includes/db/inventory_db.inc:252
 msgid "Cost was "
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/db/inventory_db.inc:285
+#: ../includes/db/inventory_db.inc:252
 msgid " changed to "
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/db/inventory_db.inc:285
+#: ../includes/db/inventory_db.inc:252
 msgid " for item "
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/allocation_cart.inc:259
-#: /var/www/fa_unstable/devel/../purchasing/allocations/supplier_allocation_main.php:94
-#: /var/www/fa_unstable/devel/../sales/allocations/customer_allocation_main.php:93
+#: ../includes/db/inventory_db.inc:292
+msgid "Zero/negative inventory handling"
+msgstr ""
+
+#: ../includes/ui/allocation_cart.inc:264
+#: ../purchasing/allocations/supplier_allocation_main.php:94
+#: ../sales/allocations/customer_allocation_main.php:93
 msgid "Transaction Type"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/allocation_cart.inc:260
+#: ../includes/ui/allocation_cart.inc:264
+#: ../reporting/rep704.php:79
+#: ../reporting/rep704.php:82
+#: ../reporting/rep704.php:85
+#: ../reporting/rep709.php:109
+#: ../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/view/view_sales_order.php.orig:96
+#: ../sales/view/view_sales_order.php.orig:129
+#: ../sales/view/view_sales_order.php.orig:161
+#: ../sales/inquiry/sales_orders_view.php:248
+#: ../sales/inquiry/sales_orders_view.php:285
+#: ../sales/inquiry/sales_orders_view.php:299
+#: ../sales/inquiry/sales_orders_view.php.orig:225
+#: ../sales/inquiry/sales_orders_view.php.orig:262
+#: ../sales/inquiry/sales_orders_view.php.orig:276
+msgid "Ref"
+msgstr ""
+
+#: ../includes/ui/allocation_cart.inc:265
 msgid "Other Allocations"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/allocation_cart.inc:260
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:481
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:108
+#: ../includes/ui/allocation_cart.inc:265
+#: ../includes/ui/ui_view.inc:489
+#: ../includes/ui/ui_view.inc.orig:489
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:208
 msgid "This Allocation"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/allocation_cart.inc:260
-#: /var/www/fa_unstable/devel/../includes/ui/allocation_cart.inc:306
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:481
-#: /var/www/fa_unstable/devel/../purchasing/allocations/supplier_allocation_main.php:101
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:108
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:166
-#: /var/www/fa_unstable/devel/../sales/allocations/customer_allocation_main.php:100
+#: ../includes/ui/allocation_cart.inc:265
+#: ../includes/ui/allocation_cart.inc:314
+#: ../includes/ui/ui_view.inc:489
+#: ../includes/ui/ui_view.inc.orig:489
+#: ../purchasing/allocations/supplier_allocation_main.php:101
+#: ../reporting/rep112.php:141
+#: ../reporting/rep210.php:154
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:208
+#: ../sales/allocations/customer_allocation_main.php:100
 msgid "Left to Allocate"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/allocation_cart.inc:289
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:165
+#: ../includes/ui/allocation_cart.inc:297
+#: ../reporting/rep112.php:138
+#: ../reporting/rep210.php:151
 msgid "Total Allocated"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/allocation_cart.inc:326
+#: ../includes/ui/allocation_cart.inc:334
 msgid "The entry for one or more amounts is invalid or negative."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/allocation_cart.inc:335
+#: ../includes/ui/allocation_cart.inc:343
 msgid "At least one transaction is overallocated."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/allocation_cart.inc:353
+#: ../includes/ui/allocation_cart.inc:361
 msgid ""
 "These allocations cannot be processed because the amount allocated is more "
 "than the total amount left to allocate."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/contacts_view.inc:41
+#: ../includes/ui/contacts_view.inc:41
 msgid "Assignment"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/contacts_view.inc:41
+#: ../includes/ui/contacts_view.inc:41
 msgid "Sec Phone"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/contacts_view.inc:41
-#: /var/www/fa_unstable/devel/../reporting/rep103.php:209
-#: /var/www/fa_unstable/devel/../reporting/includes/header2.inc:92
-#: /var/www/fa_unstable/devel/../sales/manage/sales_people.php:99
+#: ../includes/ui/contacts_view.inc:41
+#: ../reporting/rep103.php:223
+#: ../reporting/includes/header2.inc:104
+#: ../sales/manage/sales_people.php:99
 msgid "Fax"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/contacts_view.inc:42
+#: ../includes/ui/contacts_view.inc:42
 msgid "email"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/contacts_view.inc:79
+#: ../includes/ui/contacts_view.inc:90
 msgid "Contact data"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/contacts_view.inc:81
+#: ../includes/ui/contacts_view.inc:92
 msgid "First Name:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/contacts_view.inc:82
+#: ../includes/ui/contacts_view.inc:93
 msgid "Last Name:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/contacts_view.inc:85
+#: ../includes/ui/contacts_view.inc:96
 msgid "Contact active for:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/contacts_view.inc:91
+#: ../includes/ui/contacts_view.inc:102
+#: ../sales/manage/customers.php:252
+#: ../sales/manage/sav.customers.php:252
 msgid "Phone:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/contacts_view.inc:94
-#: /var/www/fa_unstable/devel/../inventory/manage/locations.php:207
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:108
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:264
-#: /var/www/fa_unstable/devel/../sales/manage/sales_people.php:158
+#: ../includes/ui/contacts_view.inc:105
+#: ../inventory/manage/locations.php:207
+#: ../purchasing/manage/suppliers.php:139
+#: ../purchasing/manage/suppliers.php.orig:117
+#: ../sales/manage/customer_branches.php:265
+#: ../sales/manage/customers.php:255
+#: ../sales/manage/sales_people.php:158
+#: ../sales/manage/sav.customers.php:255
 msgid "E-mail:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/contacts_view.inc:99
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:109
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:265
+#: ../includes/ui/contacts_view.inc:110
+#: ../purchasing/manage/suppliers.php:140
+#: ../purchasing/manage/suppliers.php.orig:118
+#: ../sales/manage/customer_branches.php:266
 msgid "Document Language:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/contacts_view.inc:99
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:265
+#: ../includes/ui/contacts_view.inc:110
+#: ../sales/manage/customer_branches.php:266
 msgid "Customer default"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/contacts_view.inc:101
+#: ../includes/ui/contacts_view.inc:112
 msgid "Notes:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/contacts_view.inc:121
+#: ../includes/ui/contacts_view.inc:132
 msgid "The contact name cannot be empty."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/contacts_view.inc:126
+#: ../includes/ui/contacts_view.inc:137
 msgid "Contact reference cannot be empty."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/contacts_view.inc:131
+#: ../includes/ui/contacts_view.inc:142
 msgid "You have to select at least one category."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/db_pager_view.inc:166
-#: /var/www/fa_unstable/devel/../includes/ui/ui_input.inc:887
+#: ../includes/ui/db_pager_view.inc:166
+#: ../includes/ui/ui_input.inc:899
 msgid "Show also Inactive"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/db_pager_view.inc:175
+#: ../includes/ui/db_pager_view.inc:175
 msgid "First"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/db_pager_view.inc:176
+#: ../includes/ui/db_pager_view.inc:176
 msgid "Prev"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/db_pager_view.inc:177
+#: ../includes/ui/db_pager_view.inc:177
 msgid "Next"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/db_pager_view.inc:178
+#: ../includes/ui/db_pager_view.inc:178
 msgid "Last"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/db_pager_view.inc:187
+#: ../includes/ui/db_pager_view.inc:187
 #, php-format
 msgid "Records %d-%d of %d"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/db_pager_view.inc:191
+#: ../includes/ui/db_pager_view.inc:191
 msgid "No records"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/simple_crud_class.inc:227
-#: /var/www/fa_unstable/devel/../includes/ui/ui_input.inc:203
+#: ../includes/ui/simple_crud_class.inc:227
+#: ../includes/ui/ui_input.inc:207
 msgid "Submit changes"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/simple_crud_class.inc:229
-#: /var/www/fa_unstable/devel/../includes/ui/ui_input.inc:204
+#: ../includes/ui/simple_crud_class.inc:229
+#: ../includes/ui/ui_input.inc:208
 msgid "Clone"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/simple_crud_class.inc:229
-#: /var/www/fa_unstable/devel/../includes/ui/ui_input.inc:205
+#: ../includes/ui/simple_crud_class.inc:229
+#: ../includes/ui/ui_input.inc:209
 msgid "Edit new record with current data"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/simple_crud_class.inc:231
-#: /var/www/fa_unstable/devel/../includes/ui/ui_input.inc:206
+#: ../includes/ui/simple_crud_class.inc:231
+#: ../includes/ui/ui_input.inc:210
 msgid "Cancel edition"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_controls.inc:122
+#: ../includes/ui/ui_controls.inc:79
+msgid "Request from outside of this page is forbidden."
+msgstr ""
+
+#: ../includes/ui/ui_controls.inc:80
+msgid "CSRF attack detected from: "
+msgstr ""
+
+#: ../includes/ui/ui_controls.inc:146
 msgid "You should automatically be forwarded."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_controls.inc:123
+#: ../includes/ui/ui_controls.inc:147
 msgid "If this does not happen"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_controls.inc:123
+#: ../includes/ui/ui_controls.inc:147
 msgid "click here"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_controls.inc:123
+#: ../includes/ui/ui_controls.inc:147
 msgid "to continue"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_controls.inc:170
+#: ../includes/ui/ui_controls.inc:194
 msgid "View Attachment"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_controls.inc:173
+#: ../includes/ui/ui_controls.inc:197
 msgid "Close"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_controls.inc:425
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:16
+#: ../includes/ui/ui_controls.inc:457
+#: ../sales/manage/customers.php:23
+#: ../sales/manage/sav.customers.php:23
 msgid "Customers"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_controls.inc:427
+#: ../includes/ui/ui_controls.inc:459
 msgid "Branches"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_controls.inc:429
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:16
+#: ../includes/ui/ui_controls.inc:461
+#: ../purchasing/manage/suppliers.php:22
+#: ../purchasing/manage/suppliers.php.orig:23
 msgid "Suppliers"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_controls.inc:431
-#: /var/www/fa_unstable/devel/../inventory/transfers.php:230
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:16
+#: ../includes/ui/ui_controls.inc:463
+#: ../inventory/transfers.php:230
+#: ../inventory/manage/items.php:22
+#: ../inventory/manage/items.php.orig:21
 msgid "Items"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_input.inc:616
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:211
+#: ../includes/ui/ui_controls.inc:608
+msgid "Entered data has not been saved yet.\\nDo you want to abandon changes?"
+msgstr ""
+
+#: ../includes/ui/ui_input.inc:628
+#: ../reporting/includes/reports_classes.inc:216
 msgid "Click Here to Pick up the date"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_input.inc:899
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:2108
-#: /var/www/fa_unstable/devel/../reporting/rep301.php:147
-#: /var/www/fa_unstable/devel/../reporting/rep302.php:166
-#: /var/www/fa_unstable/devel/../reporting/rep303.php:170
-#: /var/www/fa_unstable/devel/../reporting/rep304.php:168
-#: /var/www/fa_unstable/devel/../reporting/rep304.php:172
-#: /var/www/fa_unstable/devel/../reporting/rep305.php:111
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:303
+#: ../includes/ui/ui_input.inc:911
+#: ../includes/ui/ui_lists.inc:2156
+#: ../includes/ui/ui_lists.inc.orig:2154
+#: ../reporting/rep301.php:152
+#: ../reporting/rep302.php:166
+#: ../reporting/rep303.php:170
+#: ../reporting/rep304.php:166
+#: ../reporting/rep304.php:170
+#: ../sales/manage/customer_branches.php:304
 msgid "Inactive"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_input.inc:909
-#: /var/www/fa_unstable/devel/../includes/ui/ui_input.inc:921
+#: ../includes/ui/ui_input.inc:921
+#: ../includes/ui/ui_input.inc:933
 msgid "Current Credit:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:17
+#: ../includes/ui/ui_input.inc:967
+msgid "Bank Balance:"
+msgstr ""
+
+#: ../includes/ui/ui_lists.inc:17
+#: ../includes/ui/ui_lists.inc.orig:17
 msgid "Set filter"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:90
+#: ../includes/ui/ui_lists.inc:100
+#: ../includes/ui/ui_lists.inc.orig:100
 msgid "Press Space tab for search pattern entry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:94
+#: ../includes/ui/ui_lists.inc:104
+#: ../includes/ui/ui_lists.inc.orig:104
 msgid "Enter code fragment to search or * for all"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:95
+#: ../includes/ui/ui_lists.inc:105
+#: ../includes/ui/ui_lists.inc.orig:105
 msgid "Enter description fragment to search or * for all"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:427
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:1345
+#: ../includes/ui/ui_lists.inc:453
+#: ../includes/ui/ui_lists.inc:1386
+#: ../includes/ui/ui_lists.inc.orig:453
+#: ../includes/ui/ui_lists.inc.orig:1386
 msgid "All Suppliers"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:431
+#: ../includes/ui/ui_lists.inc:457
+#: ../includes/ui/ui_lists.inc.orig:457
 msgid "Press Space tab to filter by name fragment"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:432
+#: ../includes/ui/ui_lists.inc:458
+#: ../includes/ui/ui_lists.inc.orig:458
 msgid "Select supplier"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:476
+#: ../includes/ui/ui_lists.inc:505
+#: ../includes/ui/ui_lists.inc.orig:505
 msgid "All Customers"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:480
+#: ../includes/ui/ui_lists.inc:509
+#: ../includes/ui/ui_lists.inc.orig:509
 msgid "Press Space tab to filter by name fragment; F2 - entry new customer"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:481
+#: ../includes/ui/ui_lists.inc:510
+#: ../includes/ui/ui_lists.inc.orig:510
 msgid "Select customer"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:524
+#: ../includes/ui/ui_lists.inc:557
+#: ../includes/ui/ui_lists.inc.orig:557
 msgid "All branches"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:527
+#: ../includes/ui/ui_lists.inc:560
+#: ../includes/ui/ui_lists.inc.orig:560
 msgid "Select customer branch"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:562
+#: ../includes/ui/ui_lists.inc:600
+#: ../includes/ui/ui_lists.inc.orig:600
 msgid "All Locations"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:714
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:779
+#: ../includes/ui/ui_lists.inc:752
+#: ../includes/ui/ui_lists.inc:820
+#: ../includes/ui/ui_lists.inc.orig:752
+#: ../includes/ui/ui_lists.inc.orig:820
 msgid "All Items"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:1252
+#: ../includes/ui/ui_lists.inc:1293
+#: ../includes/ui/ui_lists.inc.orig:1293
 msgid "All Sales Types"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:1583
+#: ../includes/ui/ui_lists.inc:1628
+#: ../includes/ui/ui_lists.inc.orig:1626
 msgid "Use Item Sales Accounts"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:1892
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:1909
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:1926
+#: ../includes/ui/ui_lists.inc:1940
+#: ../includes/ui/ui_lists.inc:1957
+#: ../includes/ui/ui_lists.inc:1974
+#: ../includes/ui/ui_lists.inc.orig:1938
+#: ../includes/ui/ui_lists.inc.orig:1955
+#: ../includes/ui/ui_lists.inc.orig:1972
 msgid "All Types"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:1893
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:125
+#: ../includes/ui/ui_lists.inc:1941
+#: ../includes/ui/ui_lists.inc.orig:1939
+#: ../sales/view/view_sales_order.php:140
+#: ../sales/view/view_sales_order.php.orig:127
 msgid "Sales Invoices"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:1894
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:1911
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:1929
+#: ../includes/ui/ui_lists.inc:1942
+#: ../includes/ui/ui_lists.inc:1959
+#: ../includes/ui/ui_lists.inc:1977
+#: ../includes/ui/ui_lists.inc.orig:1940
+#: ../includes/ui/ui_lists.inc.orig:1957
+#: ../includes/ui/ui_lists.inc.orig:1975
 msgid "Overdue Invoices"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:1895
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:1912
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:1930
+#: ../includes/ui/ui_lists.inc:1943
+#: ../includes/ui/ui_lists.inc:1960
+#: ../includes/ui/ui_lists.inc:1978
+#: ../includes/ui/ui_lists.inc.orig:1941
+#: ../includes/ui/ui_lists.inc.orig:1958
+#: ../includes/ui/ui_lists.inc.orig:1976
+#: ../includes/ui/ui_view.inc:550
+#: ../includes/ui/ui_view.inc:554
+#: ../includes/ui/ui_view.inc.orig:484
 msgid "Payments"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:1896
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:1913
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:1931
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:156
+#: ../includes/ui/ui_lists.inc:1944
+#: ../includes/ui/ui_lists.inc:1961
+#: ../includes/ui/ui_lists.inc:1979
+#: ../includes/ui/ui_lists.inc.orig:1942
+#: ../includes/ui/ui_lists.inc.orig:1959
+#: ../includes/ui/ui_lists.inc.orig:1977
+#: ../sales/view/view_sales_order.php:176
+#: ../sales/view/view_sales_order.php.orig:158
 msgid "Credit Notes"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:1897
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:91
+#: ../includes/ui/ui_lists.inc:1945
+#: ../includes/ui/ui_lists.inc.orig:1943
+#: ../sales/view/view_sales_order.php:106
+#: ../sales/view/view_sales_order.php.orig:93
 msgid "Delivery Notes"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:1910
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:1928
+#: ../includes/ui/ui_lists.inc:1958
+#: ../includes/ui/ui_lists.inc:1976
+#: ../includes/ui/ui_lists.inc.orig:1956
+#: ../includes/ui/ui_lists.inc.orig:1974
 msgid "Invoices"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:1914
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:1932
+#: ../includes/ui/ui_lists.inc:1962
+#: ../includes/ui/ui_lists.inc:1980
+#: ../includes/ui/ui_lists.inc.orig:1960
+#: ../includes/ui/ui_lists.inc.orig:1978
 msgid "Overdue Credit Notes"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:1927
+#: ../includes/ui/ui_lists.inc:1975
+#: ../includes/ui/ui_lists.inc.orig:1973
 msgid "GRNs"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:1945
+#: ../includes/ui/ui_lists.inc:1993
+#: ../includes/ui/ui_lists.inc.orig:1991
 msgid "Automatically put balance on back order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:1946
+#: ../includes/ui/ui_lists.inc:1994
+#: ../includes/ui/ui_lists.inc.orig:1992
 msgid "Cancel any quantites not delivered"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:1963
+#: ../includes/ui/ui_lists.inc:2011
+#: ../includes/ui/ui_lists.inc.orig:2009
 msgid "Items Returned to Inventory Location"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:1964
+#: ../includes/ui/ui_lists.inc:2012
+#: ../includes/ui/ui_lists.inc.orig:2010
 msgid "Items Written Off"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:2134
+#: ../includes/ui/ui_lists.inc:2182
+#: ../includes/ui/ui_lists.inc.orig:2180
 msgid "New role"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:2192
+#: ../includes/ui/ui_lists.inc:2240
+#: ../includes/ui/ui_lists.inc.orig:2238
 msgid "No tags defined."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:2192
+#: ../includes/ui/ui_lists.inc:2240
+#: ../includes/ui/ui_lists.inc.orig:2238
 msgid "No active tags defined."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:2230
+#: ../includes/ui/ui_lists.inc:2278
+#: ../includes/ui/ui_lists.inc.orig:2276
 #, php-format
 msgid "Activated for '%s'"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:2233
+#: ../includes/ui/ui_lists.inc:2281
+#: ../includes/ui/ui_lists.inc.orig:2279
 msgid "Available and/or installed"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:2303
+#: ../includes/ui/ui_lists.inc:2351
+#: ../includes/ui/ui_lists.inc.orig:2349
 msgid "Standard new company American COA (4 digit)"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_lists.inc:2305
+#: ../includes/ui/ui_lists.inc:2353
+#: ../includes/ui/ui_lists.inc.orig:2351
 msgid "Standard American COA (4 digit) with demo data"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_msgs.inc:63
+#: ../includes/ui/ui_lists.inc:2374
+#: ../includes/ui/ui_lists.inc.orig:2372
+msgid "No payment Link"
+msgstr ""
+
+#: ../includes/ui/ui_msgs.inc:63
 msgid "in units of : "
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:306
+#: ../includes/ui/ui_view.inc:306
+#: ../includes/ui/ui_view.inc.orig:306
 msgid "Date Voided:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:404
-#: /var/www/fa_unstable/devel/../reporting/rep107.php:188
-#: /var/www/fa_unstable/devel/../reporting/rep109.php:182
-#: /var/www/fa_unstable/devel/../reporting/rep110.php:184
-#: /var/www/fa_unstable/devel/../reporting/rep209.php:188
+#: ../includes/ui/ui_view.inc:407
+#: ../includes/ui/ui_view.inc.orig:407
+#: ../reporting/rep107.php:242
+#: ../reporting/rep109.php:183
+#: ../reporting/rep110.php:186
+#: ../reporting/rep111.php:168
+#: ../reporting/rep113.php:172
+#: ../reporting/rep209.php:191
 msgid "Total Tax Excluded"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:410
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:426
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:444
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:149
+#: ../includes/ui/ui_view.inc:413
+#: ../includes/ui/ui_view.inc:432
+#: ../includes/ui/ui_view.inc:451
+#: ../includes/ui/ui_view.inc.orig:413
+#: ../includes/ui/ui_view.inc.orig:432
+#: ../includes/ui/ui_view.inc.orig:451
+#: ../reporting/rep107.php:251
+#: ../reporting/rep109.php:192
+#: ../reporting/rep110.php:195
+#: ../reporting/rep111.php:177
+#: ../reporting/rep113.php:181
+#: ../reporting/rep209.php:200
 msgid "Included"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:476
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_allocation_inquiry.php:99
-msgid "Allocations"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:480
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:108
+#: ../includes/ui/ui_view.inc:488
+#: ../includes/ui/ui_view.inc.orig:488
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:208
 msgid "Total Amount"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:504
+#: ../includes/ui/ui_view.inc:511
+#: ../includes/ui/ui_view.inc.orig:512
 msgid "Total Allocated:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:508
+#: ../includes/ui/ui_view.inc:517
+#: ../includes/ui/ui_view.inc.orig:516
 msgid "Left to Allocate:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:544
+#: ../includes/ui/ui_view.inc:533
+#: ../includes/ui/ui_view.inc:537
+#: ../includes/ui/ui_view.inc.orig:484
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:99
+msgid "Allocations"
+msgstr ""
+
+#: ../includes/ui/ui_view.inc:550
+#: ../includes/ui/ui_view.inc:554
+msgid "Pre-Payments"
+msgstr ""
+
+#: ../includes/ui/ui_view.inc:570
+#: ../includes/ui/ui_view.inc.orig:569
 msgid "No Quick Entries are defined."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:572
+#: ../includes/ui/ui_view.inc:598
+#: ../includes/ui/ui_view.inc.orig:597
 msgid "No Quick Entry lines are defined."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:754
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:442
+#: ../includes/ui/ui_view.inc:780
+#: ../includes/ui/ui_view.inc.orig:779
+#: ../purchasing/includes/ui/invoice_ui.inc:473
 msgid "and"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc.orig:840
 msgid "January"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc.orig:840
 msgid "February"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc.orig:840
 msgid "March"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc.orig:840
 msgid "April"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc.orig:840
 msgid "May"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc.orig:840
 msgid "June"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc.orig:840
 msgid "July"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc.orig:840
 msgid "August"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc.orig:840
 msgid "September"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc.orig:840
 msgid "October"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc.orig:840
 msgid "November"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc.orig:840
 msgid "December"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc.orig:841
 msgid "Su"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc.orig:841
 msgid "Mo"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc.orig:841
 msgid "Tu"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc.orig:841
 msgid "We"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc.orig:841
 msgid "Th"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc.orig:841
 msgid "Fr"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc.orig:841
 msgid "Sa"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc:843
+#: ../includes/ui/ui_view.inc.orig:842
 msgid "W"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/view_package.php:7
+#: ../includes/ui/view_package.php:7
 msgid "Package Details"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/view_package.php:14
+#: ../includes/ui/view_package.php:14
 msgid ""
 "The script must be called with a valid package id to review the info for."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/view_package.php:19
+#: ../includes/ui/view_package.php:19
 msgid "Available version"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/view_package.php:20
+#: ../includes/ui/view_package.php:20
 msgid "Package type"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/view_package.php:21
+#: ../includes/ui/view_package.php:21
 msgid "Package content"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/view_package.php:23
+#: ../includes/ui/view_package.php:23
 msgid "Author"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/view_package.php:24
+#: ../includes/ui/view_package.php:24
 msgid "Home page"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/view_package.php:25
+#: ../includes/ui/view_package.php:25
 msgid "Package maintainer"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/view_package.php:26
+#: ../includes/ui/view_package.php:26
 msgid "Installation path"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/view_package.php:27
+#: ../includes/ui/view_package.php:27
 msgid "Minimal software versions"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/view_package.php:28
+#: ../includes/ui/view_package.php:28
 msgid "Right to left"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/view_package.php:29
+#: ../includes/ui/view_package.php:29
 msgid "Charset encoding"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/view_package.php:34
+#: ../includes/ui/view_package.php:34
 #, php-format
 msgid "Content information for package '%s'"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../includes/ui/view_package.php:37
+#: ../includes/ui/view_package.php:37
 msgid "Property"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/adjustments.php:28
+#: ../inventory/adjustments.php:28
 msgid "Item Adjustments Note"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/adjustments.php:32
+#: ../inventory/adjustments.php:32
 msgid ""
 "There are no inventory items defined in the system which can be adjusted "
 "(Purchased or Manufactured)."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/adjustments.php:34
-#: /var/www/fa_unstable/devel/../inventory/transfers.php:34
+#: ../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 ""
 
-#: /var/www/fa_unstable/devel/../inventory/adjustments.php:43
+#: ../inventory/adjustments.php:43
 msgid "Items adjustment has been processed"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/adjustments.php:44
+#: ../inventory/adjustments.php:44
 msgid "&View this adjustment"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/adjustments.php:46
+#: ../inventory/adjustments.php:46
 msgid "View the GL &Postings for this Adjustment"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/adjustments.php:48
+#: ../inventory/adjustments.php:48
 msgid "Enter &Another Adjustment"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/adjustments.php:88
-#: /var/www/fa_unstable/devel/../inventory/transfers.php:87
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:345
+#: ../inventory/adjustments.php:90
+#: ../inventory/transfers.php:87
+#: ../sales/sales_order_entry.php:355
 msgid "You must enter at least one non empty item line."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/adjustments.php:108
-#: /var/www/fa_unstable/devel/../inventory/transfers.php:105
+#: ../inventory/adjustments.php:110
+#: ../inventory/transfers.php:105
 msgid "The entered date for the adjustment is invalid."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/adjustments.php:122
+#: ../inventory/adjustments.php:124
 msgid ""
 "The adjustment cannot be processed because an adjustment item would cause a "
 "negative inventory balance :"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/adjustments.php:152
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_issue.php:138
+#: ../inventory/adjustments.php:154
+#: ../manufacturing/work_order_issue.php:141
 msgid "The quantity entered is negative or invalid."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/adjustments.php:159
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_issue.php:145
+#: ../inventory/adjustments.php:161
+#: ../manufacturing/work_order_issue.php:148
 msgid "The entered standard cost is negative or invalid."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/adjustments.php:228
+#: ../inventory/adjustments.php:230
 msgid "Adjustment Items"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/adjustments.php:234
+#: ../inventory/adjustments.php:236
 msgid "Process Adjustment"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/cost_update.php:26
+#: ../inventory/cost_update.php:26
 msgid "Inventory Item Cost Update"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/cost_update.php:30
+#: ../inventory/cost_update.php:30
 msgid ""
 "There are no costable inventory items defined in the system (Purchased or "
 "manufactured items)."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/cost_update.php:51
+#: ../inventory/cost_update.php:51
 msgid "The entered cost is not numeric."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/cost_update.php:57
+#: ../inventory/cost_update.php:57
 msgid "The new cost is the same as the old cost. Cost was not updated."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/cost_update.php:67
+#: ../inventory/cost_update.php:67
 msgid "Cost has been updated."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/cost_update.php:71
+#: ../inventory/cost_update.php:71
 msgid "View the GL Journal Entries for this Cost Update"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/cost_update.php:85
-#: /var/www/fa_unstable/devel/../inventory/prices.php:56
-#: /var/www/fa_unstable/devel/../inventory/purchasing_data.php:101
-#: /var/www/fa_unstable/devel/../inventory/reorder_level.php:43
-#: /var/www/fa_unstable/devel/../inventory/inquiry/stock_movements.php:49
-#: /var/www/fa_unstable/devel/../inventory/inquiry/stock_status.php:41
-#: /var/www/fa_unstable/devel/../inventory/manage/item_codes.php:105
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:394
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:399
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search.php:69
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_deliveries_view.php:109
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:234
+#: ../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_movements.php.orig:51
+#: ../inventory/inquiry/stock_status.php:41
+#: ../inventory/inquiry/stock_status.php.orig:47
+#: ../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_deliveries_view.php.orig:114
+#: ../sales/inquiry/sales_orders_view.php:263
+#: ../sales/inquiry/sales_orders_view.php.orig:240
 msgid "Item:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/cost_update.php:111
+#: ../inventory/cost_update.php:102
 msgid "Standard Material Cost Per Unit"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/cost_update.php:114
+#: ../inventory/cost_update.php:105
 msgid "Standard Labour Cost Per Unit"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/cost_update.php:115
+#: ../inventory/cost_update.php:106
 msgid "Standard Overhead Cost Per Unit"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/prices.php:16
+#: ../inventory/prices.php:16
 msgid "Inventory Item Sales prices"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/prices.php:27
-#: /var/www/fa_unstable/devel/../inventory/inquiry/stock_movements.php:30
-#: /var/www/fa_unstable/devel/../inventory/inquiry/stock_status.php:34
-#: /var/www/fa_unstable/devel/../inventory/manage/sales_kits.php:24
-#: /var/www/fa_unstable/devel/../manufacturing/inquiry/where_used_inquiry.php:21
-#: /var/www/fa_unstable/devel/../sales/credit_note_entry.php:49
+#: ../inventory/prices.php:27
+#: ../inventory/inquiry/stock_movements.php:29
+#: ../inventory/inquiry/stock_movements.php.orig:31
+#: ../inventory/inquiry/stock_status.php:32
+#: ../inventory/inquiry/stock_status.php.orig:37
+#: ../inventory/manage/sales_kits.php:24
+#: ../manufacturing/inquiry/where_used_inquiry.php:21
+#: ../sales/credit_note_entry.php:49
 msgid "There are no items defined in the system."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/prices.php:29
+#: ../inventory/prices.php:29
 msgid ""
 "There are no sales types in the system. Please set up sales types befor "
 "entering pricing."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/prices.php:70
+#: ../inventory/prices.php:70
 msgid "The price entered must be numeric."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/prices.php:83
+#: ../inventory/prices.php:83
 msgid "This price has been updated."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/prices.php:91
+#: ../inventory/prices.php:91
 msgid "The new price has been added."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/prices.php:105
+#: ../inventory/prices.php:105
 msgid "The selected price has been deleted."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/prices.php:133
-#: /var/www/fa_unstable/devel/../reporting/rep104.php:116
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:353
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:388
-#: /var/www/fa_unstable/devel/../sales/view/view_credit.php:73
-#: /var/www/fa_unstable/devel/../sales/view/view_dispatch.php:93
-#: /var/www/fa_unstable/devel/../sales/view/view_invoice.php:93
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_credit_ui.inc:102
+#: ../inventory/prices.php:133
+#: ../reporting/rep104.php:116
+#: ../sales/customer_delivery.php:363
+#: ../sales/customer_invoice.php:466
+#: ../sales/view/view_credit.php:73
+#: ../sales/view/view_dispatch.php:93
+#: ../sales/view/view_invoice.php:93
+#: ../sales/includes/ui/sales_credit_ui.inc:102
 msgid "Sales Type"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/prices.php:133
-#: /var/www/fa_unstable/devel/../inventory/purchasing_data.php:127
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:474
-#: /var/www/fa_unstable/devel/../purchasing/po_receive_items.php:59
-#: /var/www/fa_unstable/devel/../purchasing/view/view_grn.php:41
-#: /var/www/fa_unstable/devel/../purchasing/view/view_po.php:45
-#: /var/www/fa_unstable/devel/../reporting/rep104.php:109
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:103
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:111
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:292
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:431
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:441
-#: /var/www/fa_unstable/devel/../sales/view/view_credit.php:91
-#: /var/www/fa_unstable/devel/../sales/view/view_dispatch.php:113
-#: /var/www/fa_unstable/devel/../sales/view/view_invoice.php:115
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:200
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_credit_ui.inc:168
+#: ../inventory/prices.php:133
+#: ../inventory/purchasing_data.php:129
+#: ../inventory/purchasing_data.php.orig:224
+#: ../purchasing/includes/ui/invoice_ui.inc:505
+#: ../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:30
+#: ../reporting/includes/doctext.inc:192
+#: ../sales/customer_credit_invoice.php:283
+#: ../sales/customer_delivery.php:441
+#: ../sales/customer_invoice.php:540
+#: ../sales/customer_invoice.php:543
+#: ../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/view/view_sales_order.php.orig:202
+#: ../sales/includes/ui/sales_credit_ui.inc:168
 msgid "Price"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/prices.php:155
+#: ../inventory/prices.php:155
 msgid "There are no prices set up for this part."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/prices.php:174
+#: ../inventory/prices.php:174
+#: ../inventory/purchasing_data.php.orig:189
 msgid "Currency:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/prices.php:176
+#: ../inventory/prices.php:176
 msgid "Sales Type:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/prices.php:184
-#: /var/www/fa_unstable/devel/../inventory/purchasing_data.php:189
+#: ../inventory/prices.php:184
+#: ../inventory/purchasing_data.php:191
+#: ../inventory/purchasing_data.php.orig:193
 msgid "Price:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/prices.php:184
+#: ../inventory/prices.php:184
 msgid "per"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/prices.php:188
+#: ../inventory/prices.php:188
 msgid "The price is calculated."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/purchasing_data.php:16
+#: ../inventory/purchasing_data.php:16
+#: ../inventory/purchasing_data.php.orig:17
 msgid "Supplier Purchasing Data"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/purchasing_data.php:23
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:64
+#: ../inventory/purchasing_data.php:23
+#: ../inventory/purchasing_data.php.orig:24
+#: ../purchasing/po_entry_items.php:67
 msgid "There are no purchasable inventory items defined in the system."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/purchasing_data.php:24
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:62
-#: /var/www/fa_unstable/devel/../purchasing/supplier_credit.php:32
-#: /var/www/fa_unstable/devel/../purchasing/supplier_invoice.php:32
-#: /var/www/fa_unstable/devel/../purchasing/supplier_payment.php:40
+#: ../inventory/purchasing_data.php:24
+#: ../inventory/purchasing_data.php.orig:25
+#: ../purchasing/po_entry_items.php:65
+#: ../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 ""
 
-#: /var/www/fa_unstable/devel/../inventory/purchasing_data.php:38
-#: /var/www/fa_unstable/devel/../inventory/manage/item_codes.php:35
+#: ../inventory/purchasing_data.php:38
+#: ../inventory/purchasing_data.php.orig:39
+#: ../inventory/manage/item_codes.php:35
 msgid "There is no item selected."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/purchasing_data.php:44
+#: ../inventory/purchasing_data.php:44
+#: ../inventory/purchasing_data.php.orig:45
 msgid "The price entered was not numeric."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/purchasing_data.php:50
+#: ../inventory/purchasing_data.php:50
+#: ../inventory/purchasing_data.php.orig:51
 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 ""
 
-#: /var/www/fa_unstable/devel/../inventory/purchasing_data.php:60
+#: ../inventory/purchasing_data.php:60
+#: ../inventory/purchasing_data.php.orig:61
 msgid "This supplier purchasing data has been added."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/purchasing_data.php:66
+#: ../inventory/purchasing_data.php:66
+#: ../inventory/purchasing_data.php.orig:67
 msgid "Supplier purchasing data has been updated."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/purchasing_data.php:77
+#: ../inventory/purchasing_data.php:77
+#: ../inventory/purchasing_data.php.orig:88
 msgid "The purchasing data item has been sucessfully deleted."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/purchasing_data.php:112
+#: ../inventory/purchasing_data.php:114
 msgid "Entered item is not defined. Please re-enter."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/purchasing_data.php:121
+#: ../inventory/purchasing_data.php:123
 msgid "There is no purchasing data set up for the part selected"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/purchasing_data.php:128
+#: ../inventory/purchasing_data.php:130
+#: ../inventory/purchasing_data.php.orig:222
 msgid "Supplier's Unit"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/purchasing_data.php:128
+#: ../inventory/purchasing_data.php:130
+#: ../inventory/purchasing_data.php.orig:223
 msgid "Conversion Factor"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/purchasing_data.php:128
+#: ../inventory/purchasing_data.php:130
 msgid "Supplier's Description"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/purchasing_data.php:190
+#: ../inventory/purchasing_data.php:192
+#: ../inventory/purchasing_data.php.orig:194
 msgid "Suppliers Unit of Measure:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/purchasing_data.php:196
+#: ../inventory/purchasing_data.php:198
+#: ../inventory/purchasing_data.php.orig:200
 msgid "Conversion Factor (to our UOM):"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/purchasing_data.php:198
+#: ../inventory/purchasing_data.php:200
+#: ../inventory/purchasing_data.php.orig:202
 msgid "Supplier's Code or Description:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/reorder_level.php:16
+#: ../inventory/purchasing_data.php.orig:116
+msgid "Show all:"
+msgstr ""
+
+#: ../inventory/purchasing_data.php.orig:185
+msgid "Stock item:"
+msgstr ""
+
+#: ../inventory/purchasing_data.php.orig:219
+msgid "Supplier Code/Description"
+msgstr ""
+
+#: ../inventory/purchasing_data.php.orig:220
+#: ../inventory/includes/item_adjustments_ui.inc:62
+#: ../inventory/includes/stock_transfers_ui.inc:60
+#: ../manufacturing/includes/work_order_issue_ui.inc:33
+#: ../purchasing/includes/ui/po_ui.inc:243
+#: ../purchasing/po_receive_items.php:62
+#: ../purchasing/view/view_grn.php:40
+#: ../purchasing/view/view_po.php:45
+#: ../reporting/includes/doctext.inc:29
+#: ../reporting/includes/doctext.inc:191
+#: ../reporting/includes/doctext.inc:228
+#: ../sales/customer_credit_invoice.php:282
+#: ../sales/customer_delivery.php:439
+#: ../sales/customer_invoice.php:539
+#: ../sales/customer_invoice.php:542
+#: ../sales/view/view_credit.php:90
+#: ../sales/view/view_dispatch.php:112
+#: ../sales/view/view_invoice.php:115
+#: ../sales/view/view_sales_order.php:219
+#: ../sales/view/view_sales_order.php.orig:201
+#: ../sales/includes/ui/sales_credit_ui.inc:167
+#: ../sales/includes/ui/sales_order_ui.inc:140
+#: ../sales/includes/ui/sales_order_ui.inc.orig:140
+msgid "Item Code"
+msgstr ""
+
+#: ../inventory/purchasing_data.php.orig:221
+#: ../inventory/includes/item_adjustments_ui.inc:62
+#: ../inventory/includes/stock_transfers_ui.inc:60
+#: ../manufacturing/includes/work_order_issue_ui.inc:33
+#: ../purchasing/includes/ui/po_ui.inc:243
+#: ../purchasing/view/view_grn.php:40
+#: ../purchasing/view/view_po.php:45
+#: ../reporting/includes/doctext.inc:29
+#: ../reporting/includes/doctext.inc:191
+#: ../reporting/includes/doctext.inc:228
+#: ../sales/customer_credit_invoice.php:282
+#: ../sales/customer_delivery.php:439
+#: ../sales/customer_invoice.php:539
+#: ../sales/customer_invoice.php:542
+#: ../sales/view/view_credit.php:90
+#: ../sales/view/view_dispatch.php:112
+#: ../sales/view/view_invoice.php:115
+#: ../sales/view/view_sales_order.php:219
+#: ../sales/view/view_sales_order.php.orig:201
+#: ../sales/includes/ui/sales_credit_ui.inc:167
+#: ../sales/includes/ui/sales_order_ui.inc:140
+#: ../sales/includes/ui/sales_order_ui.inc.orig:140
+msgid "Item Description"
+msgstr ""
+
+#: ../inventory/reorder_level.php:16
 msgid "Reorder Levels"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/reorder_level.php:24
-#: /var/www/fa_unstable/devel/../inventory/transfers.php:32
+#: ../inventory/reorder_level.php:24
+#: ../inventory/transfers.php:32
 msgid ""
 "There are no inventory items defined in the system (Purchased or "
 "manufactured items)."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/reorder_level.php:57
-#: /var/www/fa_unstable/devel/../inventory/inquiry/stock_status.php:65
-#: /var/www/fa_unstable/devel/../inventory/inquiry/stock_status.php:69
-#: /var/www/fa_unstable/devel/../manufacturing/search_work_orders.php:162
-#: /var/www/fa_unstable/devel/../manufacturing/inquiry/where_used_inquiry.php:45
-#: /var/www/fa_unstable/devel/../manufacturing/manage/bom_edit.php:70
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search_completed.php:114
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search_completed.php:124
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search.php:128
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search.php:139
-#: /var/www/fa_unstable/devel/../reporting/rep105.php:118
-#: /var/www/fa_unstable/devel/../reporting/rep301.php:105
-#: /var/www/fa_unstable/devel/../reporting/rep302.php:130
-#: /var/www/fa_unstable/devel/../reporting/rep303.php:122
-#: /var/www/fa_unstable/devel/../reporting/rep304.php:123
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:167
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:173
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:178
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:189
-#: /var/www/fa_unstable/devel/../sales/manage/sales_points.php:84
+#: ../inventory/reorder_level.php:57
+#: ../inventory/inquiry/stock_status.php:66
+#: ../inventory/inquiry/stock_status.php:70
+#: ../inventory/inquiry/stock_status.php.orig:72
+#: ../inventory/inquiry/stock_status.php.orig:76
+#: ../manufacturing/search_work_orders.php:162
+#: ../manufacturing/inquiry/where_used_inquiry.php:45
+#: ../manufacturing/manage/bom_edit.php:70
+#: ../purchasing/inquiry/po_search_completed.php:123
+#: ../purchasing/inquiry/po_search_completed.php:133
+#: ../purchasing/inquiry/po_search_completed.php.orig:122
+#: ../purchasing/inquiry/po_search_completed.php.orig:132
+#: ../purchasing/inquiry/po_search.php:133
+#: ../purchasing/inquiry/po_search.php:144
+#: ../reporting/rep105.php:118
+#: ../reporting/rep301.php:110
+#: ../reporting/rep302.php:130
+#: ../reporting/rep303.php:122
+#: ../reporting/rep304.php:121
+#: ../reporting/reports_main.php:180
+#: ../reporting/reports_main.php:186
+#: ../reporting/reports_main.php:191
+#: ../reporting/reports_main.php:202
+#: ../sales/manage/sales_points.php:84
 msgid "Location"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/reorder_level.php:57
-#: /var/www/fa_unstable/devel/../inventory/inquiry/stock_movements.php:71
-#: /var/www/fa_unstable/devel/../inventory/inquiry/stock_status.php:69
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:482
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:181
+#: ../inventory/reorder_level.php:57
+#: ../inventory/inquiry/stock_movements.php:78
+#: ../inventory/inquiry/stock_movements.php.orig:80
+#: ../inventory/inquiry/stock_status.php:70
+#: ../inventory/inquiry/stock_status.php.orig:76
+#: ../purchasing/supplier_credit.php:220
+#: ../sales/sales_order_entry.php:503
+#: ../sales/includes/ui/sales_order_ui.inc:175
+#: ../sales/includes/ui/sales_order_ui.inc.orig:175
 msgid "Quantity On Hand"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/reorder_level.php:57
-#: /var/www/fa_unstable/devel/../inventory/inquiry/stock_status.php:69
-#: /var/www/fa_unstable/devel/../sales/includes/db/sales_order_db.inc:106
-#: /var/www/fa_unstable/devel/../sales/includes/db/sales_order_db.inc:258
+#: ../inventory/reorder_level.php:57
+#: ../inventory/inquiry/stock_status.php:70
+#: ../inventory/inquiry/stock_status.php.orig:76
+#: ../sales/includes/db/sales_order_db.inc:112
+#: ../sales/includes/db/sales_order_db.inc:275
 msgid "Re-Order Level"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/reorder_level.php:75
+#: ../inventory/reorder_level.php:75
 msgid "Reorder levels has been updated."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/transfers.php:28
+#: ../inventory/transfers.php:28
 msgid "Inventory Location Transfers"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/transfers.php:43
+#: ../inventory/transfers.php:43
 msgid "Inventory transfer has been processed"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/transfers.php:44
+#: ../inventory/transfers.php:44
 msgid "&View this transfer"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/transfers.php:46
+#: ../inventory/transfers.php:46
 msgid "Enter &Another Inventory Transfer"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/transfers.php:117
+#: ../inventory/transfers.php:117
 msgid "The locations to transfer from and to must be different."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/transfers.php:127
+#: ../inventory/transfers.php:127
 msgid ""
 "The quantity entered is greater than the available quantity for this item at "
 "the source location :"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/transfers.php:160
+#: ../inventory/transfers.php:160
 msgid "The quantity entered must be a positive number."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/transfers.php:237
+#: ../inventory/transfers.php:237
 msgid "Process Transfer"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/includes/item_adjustments_ui.inc:20
-#: /var/www/fa_unstable/devel/../inventory/includes/stock_transfers_ui.inc:20
-#: /var/www/fa_unstable/devel/../manufacturing/includes/work_order_issue_ui.inc:20
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:60
+#: ../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
+#: ../sales/includes/ui/sales_order_ui.inc.orig:60
 msgid "For Part :"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/includes/item_adjustments_ui.inc:34
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:209
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search.php:67
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_deliveries_view.php:107
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:232
+#: ../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_deliveries_view.php.orig:107
+#: ../sales/inquiry/sales_orders_view.php:254
+#: ../sales/inquiry/sales_orders_view.php.orig:231
 msgid "Location:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/includes/item_adjustments_ui.inc:43
+#: ../inventory/includes/item_adjustments_ui.inc:43
 msgid "Detail:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/includes/item_adjustments_ui.inc:48
+#: ../inventory/includes/item_adjustments_ui.inc:48
 msgid "Positive Adjustment"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/includes/item_adjustments_ui.inc:48
+#: ../inventory/includes/item_adjustments_ui.inc:48
 msgid "Negative Adjustment"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/includes/item_adjustments_ui.inc:62
-#: /var/www/fa_unstable/devel/../inventory/includes/stock_transfers_ui.inc:60
-#: /var/www/fa_unstable/devel/../manufacturing/includes/work_order_issue_ui.inc:33
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:210
-#: /var/www/fa_unstable/devel/../purchasing/po_receive_items.php:58
-#: /var/www/fa_unstable/devel/../purchasing/view/view_grn.php:40
-#: /var/www/fa_unstable/devel/../purchasing/view/view_po.php:45
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:102
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:105
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:110
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:291
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:429
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:440
-#: /var/www/fa_unstable/devel/../sales/view/view_credit.php:90
-#: /var/www/fa_unstable/devel/../sales/view/view_dispatch.php:112
-#: /var/www/fa_unstable/devel/../sales/view/view_invoice.php:114
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:199
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_credit_ui.inc:167
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:146
-msgid "Item Code"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../inventory/includes/item_adjustments_ui.inc:62
-#: /var/www/fa_unstable/devel/../inventory/includes/stock_transfers_ui.inc:60
-#: /var/www/fa_unstable/devel/../manufacturing/includes/work_order_issue_ui.inc:33
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:210
-#: /var/www/fa_unstable/devel/../purchasing/view/view_grn.php:40
-#: /var/www/fa_unstable/devel/../purchasing/view/view_po.php:45
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:102
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:105
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:110
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:291
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:429
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:440
-#: /var/www/fa_unstable/devel/../sales/view/view_credit.php:90
-#: /var/www/fa_unstable/devel/../sales/view/view_dispatch.php:112
-#: /var/www/fa_unstable/devel/../sales/view/view_invoice.php:114
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:199
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_credit_ui.inc:167
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:146
-msgid "Item Description"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../inventory/includes/item_adjustments_ui.inc:62
-#: /var/www/fa_unstable/devel/../inventory/includes/stock_transfers_ui.inc:60
-#: /var/www/fa_unstable/devel/../inventory/manage/item_codes.php:122
-#: /var/www/fa_unstable/devel/../inventory/manage/sales_kits.php:40
-#: /var/www/fa_unstable/devel/../inventory/view/view_adjustment.php:56
-#: /var/www/fa_unstable/devel/../inventory/view/view_transfer.php:56
-#: /var/www/fa_unstable/devel/../manufacturing/view/wo_issue_view.php:77
-#: /var/www/fa_unstable/devel/../manufacturing/manage/bom_edit.php:71
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:29
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:157
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:332
-#: /var/www/fa_unstable/devel/../manufacturing/includes/work_order_issue_ui.inc:33
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:474
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:210
-#: /var/www/fa_unstable/devel/../purchasing/view/view_grn.php:40
-#: /var/www/fa_unstable/devel/../purchasing/view/view_po.php:45
-#: /var/www/fa_unstable/devel/../reporting/rep301.php:99
-#: /var/www/fa_unstable/devel/../reporting/rep303.php:109
-#: /var/www/fa_unstable/devel/../reporting/rep303.php:115
-#: /var/www/fa_unstable/devel/../reporting/rep401.php:69
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:47
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:103
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:110
-#: /var/www/fa_unstable/devel/../sales/view/view_credit.php:90
-#: /var/www/fa_unstable/devel/../sales/view/view_dispatch.php:112
-#: /var/www/fa_unstable/devel/../sales/view/view_invoice.php:114
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:199
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_credit_ui.inc:167
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:146
+#: ../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:505
+#: ../purchasing/includes/ui/po_ui.inc:243
+#: ../purchasing/view/view_grn.php:40
+#: ../purchasing/view/view_po.php:45
+#: ../reporting/rep301.php:103
+#: ../reporting/rep303.php:109
+#: ../reporting/rep303.php:115
+#: ../reporting/rep401.php:69
+#: ../reporting/includes/doctext.inc:29
+#: ../reporting/includes/doctext.inc:192
+#: ../reporting/includes/doctext.inc:225
+#: ../sales/customer_invoice.php:539
+#: ../sales/view/view_credit.php:90
+#: ../sales/view/view_dispatch.php:112
+#: ../sales/view/view_invoice.php:115
+#: ../sales/view/view_sales_order.php:219
+#: ../sales/view/view_sales_order.php.orig:201
+#: ../sales/includes/ui/sales_credit_ui.inc:167
+#: ../sales/includes/ui/sales_order_ui.inc:140
+#: ../sales/includes/ui/sales_order_ui.inc.orig:140
 msgid "Quantity"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/includes/item_adjustments_ui.inc:63
-#: /var/www/fa_unstable/devel/../inventory/includes/stock_transfers_ui.inc:60
-#: /var/www/fa_unstable/devel/../inventory/manage/item_units.php:94
-#: /var/www/fa_unstable/devel/../manufacturing/includes/work_order_issue_ui.inc:34
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:211
-#: /var/www/fa_unstable/devel/../purchasing/view/view_grn.php:41
-#: /var/www/fa_unstable/devel/../purchasing/view/view_po.php:45
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:103
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:111
-#: /var/www/fa_unstable/devel/../sales/view/view_credit.php:91
-#: /var/www/fa_unstable/devel/../sales/view/view_dispatch.php:113
-#: /var/www/fa_unstable/devel/../sales/view/view_invoice.php:115
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:199
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_credit_ui.inc:167
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:148
+#: ../inventory/includes/item_adjustments_ui.inc:63
+#: ../inventory/includes/stock_transfers_ui.inc:60
+#: ../inventory/manage/item_units.php:94
+#: ../manufacturing/includes/work_order_issue_ui.inc:34
+#: ../purchasing/includes/ui/po_ui.inc:244
+#: ../purchasing/view/view_grn.php:41
+#: ../purchasing/view/view_po.php:45
+#: ../reporting/includes/doctext.inc:30
+#: ../reporting/includes/doctext.inc:192
+#: ../sales/view/view_credit.php:91
+#: ../sales/view/view_dispatch.php:113
+#: ../sales/view/view_invoice.php:116
+#: ../sales/view/view_sales_order.php:219
+#: ../sales/view/view_sales_order.php.orig:201
+#: ../sales/includes/ui/sales_credit_ui.inc:167
+#: ../sales/includes/ui/sales_order_ui.inc:142
+#: ../sales/includes/ui/sales_order_ui.inc.orig:142
 msgid "Unit"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/includes/item_adjustments_ui.inc:63
-#: /var/www/fa_unstable/devel/../inventory/view/view_adjustment.php:57
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:29
-#: /var/www/fa_unstable/devel/../manufacturing/includes/work_order_issue_ui.inc:34
-#: /var/www/fa_unstable/devel/../reporting/rep301.php:99
+#: ../inventory/includes/item_adjustments_ui.inc:63
+#: ../inventory/view/view_adjustment.php:57
+#: ../manufacturing/includes/manufacturing_ui.inc:29
+#: ../manufacturing/includes/work_order_issue_ui.inc:34
+#: ../reporting/rep301.php:103
 msgid "Unit Cost"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/includes/stock_transfers_ui.inc:35
-#: /var/www/fa_unstable/devel/../inventory/inquiry/stock_movements.php:51
-#: /var/www/fa_unstable/devel/../manufacturing/includes/work_order_issue_ui.inc:160
+#: ../inventory/includes/stock_transfers_ui.inc:35
+#: ../inventory/inquiry/stock_movements.php:56
+#: ../inventory/inquiry/stock_movements.php.orig:58
+#: ../manufacturing/includes/work_order_issue_ui.inc:164
 msgid "From Location:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/includes/stock_transfers_ui.inc:36
+#: ../inventory/includes/stock_transfers_ui.inc:36
 msgid "To Location:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/includes/stock_transfers_ui.inc:46
+#: ../inventory/includes/stock_transfers_ui.inc:46
 msgid "Transfer Type:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/includes/db/items_db.inc:119
+#: ../inventory/includes/db/items_db.inc:119
 msgid ""
 "Cannot delete this item because there are stock movements that refer to this "
 "item."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/includes/db/items_db.inc:122
+#: ../inventory/includes/db/items_db.inc:122
 msgid ""
 "Cannot delete this item record because there are bills of material that "
 "require this part as a component."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/includes/db/items_db.inc:125
-#: /var/www/fa_unstable/devel/../inventory/includes/db/items_db.inc:128
+#: ../inventory/includes/db/items_db.inc:125
+#: ../inventory/includes/db/items_db.inc:128
 msgid ""
 "Cannot delete this item because there are existing purchase order items for "
 "it."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/includes/db/items_db.inc:146
+#: ../inventory/includes/db/items_db.inc:146
 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 ""
 
-#: /var/www/fa_unstable/devel/../inventory/inquiry/stock_movements.php:27
+#: ../inventory/inquiry/stock_movements.php:26
+#: ../inventory/inquiry/stock_movements.php.orig:27
 msgid "Inventory Item Movement"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/inquiry/stock_movements.php:56
+#: ../inventory/inquiry/stock_movements.php:61
+#: ../inventory/inquiry/stock_movements.php.orig:63
 msgid "Show Movements"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/inquiry/stock_movements.php:56
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:443
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_allocation_inquiry.php:57
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_inquiry.php:54
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_allocation_inquiry.php:51
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_inquiry.php:54
+#: ../inventory/inquiry/stock_movements.php:61
+#: ../inventory/inquiry/stock_movements.php.orig:63
+#: ../purchasing/includes/ui/invoice_ui.inc:474
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:57
+#: ../purchasing/inquiry/supplier_inquiry.php:55
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:55
+#: ../sales/inquiry/customer_allocation_inquiry.php:51
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:51
+#: ../sales/inquiry/customer_inquiry.php:54
+#: ../sales/inquiry/customer_inquiry.php.orig:55
 msgid "Refresh Inquiry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/inquiry/stock_movements.php:70
+#: ../inventory/inquiry/stock_movements.php:77
+#: ../inventory/inquiry/stock_movements.php.orig:79
 msgid "Detail"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/inquiry/stock_movements.php:71
+#: ../inventory/inquiry/stock_movements.php:78
+#: ../inventory/inquiry/stock_movements.php.orig:80
 msgid "Quantity In"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/inquiry/stock_movements.php:71
+#: ../inventory/inquiry/stock_movements.php:78
+#: ../inventory/inquiry/stock_movements.php.orig:80
 msgid "Quantity Out"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/inquiry/stock_movements.php:86
+#: ../inventory/inquiry/stock_movements.php:93
+#: ../inventory/inquiry/stock_movements.php.orig:95
 msgid "Quantity on hand before"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/inquiry/stock_movements.php:174
+#: ../inventory/inquiry/stock_movements.php:181
+#: ../inventory/inquiry/stock_movements.php.orig:183
 msgid "Quantity on hand after"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/inquiry/stock_status.php:18
-#: /var/www/fa_unstable/devel/../inventory/inquiry/stock_status.php:20
+#: ../inventory/inquiry/stock_status.php:16
+#: ../inventory/inquiry/stock_status.php.orig:19
+#: ../inventory/inquiry/stock_status.php.orig:21
 msgid "Inventory Item Status"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/inquiry/stock_status.php:55
+#: ../inventory/inquiry/stock_status.php:56
+#: ../inventory/inquiry/stock_status.php.orig:62
 msgid ""
 "This is a service and cannot have a stock holding, only the total quantity "
 "on outstanding sales orders is shown."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/inquiry/stock_status.php:65
-#: /var/www/fa_unstable/devel/../inventory/inquiry/stock_status.php:70
-#: /var/www/fa_unstable/devel/../reporting/rep303.php:109
-#: /var/www/fa_unstable/devel/../reporting/rep303.php:115
+#: ../inventory/inquiry/stock_status.php:66
+#: ../inventory/inquiry/stock_status.php:71
+#: ../inventory/inquiry/stock_status.php.orig:72
+#: ../inventory/inquiry/stock_status.php.orig:77
+#: ../reporting/rep303.php:109
+#: ../reporting/rep303.php:115
 msgid "Demand"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/inquiry/stock_status.php:70
-#: /var/www/fa_unstable/devel/../reporting/rep303.php:109
-#: /var/www/fa_unstable/devel/../reporting/rep303.php:115
+#: ../inventory/inquiry/stock_status.php:71
+#: ../inventory/inquiry/stock_status.php.orig:77
+#: ../reporting/rep303.php:109
+#: ../reporting/rep303.php:115
 msgid "On Order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_categories.php:16
+#: ../inventory/manage/item_categories.php:16
 msgid "Item Categories"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_categories.php:34
+#: ../inventory/manage/item_categories.php:34
 msgid "The item category description cannot be empty."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_categories.php:48
+#: ../inventory/manage/item_categories.php:48
 msgid "Selected item category has been updated"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_categories.php:58
+#: ../inventory/manage/item_categories.php:58
 msgid "New item category has been added"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_categories.php:72
+#: ../inventory/manage/item_categories.php:72
 msgid ""
 "Cannot delete this item category because items have been created using this "
 "item category."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_categories.php:77
+#: ../inventory/manage/item_categories.php:77
 msgid "Selected item category has been deleted"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_categories.php:98
+#: ../inventory/manage/item_categories.php:98
 msgid "Tax type"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_categories.php:98
-#: /var/www/fa_unstable/devel/../inventory/manage/item_codes.php:122
-#: /var/www/fa_unstable/devel/../inventory/manage/sales_kits.php:40
-#: /var/www/fa_unstable/devel/../inventory/view/view_adjustment.php:57
-#: /var/www/fa_unstable/devel/../inventory/view/view_transfer.php:56
-#: /var/www/fa_unstable/devel/../manufacturing/view/wo_issue_view.php:77
-#: /var/www/fa_unstable/devel/../manufacturing/manage/bom_edit.php:71
-#: /var/www/fa_unstable/devel/../purchasing/po_receive_items.php:58
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:291
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:430
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:440
+#: ../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:440
+#: ../sales/customer_invoice.php:539
+#: ../sales/customer_invoice.php:542
 msgid "Units"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_categories.php:98
+#: ../inventory/manage/item_categories.php:98
 msgid "Sales Act"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_categories.php:99
+#: ../inventory/manage/item_categories.php:99
 msgid "Inventory Account"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_categories.php:99
+#: ../inventory/manage/item_categories.php:99
 msgid "COGS Account"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_categories.php:99
+#: ../inventory/manage/item_categories.php:99
 msgid "Adjustment Account"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_categories.php:100
+#: ../inventory/manage/item_categories.php:100
 msgid "Assembly Account"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_categories.php:180
+#: ../inventory/manage/item_categories.php:180
 msgid "Category Name:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_categories.php:182
+#: ../inventory/manage/item_categories.php:182
 msgid "Default values for new items"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_categories.php:184
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:335
+#: ../inventory/manage/item_categories.php:184
+#: ../inventory/manage/items.php:333
+#: ../inventory/manage/items.php.orig:326
 msgid "Item Tax Type:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_categories.php:186
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:337
+#: ../inventory/manage/item_categories.php:186
+#: ../inventory/manage/items.php:335
+#: ../inventory/manage/items.php.orig:328
 msgid "Item Type:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_categories.php:188
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:339
+#: ../inventory/manage/item_categories.php:188
+#: ../inventory/manage/items.php:337
+#: ../inventory/manage/items.php.orig:330
 msgid "Units of Measure:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_categories.php:190
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:343
+#: ../inventory/manage/item_categories.php:190
+#: ../inventory/manage/items.php:341
+#: ../inventory/manage/items.php.orig:334
 msgid "Exclude from sales:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_codes.php:16
+#: ../inventory/manage/item_codes.php:16
 msgid "Foreign Item Codes"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_codes.php:23
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:641
+#: ../inventory/manage/item_codes.php:23
+#: ../sales/sales_order_entry.php:670
 msgid "There are no inventory items defined in the system."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_codes.php:41
+#: ../inventory/manage/item_codes.php:41
 msgid "The price entered was not positive number."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_codes.php:47
-#: /var/www/fa_unstable/devel/../inventory/manage/sales_kits.php:78
+#: ../inventory/manage/item_codes.php:47
+#: ../inventory/manage/sales_kits.php:78
 msgid "Item code description cannot be empty."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_codes.php:55
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:150
-#: /var/www/fa_unstable/devel/../inventory/manage/sales_kits.php:88
+#: ../inventory/manage/item_codes.php:55
+#: ../inventory/manage/items.php:163
+#: ../inventory/manage/items.php.orig:156
+#: ../inventory/manage/sales_kits.php:88
 msgid "This item code is already assigned to stock item or sale kit."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_codes.php:67
+#: ../inventory/manage/item_codes.php:67
 msgid "New item code has been added."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_codes.php:73
+#: ../inventory/manage/item_codes.php:73
 msgid "Item code has been updated."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_codes.php:85
+#: ../inventory/manage/item_codes.php:85
 msgid "Item code has been sucessfully deleted."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_codes.php:122
+#: ../inventory/manage/item_codes.php:124
 msgid "EAN/UPC Code"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_codes.php:123
-#: /var/www/fa_unstable/devel/../reporting/rep104.php:115
-#: /var/www/fa_unstable/devel/../reporting/rep105.php:117
-#: /var/www/fa_unstable/devel/../reporting/rep301.php:99
-#: /var/www/fa_unstable/devel/../reporting/rep301.php:104
-#: /var/www/fa_unstable/devel/../reporting/rep302.php:122
-#: /var/www/fa_unstable/devel/../reporting/rep302.php:129
-#: /var/www/fa_unstable/devel/../reporting/rep303.php:121
-#: /var/www/fa_unstable/devel/../reporting/rep304.php:114
-#: /var/www/fa_unstable/devel/../reporting/rep304.php:122
+#: ../inventory/manage/item_codes.php:125
+#: ../reporting/rep104.php:115
+#: ../reporting/rep105.php:117
+#: ../reporting/rep301.php:103
+#: ../reporting/rep301.php:109
+#: ../reporting/rep302.php:122
+#: ../reporting/rep302.php:129
+#: ../reporting/rep303.php:121
+#: ../reporting/rep304.php:112
+#: ../reporting/rep304.php:120
 msgid "Category"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_codes.php:176
+#: ../inventory/manage/item_codes.php:178
 msgid "UPC/EAN code:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_codes.php:177
-#: /var/www/fa_unstable/devel/../inventory/manage/sales_kits.php:245
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_add_finished.php:199
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:422
-#: /var/www/fa_unstable/devel/../manufacturing/manage/bom_edit.php:228
+#: ../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
 msgid "Quantity:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_codes.php:178
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:310
-#: /var/www/fa_unstable/devel/../inventory/manage/movement_types.php:129
-#: /var/www/fa_unstable/devel/../inventory/manage/sales_kits.php:206
-#: /var/www/fa_unstable/devel/../inventory/manage/sales_kits.php:232
-#: /var/www/fa_unstable/devel/../manufacturing/manage/work_centres.php:138
-#: /var/www/fa_unstable/devel/../sales/manage/credit_status.php:145
-#: /var/www/fa_unstable/devel/../sales/manage/recurrent_invoices.php:147
-#: /var/www/fa_unstable/devel/../taxes/item_tax_types.php:168
-#: /var/www/fa_unstable/devel/../taxes/tax_groups.php:204
-#: /var/www/fa_unstable/devel/../taxes/tax_types.php:158
+#: ../inventory/manage/item_codes.php:180
+#: ../inventory/manage/items.php:308
+#: ../inventory/manage/items.php.orig:301
+#: ../inventory/manage/movement_types.php:129
+#: ../inventory/manage/sales_kits.php:206
+#: ../inventory/manage/sales_kits.php:232
+#: ../manufacturing/manage/work_centres.php:138
+#: ../sales/manage/credit_status.php:145
+#: ../sales/manage/recurrent_invoices.php:165
+#: ../taxes/item_tax_types.php:173
+#: ../taxes/tax_groups.php:162
+#: ../taxes/tax_groups.php.orig:164
+#: ../taxes/tax_groups.php.sav:164
+#: ../taxes/tax_types.php:158
 msgid "Description:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_codes.php:179
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:312
-#: /var/www/fa_unstable/devel/../inventory/manage/sales_kits.php:207
-#: /var/www/fa_unstable/devel/../inventory/manage/sales_kits.php:233
+#: ../inventory/manage/item_codes.php:181
+#: ../inventory/manage/items.php:310
+#: ../inventory/manage/items.php.orig:303
+#: ../inventory/manage/sales_kits.php:207
+#: ../inventory/manage/sales_kits.php:233
 msgid "Category:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:69
-msgid "Only jpg files are supported - a file extension of .jpg is expected"
+#: ../inventory/manage/items.php:82
+#: ../inventory/manage/items.php.orig:80
+msgid ""
+"Only graphics files are supported - a file extension of .jpg, .png or .gif "
+"is expected"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:100
+#: ../inventory/manage/items.php:113
+#: ../inventory/manage/items.php.orig:106
 msgid ""
 "There are no item categories defined in the system. At least one item "
 "category is required to add a item."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:102
+#: ../inventory/manage/items.php:115
+#: ../inventory/manage/items.php.orig:108
 msgid ""
 "There are no item tax types defined in the system. At least one item tax "
 "type is required to add a item."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:129
+#: ../inventory/manage/items.php:142
+#: ../inventory/manage/items.php.orig:135
 msgid "The item name must be entered."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:135
+#: ../inventory/manage/items.php:148
+#: ../inventory/manage/items.php.orig:141
 msgid "The item code cannot be empty"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:143
+#: ../inventory/manage/items.php:156
+#: ../inventory/manage/items.php.orig:149
 msgid ""
 "The item code cannot contain any of the following characters -  & + OR a "
 "space OR quotes"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:179
+#: ../inventory/manage/items.php:192
+#: ../inventory/manage/items.php.orig:185
 msgid "Item has been updated."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:192
+#: ../inventory/manage/items.php:205
+#: ../inventory/manage/items.php.orig:198
 msgid "A new item has been added."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:234
+#: ../inventory/manage/items.php:248
+#: ../inventory/manage/items.php.orig:241
 msgid "Selected item has been deleted."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:250
-msgid "Select an item:"
+#: ../inventory/manage/items.php:265
+#: ../inventory/manage/items.php.orig:258
+#: ../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:492
+#: ../purchasing/includes/ui/invoice_ui.inc:504
+#: ../reporting/rep204.php:82
+msgid "Item"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:251
-msgid "New item"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:268
-#: /var/www/fa_unstable/devel/../inventory/view/view_adjustment.php:56
-#: /var/www/fa_unstable/devel/../inventory/view/view_transfer.php:39
-#: /var/www/fa_unstable/devel/../inventory/view/view_transfer.php:56
-#: /var/www/fa_unstable/devel/../manufacturing/search_work_orders.php:163
-#: /var/www/fa_unstable/devel/../manufacturing/view/wo_issue_view.php:44
-#: /var/www/fa_unstable/devel/../manufacturing/view/wo_production_view.php:45
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:461
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:473
-#: /var/www/fa_unstable/devel/../reporting/rep204.php:82
-msgid "Item"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:273
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:303
+#: ../inventory/manage/items.php:270
+#: ../inventory/manage/items.php:301
+#: ../inventory/manage/items.php.orig:263
+#: ../inventory/manage/items.php.orig:294
 msgid "Item Code:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:341
+#: ../inventory/manage/items.php:339
+#: ../inventory/manage/items.php.orig:332
 msgid "Editable description:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:361
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:249
+#: ../inventory/manage/items.php:359
+#: ../inventory/manage/items.php.orig:352
+#: ../sales/manage/customer_branches.php:249
 msgid "GL Accounts"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:384
+#: ../inventory/manage/items.php:382
+#: ../inventory/manage/items.php.orig:375
 msgid "Other"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:387
+#: ../inventory/manage/items.php:385
+#: ../inventory/manage/items.php.orig:378
 msgid "Image File (.jpg)"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:402
+#: ../inventory/manage/items.php:400
+#: ../inventory/manage/items.php.orig:393
 msgid "No image"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:407
+#: ../inventory/manage/items.php:405
+#: ../inventory/manage/items.php.orig:398
 msgid "Delete Image:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:409
+#: ../inventory/manage/items.php:407
+#: ../inventory/manage/items.php.orig:400
 msgid "Item status:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:415
+#: ../inventory/manage/items.php:413
+#: ../inventory/manage/items.php.orig:406
 msgid "Insert New Item"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:419
+#: ../inventory/manage/items.php:417
+#: ../inventory/manage/items.php.orig:410
 msgid "Update Item"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:422
+#: ../inventory/manage/items.php:420
+#: ../inventory/manage/items.php.orig:413
 msgid "Select this items and return to document entry."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:423
+#: ../inventory/manage/items.php:421
+#: ../inventory/manage/items.php.orig:414
 msgid "Clone This Item"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/items.php:424
+#: ../inventory/manage/items.php:422
+#: ../inventory/manage/items.php.orig:415
 msgid "Delete This Item"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_units.php:16
+#: ../inventory/manage/items.php:437
+#: ../inventory/manage/items.php.orig:430
+msgid "Select an item:"
+msgstr ""
+
+#: ../inventory/manage/items.php:438
+#: ../inventory/manage/items.php.orig:431
+msgid "New item"
+msgstr ""
+
+#: ../inventory/manage/items.php:461
+#: ../inventory/manage/items.php.orig:454
+#: ../purchasing/manage/suppliers.php:308
+#: ../purchasing/manage/suppliers.php.orig:311
+#: ../sales/manage/customer_branches.php:324
+#: ../sales/manage/customers.php:342
+#: ../sales/manage/sav.customers.php:342
+msgid "&General settings"
+msgstr ""
+
+#: ../inventory/manage/items.php:462
+#: ../inventory/manage/items.php.orig:455
+#: ../purchasing/manage/suppliers.php:310
+#: ../purchasing/manage/suppliers.php.orig:313
+#: ../sales/manage/customers.php:344
+#: ../sales/manage/sav.customers.php:344
+msgid "&Transactions"
+msgstr ""
+
+#: ../inventory/manage/items.php:463
+#: ../inventory/manage/items.php.orig:456
+msgid "&Status"
+msgstr ""
+
+#: ../inventory/manage/item_units.php:16
 msgid "Units of Measure"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_units.php:34
+#: ../inventory/manage/item_units.php:34
 msgid "The unit of measure code cannot be empty."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_units.php:40
+#: ../inventory/manage/item_units.php:40
 msgid "The unit of measure code is too long."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_units.php:46
+#: ../inventory/manage/item_units.php:46
 msgid "The unit of measure description cannot be empty."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_units.php:53
+#: ../inventory/manage/item_units.php:53
 msgid "Selected unit has been updated"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_units.php:55
+#: ../inventory/manage/item_units.php:55
 msgid "New unit has been added"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_units.php:69
+#: ../inventory/manage/item_units.php:69
 msgid ""
 "Cannot delete this unit of measure because items have been created using "
 "this unit."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_units.php:75
+#: ../inventory/manage/item_units.php:75
 msgid "Selected unit has been deleted"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_units.php:94
+#: ../inventory/manage/item_units.php:94
 msgid "Decimals"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_units.php:107
-#: /var/www/fa_unstable/devel/../inventory/manage/item_units.php:142
+#: ../inventory/manage/item_units.php:107
+#: ../inventory/manage/item_units.php:142
 msgid "User Quantity Decimals"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_units.php:136
-#: /var/www/fa_unstable/devel/../inventory/manage/item_units.php:139
+#: ../inventory/manage/item_units.php:136
+#: ../inventory/manage/item_units.php:139
 msgid "Unit Abbreviation:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_units.php:140
+#: ../inventory/manage/item_units.php:140
 msgid "Descriptive Name:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/item_units.php:142
+#: ../inventory/manage/item_units.php:142
 msgid "Decimal Places:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/locations.php:16
+#: ../inventory/manage/locations.php:16
 msgid "Inventory Locations"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/locations.php:39
+#: ../inventory/manage/locations.php:39
 msgid ""
 "The location code must be five characters or less long (including converted "
 "special chars)."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/locations.php:45
+#: ../inventory/manage/locations.php:45
 msgid "The location name must be entered."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/locations.php:56
+#: ../inventory/manage/locations.php:56
 msgid "Selected location has been updated"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/locations.php:65
+#: ../inventory/manage/locations.php:65
 msgid "New location has been added"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/locations.php:76
+#: ../inventory/manage/locations.php:76
 msgid ""
 "Cannot delete this location because item movements have been created using "
 "this location."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/locations.php:82
+#: ../inventory/manage/locations.php:82
 msgid ""
 "Cannot delete this location because it is used by some work orders records."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/locations.php:88
+#: ../inventory/manage/locations.php:88
 msgid ""
 "Cannot delete this location because it is used by some branch records as the "
 "default location to deliver from."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/locations.php:94
-#: /var/www/fa_unstable/devel/../inventory/manage/locations.php:100
-#: /var/www/fa_unstable/devel/../inventory/manage/locations.php:105
-#: /var/www/fa_unstable/devel/../inventory/manage/locations.php:110
-#: /var/www/fa_unstable/devel/../inventory/manage/locations.php:115
+#: ../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
 msgid ""
 "Cannot delete this location because it is used by some related records in "
 "other tables."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/locations.php:129
+#: ../inventory/manage/locations.php:129
 msgid "Selected location has been deleted"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/locations.php:146
+#: ../inventory/manage/locations.php:146
 msgid "Location Code"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/locations.php:146
+#: ../inventory/manage/locations.php:146
 msgid "Location Name"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/locations.php:192
-#: /var/www/fa_unstable/devel/../inventory/manage/locations.php:196
+#: ../inventory/manage/locations.php:192
+#: ../inventory/manage/locations.php:196
 msgid "Location Code:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/locations.php:199
+#: ../inventory/manage/locations.php:199
 msgid "Location Name:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/locations.php:200
+#: ../inventory/manage/locations.php:200
 msgid "Contact for deliveries:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/locations.php:204
+#: ../inventory/manage/locations.php:204
 msgid "Telephone No:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/locations.php:206
+#: ../inventory/manage/locations.php:206
 msgid "Facsimile No:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/movement_types.php:16
+#: ../inventory/manage/movement_types.php:16
 msgid "Inventory Movement Types"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/movement_types.php:34
+#: ../inventory/manage/movement_types.php:34
 msgid "The inventory movement type name cannot be empty."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/movement_types.php:43
+#: ../inventory/manage/movement_types.php:43
 msgid "Selected movement type has been updated"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/movement_types.php:48
+#: ../inventory/manage/movement_types.php:48
 msgid "New movement type has been added"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/movement_types.php:61
+#: ../inventory/manage/movement_types.php:61
 msgid ""
 "Cannot delete this inventory movement type because item transactions have "
 "been created referring to it."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/movement_types.php:76
+#: ../inventory/manage/movement_types.php:76
 msgid "Selected movement type has been deleted"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/sales_kits.php:16
+#: ../inventory/manage/sales_kits.php:16
 msgid "Sales Kits & Alias Codes"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/sales_kits.php:40
+#: ../inventory/manage/sales_kits.php:40
 msgid "Stock Item"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/sales_kits.php:54
+#: ../inventory/manage/sales_kits.php:54
 msgid "kit"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/sales_kits.php:72
-#: /var/www/fa_unstable/devel/../manufacturing/manage/bom_edit.php:101
+#: ../inventory/manage/sales_kits.php:72
+#: ../manufacturing/manage/bom_edit.php:101
 msgid "The quantity entered must be numeric and greater than zero."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/sales_kits.php:93
+#: ../inventory/manage/sales_kits.php:93
 msgid "Kit/alias code cannot be empty."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/sales_kits.php:101
+#: ../inventory/manage/sales_kits.php:101
 msgid ""
 "The selected component contains directly or on any lower level the kit under "
 "edition. Recursive kits are not allowed."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/sales_kits.php:108
+#: ../inventory/manage/sales_kits.php:108
 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 ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/sales_kits.php:116
+#: ../inventory/manage/sales_kits.php:116
 msgid "New alias code has been created."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/sales_kits.php:119
+#: ../inventory/manage/sales_kits.php:119
 msgid "New component has been added to selected kit."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/sales_kits.php:129
+#: ../inventory/manage/sales_kits.php:129
 msgid "Component of selected kit has been updated."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/sales_kits.php:139
+#: ../inventory/manage/sales_kits.php:139
 msgid "Kit common properties has been updated"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/sales_kits.php:157
+#: ../inventory/manage/sales_kits.php:157
 msgid ""
 "This item cannot be deleted because it is the last item in the kit used by "
 "following kits"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/sales_kits.php:168
-#: /var/www/fa_unstable/devel/../manufacturing/manage/bom_edit.php:153
+#: ../inventory/manage/sales_kits.php:168
+#: ../manufacturing/manage/bom_edit.php:153
 msgid "The component item has been deleted from this bom"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/sales_kits.php:183
+#: ../inventory/manage/sales_kits.php:183
 msgid "Select a sale kit:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/sales_kits.php:184
+#: ../inventory/manage/sales_kits.php:184
 msgid "New kit"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/sales_kits.php:199
+#: ../inventory/manage/sales_kits.php:199
 msgid "Alias/kit code:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/sales_kits.php:208
+#: ../inventory/manage/sales_kits.php:208
 msgid "Update kit/alias name"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/sales_kits.php:223
-#: /var/www/fa_unstable/devel/../manufacturing/manage/bom_edit.php:204
-#: /var/www/fa_unstable/devel/../manufacturing/manage/bom_edit.php:211
+#: ../inventory/manage/sales_kits.php:223
+#: ../manufacturing/manage/bom_edit.php:204
+#: ../manufacturing/manage/bom_edit.php:211
 msgid "Component:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/manage/sales_kits.php:237
+#: ../inventory/manage/sales_kits.php:237
 msgid "kits"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/view/view_adjustment.php:17
+#: ../inventory/view/view_adjustment.php:17
 msgid "View Inventory Adjustment"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/view/view_adjustment.php:43
+#: ../inventory/view/view_adjustment.php:43
 msgid "At Location"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/view/view_adjustment.php:46
-#: /var/www/fa_unstable/devel/../inventory/view/view_transfer.php:46
+#: ../inventory/view/view_adjustment.php:46
+#: ../inventory/view/view_transfer.php:46
 msgid "Adjustment Type"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/view/view_adjustment.php:73
+#: ../inventory/view/view_adjustment.php:73
 msgid "This adjustment has been voided."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/view/view_transfer.php:17
+#: ../inventory/view/view_transfer.php:17
 msgid "View Inventory Transfer"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/view/view_transfer.php:40
-#: /var/www/fa_unstable/devel/../manufacturing/view/wo_issue_view.php:44
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:29
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:83
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:106
+#: ../inventory/view/view_transfer.php:40
+#: ../manufacturing/view/wo_issue_view.php:44
+#: ../manufacturing/includes/manufacturing_ui.inc:29
+#: ../manufacturing/includes/manufacturing_ui.inc:83
+#: ../reporting/includes/doctext.inc:229
 msgid "From Location"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../inventory/view/view_transfer.php:41
+#: ../inventory/view/view_transfer.php:41
 msgid "To Location"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/search_work_orders.php:26
+#: ../manufacturing/search_work_orders.php:26
 msgid "Search Outstanding Work Orders"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/search_work_orders.php:31
+#: ../manufacturing/search_work_orders.php:31
 msgid "Search Work Orders"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/search_work_orders.php:69
+#: ../manufacturing/search_work_orders.php:69
 msgid "at Location:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/search_work_orders.php:76
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search_completed.php:67
+#: ../manufacturing/search_work_orders.php:76
+#: ../purchasing/inquiry/po_search_completed.php:72
+#: ../purchasing/inquiry/po_search_completed.php.orig:73
 msgid "for item:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/search_work_orders.php:78
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search_completed.php:69
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search.php:71
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_deliveries_view.php:111
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:238
+#: ../manufacturing/search_work_orders.php:78
+#: ../purchasing/inquiry/po_search_completed.php:74
+#: ../purchasing/inquiry/po_search_completed.php.orig:75
+#: ../purchasing/inquiry/po_search.php:76
+#: ../sales/inquiry/sales_deliveries_view.php:116
+#: ../sales/inquiry/sales_deliveries_view.php.orig:116
+#: ../sales/inquiry/sales_orders_view.php:269
+#: ../sales/inquiry/sales_orders_view.php.orig:246
 msgid "Select documents"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/search_work_orders.php:117
+#: ../manufacturing/search_work_orders.php:117
 msgid "Release"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/search_work_orders.php:120
+#: ../manufacturing/search_work_orders.php:120
 msgid "Issue"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/search_work_orders.php:127
+#: ../manufacturing/search_work_orders.php:127
 msgid "Produce"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/search_work_orders.php:140
+#: ../manufacturing/search_work_orders.php:140
 msgid "Costs"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/search_work_orders.php:164
+#: ../manufacturing/search_work_orders.php:164
 msgid "Required"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/search_work_orders.php:167
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:277
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:281
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:44
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:259
+#: ../manufacturing/search_work_orders.php:167
+#: ../manufacturing/includes/manufacturing_ui.inc:277
+#: ../manufacturing/includes/manufacturing_ui.inc:281
+#: ../reporting/includes/doctext.inc:227
+#: ../sales/inquiry/sales_orders_view.php:290
+#: ../sales/inquiry/sales_orders_view.php.orig:267
 msgid "Required By"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/search_work_orders.php:176
+#: ../manufacturing/search_work_orders.php:176
 msgid "Marked orders are overdue."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_add_finished.php:29
+#: ../manufacturing/work_order_add_finished.php:29
 msgid "Produce or Unassemble Finished Items From Work Order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_add_finished.php:44
+#: ../manufacturing/work_order_add_finished.php:44
 msgid "The manufacturing process has been entered."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_add_finished.php:46
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_costs.php:45
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:56
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_issue.php:37
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_release.php:72
+#: ../manufacturing/work_order_add_finished.php:46
+#: ../manufacturing/work_order_costs.php:45
+#: ../manufacturing/work_order_entry.php:56
+#: ../manufacturing/work_order_issue.php:40
+#: ../manufacturing/work_order_release.php:72
 msgid "View this Work Order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_add_finished.php:48
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_costs.php:47
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:65
+#: ../manufacturing/work_order_add_finished.php:48
+#: ../manufacturing/work_order_entry.php:65
+#: ../manufacturing/work_order_issue.php:42
 msgid "View the GL Journal Entries for this Work Order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_add_finished.php:50
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:67
+#: ../manufacturing/work_order_add_finished.php:50
+#: ../manufacturing/work_order_entry.php:67
 msgid "Print the GL Journal Entries for this Work Order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_add_finished.php:52
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_costs.php:51
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_issue.php:39
+#: ../manufacturing/work_order_add_finished.php:52
+#: ../manufacturing/work_order_costs.php:49
+#: ../manufacturing/work_order_issue.php:44
 msgid "Select another &Work Order to Process"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_add_finished.php:64
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_costs.php:63
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:340
-#: /var/www/fa_unstable/devel/../manufacturing/includes/db/work_order_issues_db.inc:25
-#: /var/www/fa_unstable/devel/../manufacturing/includes/db/work_order_produce_items_db.inc:22
+#: ../manufacturing/work_order_add_finished.php:65
+#: ../manufacturing/work_order_costs.php:62
+#: ../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
 msgid "The order number sent is not valid."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_add_finished.php:90
+#: ../manufacturing/work_order_add_finished.php:91
 msgid "The quantity entered is not a valid number or less then zero."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_add_finished.php:109
+#: ../manufacturing/work_order_add_finished.php:110
 msgid ""
 "The production date cannot be before the release date of the work order."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_add_finished.php:122
+#: ../manufacturing/work_order_add_finished.php:117
+msgid ""
+"The production exceeds the quantity needed. Please change the Work Order."
+msgstr ""
+
+#: ../manufacturing/work_order_add_finished.php:129
 msgid ""
 "The unassembling cannot be processed because there is insufficient stock."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_add_finished.php:140
+#: ../manufacturing/work_order_add_finished.php:147
 msgid ""
 "The production cannot be processed because a required item would cause a "
 "negative inventory balance :"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_add_finished.php:197
+#: ../manufacturing/work_order_add_finished.php:204
 msgid "Produce Finished Items"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_add_finished.php:197
+#: ../manufacturing/work_order_add_finished.php:204
 msgid "Return Items to Work Order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_add_finished.php:207
-#: /var/www/fa_unstable/devel/../purchasing/allocations/supplier_allocate.php:65
-#: /var/www/fa_unstable/devel/../sales/allocations/customer_allocate.php:64
+#: ../manufacturing/work_order_add_finished.php:214
+#: ../purchasing/allocations/supplier_allocate.php:65
+#: ../sales/allocations/customer_allocate.php:64
 msgid "Process"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_add_finished.php:208
+#: ../manufacturing/work_order_add_finished.php:215
 msgid "Process And Close Order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_costs.php:29
+#: ../manufacturing/work_order_costs.php:29
 msgid "Work Order Additional Costs"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_costs.php:43
+#: ../manufacturing/work_order_costs.php:43
 msgid "The additional cost has been entered."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_costs.php:49
+#: ../manufacturing/work_order_costs.php:47
 msgid "Enter another additional cost."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_costs.php:75
+#: ../manufacturing/work_order_costs.php:73
 msgid "The amount entered is not a valid number or less then zero."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_costs.php:94
+#: ../manufacturing/work_order_costs.php:92
 msgid ""
 "The additional cost date cannot be before the release date of the work order."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_costs.php:149
+#: ../manufacturing/work_order_costs.php:143
 msgid "Additional Costs:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_costs.php:150
+#: ../manufacturing/work_order_costs.php:144
 msgid "Debit Account"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_costs.php:157
+#: ../manufacturing/work_order_costs.php:151
 msgid "Process Additional Cost"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:29
+#: ../manufacturing/work_order_entry.php:29
 msgid "Work Order Entry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:32
+#: ../manufacturing/work_order_entry.php:32
 msgid "There are no manufacturable items defined in the system."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:54
+#: ../manufacturing/work_order_entry.php:54
 msgid "The work order been added."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:62
+#: ../manufacturing/work_order_entry.php:62
 msgid "Print this Work Order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:64
+#: ../manufacturing/work_order_entry.php:64
 msgid "Email this Work Order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:79
+#: ../manufacturing/work_order_entry.php:80
 msgid "The work order been updated."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:89
+#: ../manufacturing/work_order_entry.php:90
 msgid "Work order has been deleted."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:99
+#: ../manufacturing/work_order_entry.php:100
 msgid ""
 "This work order has been closed. There can be no more issues against it."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:109
+#: ../manufacturing/work_order_entry.php:110
 msgid "Enter a new work order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:110
+#: ../manufacturing/work_order_entry.php:111
 msgid "Select an existing work order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:146
+#: ../manufacturing/work_order_entry.php:147
 msgid "The quantity entered is invalid or less than zero."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:168
+#: ../manufacturing/work_order_entry.php:169
 msgid "The selected item to manufacture does not have a bom."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:177
+#: ../manufacturing/work_order_entry.php:178
 msgid "The labour cost entered is invalid or less than zero."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:185
+#: ../manufacturing/work_order_entry.php:186
 msgid "The cost entered is invalid or less than zero."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:208
+#: ../manufacturing/work_order_entry.php:209
 msgid ""
 "The work order cannot be processed because there is an insufficient quantity "
 "for component:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:222
+#: ../manufacturing/work_order_entry.php:223
 msgid ""
 "The selected item cannot be unassembled because there is insufficient stock."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:248
+#: ../manufacturing/work_order_entry.php:249
 msgid ""
 "The quantity cannot be changed to be less than the quantity already "
 "manufactured for this order."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:297
+#: ../manufacturing/work_order_entry.php:298
 msgid ""
 "This work order cannot be deleted because it has already been processed."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:348
+#: ../manufacturing/work_order_entry.php:349
 msgid "This work order is closed and cannot be edited."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:395
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:403
+#: ../manufacturing/work_order_entry.php:397
+#: ../manufacturing/work_order_entry.php:405
 msgid "Destination Location:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:414
+#: ../manufacturing/work_order_entry.php:416
 msgid "Quantity Required:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:416
+#: ../manufacturing/work_order_entry.php:418
 msgid "Quantity Manufactured:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:435
+#: ../manufacturing/work_order_entry.php:437
 msgid "Credit Labour Account"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:442
+#: ../manufacturing/work_order_entry.php:444
 msgid "Credit Overhead Account"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:447
+#: ../manufacturing/work_order_entry.php:449
 msgid "Released On:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:457
+#: ../manufacturing/work_order_entry.php:459
 msgid "Save changes to work order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:460
+#: ../manufacturing/work_order_entry.php:462
 msgid "Close This Work Order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:462
+#: ../manufacturing/work_order_entry.php:464
 msgid "Delete This Work Order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_entry.php:468
+#: ../manufacturing/work_order_entry.php:470
 msgid "Add Workorder"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_issue.php:29
+#: ../manufacturing/work_order_issue.php:31
 msgid "Issue Items to Work Order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_issue.php:35
+#: ../manufacturing/work_order_issue.php:38
 msgid "The work order issue has been entered."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_issue.php:76
+#: ../manufacturing/work_order_issue.php:78
 msgid "The entered date for the issue is invalid."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_issue.php:103
+#: ../manufacturing/work_order_issue.php:106
 msgid ""
 "The issue cannot be processed because an entered item would cause a negative "
 "inventory balance :"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_issue.php:121
+#: ../manufacturing/work_order_issue.php:124
 msgid ""
 "The process cannot be completed because there is an insufficient total "
 "quantity for a component."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_issue.php:122
+#: ../manufacturing/work_order_issue.php:125
 msgid "Component is :"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_issue.php:123
+#: ../manufacturing/work_order_issue.php:126
 msgid "From location :"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_issue.php:216
+#: ../manufacturing/work_order_issue.php:219
 msgid "Items to Issue"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_issue.php:222
+#: ../manufacturing/work_order_issue.php:225
 msgid "Process Issue"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_release.php:27
+#: ../manufacturing/work_order_release.php:27
 msgid "Work Order Release to Manufacturing"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_release.php:49
+#: ../manufacturing/work_order_release.php:49
 msgid "This work order has already been released."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_release.php:57
+#: ../manufacturing/work_order_release.php:57
 msgid ""
 "This Work Order cannot be released. The selected item to manufacture does "
 "not have a bom."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_release.php:70
+#: ../manufacturing/work_order_release.php:70
 msgid "The work order has been released to manufacturing."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_release.php:74
+#: ../manufacturing/work_order_release.php:74
 msgid "Select another &work order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_release.php:94
+#: ../manufacturing/work_order_release.php:95
 msgid "Work Order #:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_release.php:95
+#: ../manufacturing/work_order_release.php:96
 msgid "Work Order Reference:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_release.php:97
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:278
+#: ../manufacturing/work_order_release.php:98
+#: ../manufacturing/includes/manufacturing_ui.inc:278
 msgid "Released Date"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/work_order_release.php:103
+#: ../manufacturing/work_order_release.php:104
 msgid "Release Work Order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/view/wo_issue_view.php:19
+#: ../manufacturing/view/wo_costs_view.php:20
+msgid "View Work Order Costs"
+msgstr ""
+
+#: ../manufacturing/view/wo_costs_view.php:62
+#, php-format
+msgid "Production Costs for Work Order # %d"
+msgstr ""
+
+#: ../manufacturing/view/wo_issue_view.php:19
 msgid "View Work Order Issue"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/view/wo_issue_view.php:43
+#: ../manufacturing/view/wo_issue_view.php:43
 msgid "Issue #"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/view/wo_issue_view.php:43
-#: /var/www/fa_unstable/devel/../manufacturing/view/wo_production_view.php:44
+#: ../manufacturing/view/wo_issue_view.php:43
+#: ../manufacturing/view/wo_production_view.php:44
 msgid "For Work Order #"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/view/wo_issue_view.php:44
+#: ../manufacturing/view/wo_issue_view.php:44
 msgid "To Work Centre"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/view/wo_issue_view.php:44
+#: ../manufacturing/view/wo_issue_view.php:44
 msgid "Date of Issue"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/view/wo_issue_view.php:61
+#: ../manufacturing/view/wo_issue_view.php:61
 msgid "This issue has been voided."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/view/wo_issue_view.php:72
+#: ../manufacturing/view/wo_issue_view.php:72
 msgid "There are no items for this issue."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/view/wo_issue_view.php:77
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:28
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:83
-#: /var/www/fa_unstable/devel/../reporting/rep401.php:69
-#: /var/www/fa_unstable/devel/../reporting/rep401.php:74
+#: ../manufacturing/view/wo_issue_view.php:77
+#: ../manufacturing/includes/manufacturing_ui.inc:28
+#: ../manufacturing/includes/manufacturing_ui.inc:83
+#: ../reporting/rep401.php:69
+#: ../reporting/rep401.php:74
 msgid "Component"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/view/wo_issue_view.php:114
+#: ../manufacturing/view/wo_issue_view.php:114
 msgid "Items for this Issue"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/view/wo_production_view.php:20
+#: ../manufacturing/view/wo_production_view.php:20
 msgid "View Work Order Production"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/view/wo_production_view.php:44
+#: ../manufacturing/view/wo_production_view.php:44
 msgid "Production #"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/view/wo_production_view.php:45
+#: ../manufacturing/view/wo_production_view.php:45
 msgid "Quantity Manufactured"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/view/wo_production_view.php:61
+#: ../manufacturing/view/wo_production_view.php:61
 msgid "This production has been voided."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/view/work_order_view.php:26
+#: ../manufacturing/view/work_order_view.php:26
 msgid "View Work Order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/view/work_order_view.php:51
+#: ../manufacturing/view/work_order_view.php:51
 msgid "BOM for item:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/view/work_order_view.php:56
-#: /var/www/fa_unstable/devel/../reporting/rep409.php:93
+#: ../manufacturing/view/work_order_view.php:56
+#: ../reporting/rep409.php:91
 msgid "Work Order Requirements"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/view/work_order_view.php:61
+#: ../manufacturing/view/work_order_view.php:61
 msgid "Issues"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/view/work_order_view.php:64
+#: ../manufacturing/view/work_order_view.php:64
 msgid "Productions"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/view/work_order_view.php:67
-#: /var/www/fa_unstable/devel/../manufacturing/view/work_order_view.php:74
+#: ../manufacturing/view/work_order_view.php:67
+#: ../manufacturing/view/work_order_view.php:74
 msgid "Additional Costs"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/view/work_order_view.php:82
+#: ../manufacturing/view/work_order_view.php:82
 msgid "This work order has been voided."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/inquiry/bom_cost_inquiry.php:24
-#: /var/www/fa_unstable/devel/../manufacturing/manage/bom_edit.php:24
+#: ../manufacturing/inquiry/bom_cost_inquiry.php:24
+#: ../manufacturing/manage/bom_edit.php:24
 msgid "There are no manufactured or kit items defined in the system."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/inquiry/bom_cost_inquiry.php:35
-#: /var/www/fa_unstable/devel/../manufacturing/manage/bom_edit.php:170
+#: ../manufacturing/inquiry/bom_cost_inquiry.php:35
+#: ../manufacturing/manage/bom_edit.php:170
 msgid "Select a manufacturable item:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/inquiry/bom_cost_inquiry.php:38
+#: ../manufacturing/inquiry/bom_cost_inquiry.php:38
 msgid "All Costs Are In:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/inquiry/where_used_inquiry.php:17
+#: ../manufacturing/inquiry/where_used_inquiry.php:17
 msgid "Inventory Item Where Used Inquiry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/inquiry/where_used_inquiry.php:28
+#: ../manufacturing/inquiry/where_used_inquiry.php:28
 msgid "Select an item to display its parent item(s)."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/inquiry/where_used_inquiry.php:43
+#: ../manufacturing/inquiry/where_used_inquiry.php:43
 msgid "Parent Item"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/inquiry/where_used_inquiry.php:44
-#: /var/www/fa_unstable/devel/../manufacturing/manage/bom_edit.php:71
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:28
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:83
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:106
+#: ../manufacturing/inquiry/where_used_inquiry.php:44
+#: ../manufacturing/manage/bom_edit.php:71
+#: ../manufacturing/includes/manufacturing_ui.inc:28
+#: ../manufacturing/includes/manufacturing_ui.inc:83
+#: ../reporting/includes/doctext.inc:229
 msgid "Work Centre"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/inquiry/where_used_inquiry.php:46
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:277
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:281
+#: ../manufacturing/inquiry/where_used_inquiry.php:46
+#: ../manufacturing/includes/manufacturing_ui.inc:277
+#: ../manufacturing/includes/manufacturing_ui.inc:281
 msgid "Quantity Required"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/manage/bom_edit.php:16
+#: ../manufacturing/manage/bom_edit.php:16
 msgid "Bill Of Materials"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/manage/bom_edit.php:26
+#: ../manufacturing/manage/bom_edit.php:26
 msgid ""
 "There are no work centres defined in the system. BOMs require at least one "
 "work centre be defined."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/manage/bom_edit.php:70
-#: /var/www/fa_unstable/devel/../reporting/rep105.php:112
+#: ../manufacturing/manage/bom_edit.php:70
+#: ../reporting/rep105.php:112
 msgid "Code"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/manage/bom_edit.php:110
+#: ../manufacturing/manage/bom_edit.php:110
 msgid "Selected component has been updated"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/manage/bom_edit.php:130
+#: ../manufacturing/manage/bom_edit.php:130
 msgid ""
 "A new component part has been added to the bill of material for this item."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/manage/bom_edit.php:136
+#: ../manufacturing/manage/bom_edit.php:136
 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 ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/manage/bom_edit.php:142
+#: ../manufacturing/manage/bom_edit.php:142
 msgid ""
 "The selected component is a parent of the current item. Recursive BOMs are "
 "not allowed."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/manage/bom_edit.php:224
+#: ../manufacturing/manage/bom_edit.php:224
 msgid "Location to Draw From:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/manage/bom_edit.php:225
+#: ../manufacturing/manage/bom_edit.php:225
 msgid "Work Centre Added:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/manage/work_centres.php:16
+#: ../manufacturing/manage/work_centres.php:16
 msgid "Work Centres"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/manage/work_centres.php:34
+#: ../manufacturing/manage/work_centres.php:34
 msgid "The work centre name cannot be empty."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/manage/work_centres.php:44
+#: ../manufacturing/manage/work_centres.php:44
 msgid "Selected work center has been updated"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/manage/work_centres.php:49
+#: ../manufacturing/manage/work_centres.php:49
 msgid "New work center has been added"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/manage/work_centres.php:61
+#: ../manufacturing/manage/work_centres.php:61
 msgid ""
 "Cannot delete this work centre because BOMs have been created referring to "
 "it."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/manage/work_centres.php:67
+#: ../manufacturing/manage/work_centres.php:67
 msgid ""
 "Cannot delete this work centre because work order requirements have been "
 "created referring to it."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/manage/work_centres.php:83
+#: ../manufacturing/manage/work_centres.php:83
 msgid "Selected work center has been deleted"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/manage/work_centres.php:101
+#: ../manufacturing/manage/work_centres.php:101
 msgid "description"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:22
+#: ../manufacturing/includes/manufacturing_ui.inc:22
 msgid "The bill of material for this item is empty."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:29
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:61
+#: ../manufacturing/includes/manufacturing_ui.inc:29
+#: ../manufacturing/includes/manufacturing_ui.inc:61
 msgid "Total Cost"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:77
+#: ../manufacturing/includes/manufacturing_ui.inc:77
 msgid "There are no Requirements for this Order."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:84
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:106
+#: ../manufacturing/includes/manufacturing_ui.inc:84
+#: ../reporting/includes/doctext.inc:229
 msgid "Unit Quantity"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:84
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:106
+#: ../manufacturing/includes/manufacturing_ui.inc:84
+#: ../reporting/includes/doctext.inc:229
 msgid "Total Quantity"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:84
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:106
+#: ../manufacturing/includes/manufacturing_ui.inc:84
+#: ../reporting/includes/doctext.inc:229
 msgid "Units Issued"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:84
+#: ../manufacturing/includes/manufacturing_ui.inc:84
 msgid "On Hand"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:138
+#: ../manufacturing/includes/manufacturing_ui.inc:138
 msgid "Marked items have insufficient quantities in stock."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:152
+#: ../manufacturing/includes/manufacturing_ui.inc:152
 msgid "There are no Productions for this Order."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:195
+#: ../manufacturing/includes/manufacturing_ui.inc:195
 msgid "There are no Issues for this Order."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:231
+#: ../manufacturing/includes/manufacturing_ui.inc:231
 msgid "There are no additional costs for this Order."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:269
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:325
+#: ../manufacturing/includes/manufacturing_ui.inc:269
+#: ../manufacturing/includes/manufacturing_ui.inc:325
 msgid "The work order number sent is not valid."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:276
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:280
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:331
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:43
+#: ../manufacturing/includes/manufacturing_ui.inc:276
+#: ../manufacturing/includes/manufacturing_ui.inc:280
+#: ../manufacturing/includes/manufacturing_ui.inc:331
+#: ../reporting/includes/doctext.inc:223
 msgid "Manufactured Item"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:277
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:281
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:332
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:46
+#: ../manufacturing/includes/manufacturing_ui.inc:277
+#: ../manufacturing/includes/manufacturing_ui.inc:281
+#: ../manufacturing/includes/manufacturing_ui.inc:332
+#: ../reporting/includes/doctext.inc:224
 msgid "Into Location"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:311
-#: /var/www/fa_unstable/devel/../manufacturing/includes/manufacturing_ui.inc:356
+#: ../manufacturing/includes/manufacturing_ui.inc:311
+#: ../manufacturing/includes/manufacturing_ui.inc:356
 msgid "This work order is closed."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/includes/work_order_issue_ui.inc:158
+#: ../manufacturing/includes/work_order_issue_ui.inc:162
 msgid "Return Items to Location"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/includes/work_order_issue_ui.inc:158
+#: ../manufacturing/includes/work_order_issue_ui.inc:162
 msgid "Issue Items to Work order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/includes/work_order_issue_ui.inc:161
+#: ../manufacturing/includes/work_order_issue_ui.inc:165
 msgid "To Work Centre:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/includes/work_order_issue_ui.inc:163
+#: ../manufacturing/includes/work_order_issue_ui.inc:167
 msgid "Issue Date:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/includes/db/work_order_produce_items_db.inc:60
+#: ../manufacturing/includes/db/work_order_issues_db.inc:81
+msgid "Issue of"
+msgstr ""
+
+#: ../manufacturing/includes/db/work_order_issues_db.inc:90
+msgid "Issue to"
+msgstr ""
+
+#: ../manufacturing/includes/db/work_order_issues_db.inc:208
+msgid "Reversed the issue of"
+msgstr ""
+
+#: ../manufacturing/includes/db/work_order_issues_db.inc:220
+msgid "Reversed the issue to"
+msgstr ""
+
+#: ../manufacturing/includes/db/work_order_produce_items_db.inc:73
 msgid "Production."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/includes/db/work_orders_db.inc:168
-#: /var/www/fa_unstable/devel/../purchasing/includes/db/po_db.inc:111
-#: /var/www/fa_unstable/devel/../sales/includes/db/cust_trans_db.inc:109
-#: /var/www/fa_unstable/devel/../sales/includes/db/cust_trans_db.inc:156
-#: /var/www/fa_unstable/devel/../sales/includes/db/sales_order_db.inc:244
+#: ../manufacturing/includes/db/work_order_produce_items_db.inc:157
+msgid "Reversed the production "
+msgstr ""
+
+#: ../manufacturing/includes/db/work_orders_db.inc:79
+#: ../purchasing/includes/db/po_db.inc:123
+#: ../sales/includes/db/cust_trans_db.inc:114
+#: ../sales/includes/db/sales_order_db.inc:261
 msgid "Updated."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/includes/db/work_orders_db.inc:187
+#: ../manufacturing/includes/db/work_orders_db.inc:100
 msgid "Canceled."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/includes/db/work_orders_db.inc:263
+#: ../manufacturing/includes/db/work_orders_db.inc:176
 msgid "Released."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/includes/db/work_orders_quick_db.inc:83
+#: ../manufacturing/includes/db/work_orders_quick_db.inc:89
 msgid "Quick production."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/includes/db/work_orders_quick_db.inc:128
-msgid "Issue of"
+#: ../manufacturing/includes/db/work_orders_quick_db.inc:169
+msgid "Produced"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../manufacturing/includes/db/work_orders_quick_db.inc:175
-msgid "Produced"
+#: ../purchasing/includes/db/invoice_db.inc:298
+msgid "Supplier invoice adjustment for zero inventory of "
+msgstr ""
+
+#: ../purchasing/includes/db/invoice_db.inc:298
+#: ../reporting/rep106.php:81
+#: ../sales/inquiry/sales_deliveries_view.php:166
+#: ../sales/inquiry/sales_deliveries_view.php.orig:166
+#: ../sales/inquiry/sales_orders_view.php:159
+#: ../sales/inquiry/sales_orders_view.php.orig:146
+msgid "Invoice"
+msgstr ""
+
+#: ../purchasing/includes/db/invoice_db.inc:716
+#: ../purchasing/includes/db/invoice_db.inc:718
+msgid "GRN Removal"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/grn_ui.inc:23
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:293
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:73
+#: ../purchasing/includes/ui/grn_ui.inc:23
+#: ../purchasing/includes/ui/po_ui.inc:326
+#: ../sales/view/view_sales_order.php:74
+#: ../sales/view/view_sales_order.php.orig:74
 msgid "Order Currency"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/grn_ui.inc:25
+#: ../purchasing/includes/ui/grn_ui.inc:25
 msgid "For Purchase Order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/grn_ui.inc:28
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:66
+#: ../purchasing/includes/ui/grn_ui.inc:28
+#: ../sales/view/view_sales_order.php:67
+#: ../sales/view/view_sales_order.php.orig:67
 msgid "Ordered On"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/grn_ui.inc:40
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/grn_ui.inc:54
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:308
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:313
+#: ../purchasing/includes/ui/grn_ui.inc:40
+#: ../purchasing/includes/ui/grn_ui.inc:54
+#: ../purchasing/includes/ui/po_ui.inc:341
+#: ../purchasing/includes/ui/po_ui.inc:346
 msgid "Deliver Into Location"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/grn_ui.inc:46
+#: ../purchasing/includes/ui/grn_ui.inc:46
 msgid "Date Items Received"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/grn_ui.inc:49
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/grn_ui.inc:55
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:318
-#: /var/www/fa_unstable/devel/../purchasing/view/view_supp_credit.php:44
-#: /var/www/fa_unstable/devel/../purchasing/view/view_supp_invoice.php:47
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search_completed.php:115
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search.php:129
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_inquiry.php:166
+#: ../purchasing/includes/ui/grn_ui.inc:49
+#: ../purchasing/includes/ui/grn_ui.inc:55
+#: ../purchasing/includes/ui/po_ui.inc:351
+#: ../purchasing/view/view_supp_credit.php:44
+#: ../purchasing/view/view_supp_invoice.php:48
+#: ../purchasing/inquiry/po_search_completed.php:124
+#: ../purchasing/inquiry/po_search_completed.php.orig:123
+#: ../purchasing/inquiry/po_search.php:134
+#: ../purchasing/inquiry/supplier_inquiry.php:177
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:174
 msgid "Supplier's Reference"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/grn_ui.inc:62
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:322
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:77
+#: ../purchasing/includes/ui/grn_ui.inc:62
+#: ../purchasing/includes/ui/po_ui.inc:355
+#: ../sales/view/view_sales_order.php:92
+#: ../sales/view/view_sales_order.php.orig:79
 msgid "Delivery Address"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/grn_ui.inc:65
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:326
+#: ../purchasing/includes/ui/grn_ui.inc:65
+#: ../purchasing/includes/ui/po_ui.inc:367
 msgid "Order Comments"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:96
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:99
+#: ../purchasing/includes/ui/invoice_ui.inc:108
+msgid "Source Invoices:"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:110
 msgid "Supplier's Ref.:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:114
+#: ../purchasing/includes/ui/invoice_ui.inc:125
 msgid "Terms:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:126
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:92
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:97
+#: ../purchasing/includes/ui/invoice_ui.inc:137
+#: ../purchasing/manage/suppliers.php:100
+#: ../purchasing/manage/suppliers.php:105
+#: ../purchasing/manage/suppliers.php.orig:101
+#: ../purchasing/manage/suppliers.php.orig:106
 msgid "Supplier's Currency:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:130
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:99
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:247
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:460
+#: ../purchasing/includes/ui/invoice_ui.inc:141
+#: ../purchasing/manage/suppliers.php:107
+#: ../purchasing/manage/suppliers.php.orig:108
+#: ../sales/manage/customer_branches.php:247
+#: ../sales/manage/customers.php:292
+#: ../sales/manage/sav.customers.php:292
 msgid "Tax Group:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:144
+#: ../purchasing/includes/ui/invoice_ui.inc:159
 msgid "Sub-total:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:152
+#: ../purchasing/includes/ui/invoice_ui.inc:167
 msgid "Invoice Total:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:155
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:341
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_credit_ui.inc:233
+#: ../purchasing/includes/ui/invoice_ui.inc:170
+#: ../sales/customer_credit_invoice.php:332
+#: ../sales/includes/ui/sales_credit_ui.inc:233
 msgid "Credit Note Total"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:186
+#: ../purchasing/includes/ui/invoice_ui.inc:175
+#: ../purchasing/includes/ui/po_ui.inc:487
+#: ../purchasing/po_entry_items.php:554
+msgid "Tax algorithm:"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:207
 msgid "Add GL Line"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:187
+#: ../purchasing/includes/ui/invoice_ui.inc:208
 msgid "Reset"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:188
-#: /var/www/fa_unstable/devel/../purchasing/po_receive_items.php:323
+#: ../purchasing/includes/ui/invoice_ui.inc:209
+#: ../purchasing/po_receive_items.php:332
 msgid "Clear all GL entry fields"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:206
+#: ../purchasing/includes/ui/invoice_ui.inc:227
 msgid "GL Items for this Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:208
+#: ../purchasing/includes/ui/invoice_ui.inc:229
 msgid "GL Items for this Credit Note"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:218
+#: ../purchasing/includes/ui/invoice_ui.inc:239
 msgid "Quick Entry:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:382
+#: ../purchasing/includes/ui/invoice_ui.inc:412
 msgid "Add to Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:384
+#: ../purchasing/includes/ui/invoice_ui.inc:414
 msgid "Add to Credit Note"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:386
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:495
+#: ../purchasing/includes/ui/invoice_ui.inc:416
+#: ../sales/customer_invoice.php:601
 msgid "Remove"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:386
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:421
+#: ../purchasing/includes/ui/invoice_ui.inc:416
+#: ../purchasing/includes/ui/invoice_ui.inc:451
 msgid ""
 "WARNING! Be careful with removal. The operation is executed immediately and "
 "cannot be undone !!!"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:388
+#: ../purchasing/includes/ui/invoice_ui.inc:418
 #, php-format
 msgid ""
 "You are about to remove all yet non-invoiced items from delivery line #%d. "
@@ -9501,468 +10548,541 @@ msgid ""
 "continue ?"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:419
+#: ../purchasing/includes/ui/invoice_ui.inc:449
 msgid "Items Received Yet to be Invoiced"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:424
+#: ../purchasing/includes/ui/invoice_ui.inc:454
 msgid "Delivery Item Selected For Adding To A Supplier Credit Note"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:429
+#: ../purchasing/includes/ui/invoice_ui.inc:459
 msgid "Received Items Charged on this Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:431
+#: ../purchasing/includes/ui/invoice_ui.inc:461
 msgid "Received Items Credited on this Note"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:441
+#: ../purchasing/includes/ui/invoice_ui.inc:471
 msgid "Received between"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:452
+#: ../purchasing/includes/ui/invoice_ui.inc:483
 msgid "Add All Items"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:461
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:473
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:150
+#: ../purchasing/includes/ui/invoice_ui.inc:492
+#: ../purchasing/includes/ui/invoice_ui.inc:504
+#: ../sales/inquiry/sales_orders_view.php:167
+#: ../sales/inquiry/sales_orders_view.php.orig:154
 msgid "Delivery"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:461
+#: ../purchasing/includes/ui/invoice_ui.inc:492
 msgid "Sequence #"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:461
+#: ../purchasing/includes/ui/invoice_ui.inc:492
 msgid "P.O."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:462
+#: ../purchasing/includes/ui/invoice_ui.inc:493
 msgid "Received On"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:462
-#: /var/www/fa_unstable/devel/../purchasing/view/view_po.php:46
+#: ../purchasing/includes/ui/invoice_ui.inc:493
+#: ../purchasing/view/view_po.php:46
 msgid "Quantity Received"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:462
-#: /var/www/fa_unstable/devel/../purchasing/view/view_grn.php:41
-#: /var/www/fa_unstable/devel/../purchasing/view/view_po.php:46
+#: ../purchasing/includes/ui/invoice_ui.inc:493
+#: ../purchasing/view/view_grn.php:41
+#: ../purchasing/view/view_po.php:46
 msgid "Quantity Invoiced"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:463
+#: ../purchasing/includes/ui/invoice_ui.inc:494
 msgid "Qty Yet To Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:463
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:212
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:148
+#: ../purchasing/includes/ui/invoice_ui.inc:494
+#: ../purchasing/includes/ui/po_ui.inc:245
+#: ../sales/includes/ui/sales_order_ui.inc:142
+#: ../sales/includes/ui/sales_order_ui.inc.orig:142
 msgid "Price after Tax"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:463
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:212
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:148
+#: ../purchasing/includes/ui/invoice_ui.inc:494
+#: ../purchasing/includes/ui/po_ui.inc:245
+#: ../sales/includes/ui/sales_order_ui.inc:142
+#: ../sales/includes/ui/sales_order_ui.inc.orig:142
 msgid "Price before Tax"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:469
+#: ../purchasing/includes/ui/invoice_ui.inc:500
 msgid "Qty Yet To Credit"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:474
+#: ../purchasing/includes/ui/invoice_ui.inc:505
 msgid "Line Value"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:541
+#: ../purchasing/includes/ui/invoice_ui.inc:573
 msgid ""
 "There are no outstanding items received from this supplier that have not "
 "been invoiced by them."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:544
+#: ../purchasing/includes/ui/invoice_ui.inc:576
 msgid ""
 "There are no received items for the selected supplier that have been "
 "invoiced."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/invoice_ui.inc:545
+#: ../purchasing/includes/ui/invoice_ui.inc:577
 msgid "Credits can only be applied to invoiced items."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:133
+#: ../purchasing/includes/ui/po_ui.inc:156
 msgid "Supplier Currency:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:161
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:665
+#: ../purchasing/includes/ui/po_ui.inc:185
+#: ../sales/sales_order_entry.php:694
 msgid "Order Date:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:166
+#: ../purchasing/includes/ui/po_ui.inc:186
+#: ../sales/sales_order_entry.php:681
+msgid "Delivery Date:"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:186
+#: ../sales/sales_order_entry.php:675
+msgid "Invoice Date:"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:197
+msgid "Due Date:"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:199
 msgid "Supplier's Reference:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:167
+#: ../purchasing/includes/ui/po_ui.inc:200
 msgid "Receive Into:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:192
+#: ../purchasing/includes/ui/po_ui.inc:225
 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 ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:196
+#: ../purchasing/includes/ui/po_ui.inc:229
 msgid "Deliver to:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:205
+#: ../purchasing/includes/ui/po_ui.inc:238
 msgid "Order Items"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:211
-#: /var/www/fa_unstable/devel/../purchasing/po_receive_items.php:58
+#: ../purchasing/includes/ui/po_ui.inc:244
+#: ../purchasing/po_receive_items.php:62
 msgid "Received"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:212
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:604
+#: ../purchasing/includes/ui/po_ui.inc:245
+#: ../sales/includes/ui/sales_order_ui.inc:611
+#: ../sales/includes/ui/sales_order_ui.inc.orig:611
 msgid "Required Delivery Date"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:212
-#: /var/www/fa_unstable/devel/../purchasing/view/view_grn.php:41
-#: /var/www/fa_unstable/devel/../purchasing/view/view_po.php:46
+#: ../purchasing/includes/ui/po_ui.inc:245
+#: ../purchasing/view/view_grn.php:41
+#: ../purchasing/view/view_po.php:46
 msgid "Line Total"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:263
-#: /var/www/fa_unstable/devel/../purchasing/po_receive_items.php:110
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:147
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:333
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:499
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:536
-#: /var/www/fa_unstable/devel/../sales/view/view_dispatch.php:154
-#: /var/www/fa_unstable/devel/../sales/view/view_invoice.php:156
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_credit_ui.inc:217
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:235
+#: ../purchasing/includes/ui/po_ui.inc:296
+#: ../purchasing/po_receive_items.php:114
+#: ../reporting/rep107.php:217
+#: ../reporting/rep109.php:152
+#: ../reporting/rep110.php:161
+#: ../reporting/rep111.php:137
+#: ../reporting/rep113.php:147
+#: ../reporting/rep209.php:167
+#: ../sales/customer_credit_invoice.php:324
+#: ../sales/customer_delivery.php:509
+#: ../sales/customer_invoice.php:645
+#: ../sales/view/view_dispatch.php:146
+#: ../sales/view/view_invoice.php:150
+#: ../sales/includes/ui/sales_credit_ui.inc:217
+#: ../sales/includes/ui/sales_order_ui.inc:229
+#: ../sales/includes/ui/sales_order_ui.inc.orig:229
 msgid "Sub-total"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:272
-#: /var/www/fa_unstable/devel/../purchasing/po_receive_items.php:118
-#: /var/www/fa_unstable/devel/../purchasing/view/view_grn.php:79
-#: /var/www/fa_unstable/devel/../purchasing/view/view_po.php:93
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:506
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:242
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:242
+#: ../purchasing/includes/ui/po_ui.inc:305
+#: ../purchasing/po_receive_items.php:122
+#: ../purchasing/view/view_grn.php:79
+#: ../purchasing/view/view_po.php:93
+#: ../sales/customer_delivery.php:516
+#: ../sales/view/view_sales_order.php:262
+#: ../sales/view/view_sales_order.php.orig:244
+#: ../sales/includes/ui/sales_order_ui.inc:236
+#: ../sales/includes/ui/sales_order_ui.inc.orig:236
 msgid "Amount Total"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/includes/ui/po_ui.inc:273
-#: /var/www/fa_unstable/devel/../purchasing/allocations/supplier_allocate.php:64
-#: /var/www/fa_unstable/devel/../sales/allocations/customer_allocate.php:63
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:243
+#: ../purchasing/includes/ui/po_ui.inc:306
+#: ../purchasing/allocations/supplier_allocate.php:64
+#: ../sales/allocations/customer_allocate.php:63
+#: ../sales/includes/ui/sales_order_ui.inc:237
+#: ../sales/includes/ui/sales_order_ui.inc.orig:237
 msgid "Refresh"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:38
+#: ../purchasing/includes/ui/po_ui.inc:361
+#: ../sales/view/view_sales_order.php:83
+msgid "Required Pre-Payment"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:362
+msgid "Pre-Payments Allocated"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:488
+#: ../purchasing/po_entry_items.php:555
+#: ../sales/customer_invoice.php:452
+#: ../sales/includes/ui/sales_order_ui.inc:407
+#: ../sales/includes/ui/sales_order_ui.inc:409
+#: ../sales/includes/ui/sales_order_ui.inc.orig:405
+#: ../sales/includes/ui/sales_order_ui.inc.orig:409
+msgid "Payment:"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:488
+#: ../purchasing/po_entry_items.php:555
+msgid "Delayed"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:490
+#: ../sales/includes/ui/sales_order_ui.inc:622
+#: ../sales/includes/ui/sales_order_ui.inc:624
+msgid "Pre-Payment Required:"
+msgstr ""
+
+#: ../purchasing/po_entry_items.php:38
 msgid "Modify Purchase Order #"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:43
+#: ../purchasing/po_entry_items.php:43
 msgid "Purchase Order Entry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:48
+#: ../purchasing/po_entry_items.php:48
 msgid "Direct GRN Entry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:53
+#: ../purchasing/po_entry_items.php:53
 msgid "Direct Purchase Invoice Entry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:74
+#: ../purchasing/po_entry_items.php:77
 msgid "Purchase Order has been entered"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:76
+#: ../purchasing/po_entry_items.php:79
 msgid "Purchase Order has been updated"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:77
+#: ../purchasing/po_entry_items.php:80
 msgid "&View this order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:79
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:105
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:123
+#: ../purchasing/po_entry_items.php:82
+#: ../sales/sales_order_entry.php:106
+#: ../sales/sales_order_entry.php:126
 msgid "&Print This Order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:81
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:106
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:124
+#: ../purchasing/po_entry_items.php:84
+#: ../sales/sales_order_entry.php:107
+#: ../sales/sales_order_entry.php:127
 msgid "&Email This Order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:83
+#: ../purchasing/po_entry_items.php:86
 msgid "&Receive Items on this Purchase Order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:85
+#: ../purchasing/po_entry_items.php:88
 msgid "Enter &Another Purchase Order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:87
+#: ../purchasing/po_entry_items.php:90
 msgid "Select An &Outstanding Purchase Order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:96
+#: ../purchasing/po_entry_items.php:99
 msgid "Direct GRN has been entered"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:98
+#: ../purchasing/po_entry_items.php:101
 msgid "&View this GRN"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:104
-#: /var/www/fa_unstable/devel/../purchasing/po_receive_items.php:38
-msgid "Entry purchase &invoice for this receival"
+#: ../purchasing/po_entry_items.php:105
+#: ../purchasing/po_receive_items.php:40
+msgid "View the GL Journal Entries for this Delivery"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:106
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:130
-#: /var/www/fa_unstable/devel/../purchasing/supplier_credit.php:49
-#: /var/www/fa_unstable/devel/../purchasing/supplier_invoice.php:52
-msgid "Add an Attachment"
+#: ../purchasing/po_entry_items.php:110
+#: ../purchasing/po_receive_items.php:42
+msgid "Entry purchase &invoice for this receival"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:109
+#: ../purchasing/po_entry_items.php:115
 msgid "Enter &Another GRN"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:118
+#: ../purchasing/po_entry_items.php:124
 msgid "Direct Purchase Invoice has been entered"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:120
+#: ../purchasing/po_entry_items.php:126
 msgid "&View this Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:125
-#: /var/www/fa_unstable/devel/../purchasing/supplier_invoice.php:46
+#: ../purchasing/po_entry_items.php:131
+#: ../purchasing/supplier_invoice.php:68
 msgid "View the GL Journal Entries for this Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:127
-#: /var/www/fa_unstable/devel/../purchasing/supplier_invoice.php:48
+#: ../purchasing/po_entry_items.php:133
+#: ../purchasing/supplier_invoice.php:70
 msgid "Entry supplier &payment for this invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:133
+#: ../purchasing/po_entry_items.php:139
 msgid "Enter &Another Direct Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:165
+#: ../purchasing/po_entry_items.php:171
 msgid ""
 "This item cannot be deleted because some of it has already been received."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:180
+#: ../purchasing/po_entry_items.php:186
 msgid ""
 "This order cannot be cancelled because some of it has already been received."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:181
+#: ../purchasing/po_entry_items.php:187
 msgid ""
 "The line item quantities may be modified to quantities more than already "
 "received. prices cannot be altered for lines that have already been received "
 "and quantities cannot be reduced below the quantity already received."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:196
+#: ../purchasing/po_entry_items.php:202
 msgid "This purchase order has been cancelled."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:198
+#: ../purchasing/po_entry_items.php:204
 msgid "Enter a new purchase order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:210
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:454
+#: ../purchasing/po_entry_items.php:216
+#: ../sales/sales_order_entry.php:475
 msgid "Item description cannot be empty."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:220
+#: ../purchasing/po_entry_items.php:226
 msgid "The quantity of the order item must be numeric and not less than "
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:227
+#: ../purchasing/po_entry_items.php:233
 msgid "The price entered must be numeric and not less than zero."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:251
+#: ../purchasing/po_entry_items.php:257
 msgid ""
 "You are attempting to make the quantity ordered a quantity less than has "
 "already been invoiced or received.  This is prohibited."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:252
+#: ../purchasing/po_entry_items.php:258
 msgid ""
 "The quantity received can only be modified by entering a negative receipt "
 "and the quantity invoiced can only be reduced by entering a credit note "
 "against this item."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:280
+#: ../purchasing/po_entry_items.php:286
 msgid "The selected item is already on this order."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:307
+#: ../purchasing/po_entry_items.php:313
 msgid ""
 "The selected item does not exist or it is a kit part and therefore cannot be "
 "purchased."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:323
-#: /var/www/fa_unstable/devel/../purchasing/supplier_invoice.php:352
-#: /var/www/fa_unstable/devel/../purchasing/supplier_payment.php:118
+#: ../purchasing/po_entry_items.php:329
+#: ../purchasing/supplier_invoice.php:381
+#: ../purchasing/supplier_payment.php:118
 msgid "There is no supplier selected."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:330
+#: ../purchasing/po_entry_items.php:336
 msgid "The entered order date is invalid."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:339
+#: ../purchasing/po_entry_items.php:349
+msgid "The entered due date is invalid."
+msgstr ""
+
+#: ../purchasing/po_entry_items.php:358
 msgid "There is no reference entered for this purchase order."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:354
-#: /var/www/fa_unstable/devel/../purchasing/supplier_invoice.php:161
+#: ../purchasing/po_entry_items.php:373
+#: ../purchasing/supplier_invoice.php:185
 msgid "You must enter a supplier's invoice reference."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:360
+#: ../purchasing/po_entry_items.php:380
+#: ../purchasing/supplier_invoice.php:211
+msgid ""
+"This invoice number has already been entered. It cannot be entered again."
+msgstr ""
+
+#: ../purchasing/po_entry_items.php:386
 msgid "There is no delivery address specified."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:366
+#: ../purchasing/po_entry_items.php:392
 msgid "There is no location specified to move any items into."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:373
+#: ../purchasing/po_entry_items.php:399
 msgid ""
 "The order cannot be placed because there are no lines entered on this order."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:500
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:669
+#: ../purchasing/po_entry_items.php:404
+msgid "Required prepayment is greater than total invoice value."
+msgstr ""
+
+#: ../purchasing/po_entry_items.php:492
+msgid "Payment for:"
+msgstr ""
+
+#: ../purchasing/po_entry_items.php:563
+#: ../sales/sales_order_entry.php:698
 msgid "Place Order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:501
+#: ../purchasing/po_entry_items.php:564
 msgid "Update Order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:502
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:668
+#: ../purchasing/po_entry_items.php:565
+#: ../sales/sales_order_entry.php:697
 msgid "Cancel Order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:504
+#: ../purchasing/po_entry_items.php:567
 msgid "Process GRN"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:505
+#: ../purchasing/po_entry_items.php:568
 msgid "Update GRN"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:506
+#: ../purchasing/po_entry_items.php:569
 msgid "Cancel GRN"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:509
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:555
+#: ../purchasing/po_entry_items.php:572
+#: ../sales/customer_invoice.php:684
 msgid "Process Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:510
+#: ../purchasing/po_entry_items.php:573
 msgid "Update Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_entry_items.php:511
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:649
+#: ../purchasing/po_entry_items.php:574
+#: ../sales/sales_order_entry.php:678
 msgid "Cancel Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_receive_items.php:25
+#: ../purchasing/po_receive_items.php:25
 msgid "Receive Purchase Order Items"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_receive_items.php:34
+#: ../purchasing/po_receive_items.php:34
 msgid "Purchase Order Delivery has been processed"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_receive_items.php:36
+#: ../purchasing/po_receive_items.php:36
 msgid "&View this Delivery"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_receive_items.php:40
+#: ../purchasing/po_receive_items.php:44
 msgid "Select a different &purchase order for receiving items against"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_receive_items.php:49
+#: ../purchasing/po_receive_items.php:53
 msgid ""
 "This page can only be opened if a purchase order has been selected. Please "
 "select a purchase order first."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_receive_items.php:58
-#: /var/www/fa_unstable/devel/../reporting/rep105.php:112
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:430
+#: ../purchasing/po_receive_items.php:62
+#: ../reporting/rep105.php:112
+#: ../sales/customer_delivery.php:440
 msgid "Ordered"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_receive_items.php:59
-#: /var/www/fa_unstable/devel/../reporting/rep101.php:131
-#: /var/www/fa_unstable/devel/../reporting/rep105.php:113
-#: /var/www/fa_unstable/devel/../reporting/rep105.php:167
-#: /var/www/fa_unstable/devel/../reporting/rep201.php:119
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:117
+#: ../purchasing/po_receive_items.php:63
+#: ../reporting/rep101.php:131
+#: ../reporting/rep105.php:113
+#: ../reporting/rep105.php:162
+#: ../reporting/rep201.php:119
+#: ../reporting/includes/doctext.inc:247
 msgid "Outstanding"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_receive_items.php:59
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:431
+#: ../purchasing/po_receive_items.php:63
+#: ../sales/customer_delivery.php:441
 msgid "This Delivery"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_receive_items.php:164
-#: /var/www/fa_unstable/devel/../purchasing/po_receive_items.php:213
+#: ../purchasing/po_receive_items.php:168
+#: ../purchasing/po_receive_items.php:222
 msgid ""
 "There is nothing to process. Please enter valid quantities greater than zero."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_receive_items.php:218
+#: ../purchasing/po_receive_items.php:227
 msgid ""
 "Entered quantities cannot be greater than the quantity entered on the "
 "purchase order including the allowed over-receive percentage"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_receive_items.php:220
+#: ../purchasing/po_receive_items.php:229
 msgid ""
 "Modify the ordered items on the purchase order if you wish to increase the "
 "quantities."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_receive_items.php:238
+#: ../purchasing/po_receive_items.php:247
 msgid ""
 "This order has been changed or invoiced since this delivery was started to "
 "be actioned. Processing halted. To enter a delivery against this purchase "
@@ -9970,156 +11090,167 @@ msgid ""
 "by the other user."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_receive_items.php:241
+#: ../purchasing/po_receive_items.php:250
 msgid "Select a different purchase order for receiving goods against"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_receive_items.php:244
+#: ../purchasing/po_receive_items.php:253
 msgid "Re-Read the updated purchase order for receiving goods against"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_receive_items.php:318
+#: ../purchasing/po_receive_items.php:327
 msgid "Items to Receive"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/po_receive_items.php:323
+#: ../purchasing/po_receive_items.php:332
 msgid "Process Receive Items"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_credit.php:43
+#: ../purchasing/supplier_credit.php:63
+#, php-format
+msgid "Modifying Supplier Credit # %d"
+msgstr ""
+
+#: ../purchasing/supplier_credit.php:78
 msgid "Supplier credit note has been processed."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_credit.php:44
+#: ../purchasing/supplier_credit.php:79
 msgid "View this Credit Note"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_credit.php:46
+#: ../purchasing/supplier_credit.php:81
 msgid "View the GL Journal Entries for this Credit Note"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_credit.php:48
+#: ../purchasing/supplier_credit.php:83
 msgid "Enter Another Credit Note"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_credit.php:102
-#: /var/www/fa_unstable/devel/../purchasing/supplier_invoice.php:102
+#: ../purchasing/supplier_credit.php:119
+#: ../purchasing/supplier_invoice.php:126
 msgid ""
 "The account code entered is not a valid code, this line cannot be added to "
 "the transaction."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_credit.php:112
-#: /var/www/fa_unstable/devel/../purchasing/supplier_invoice.php:112
+#: ../purchasing/supplier_credit.php:129
+#: ../purchasing/supplier_invoice.php:136
 msgid ""
 "The amount entered is not numeric. This line cannot be added to the "
 "transaction."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_credit.php:142
+#: ../purchasing/supplier_credit.php:159
 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 ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_credit.php:149
+#: ../purchasing/supplier_credit.php:166
 msgid "You must enter an credit note reference."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_credit.php:163
+#: ../purchasing/supplier_credit.php:180
 msgid "You must enter a supplier's credit note reference."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_credit.php:170
+#: ../purchasing/supplier_credit.php:187
 msgid ""
 "The credit note as entered cannot be processed because the date entered is "
 "not valid."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_credit.php:182
-#: /var/www/fa_unstable/devel/../purchasing/supplier_invoice.php:180
+#: ../purchasing/supplier_credit.php:199
+#: ../purchasing/supplier_invoice.php:204
 msgid ""
 "The invoice as entered cannot be processed because the due date is in an "
 "incorrect format."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_credit.php:189
+#: ../purchasing/supplier_credit.php:206
 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 ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_credit.php:227
+#: ../purchasing/supplier_credit.php:218
+msgid ""
+"The return cannot be processed because there is an insufficient quantity for "
+"item:"
+msgstr ""
+
+#: ../purchasing/supplier_credit.php:262
 msgid "The quantity to credit must be numeric and greater than zero."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_credit.php:234
+#: ../purchasing/supplier_credit.php:269
 msgid "The price is either not numeric or negative."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_credit.php:336
+#: ../purchasing/supplier_credit.php:371
 msgid "Enter Credit Note"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_invoice.php:28
+#: ../purchasing/supplier_invoice.php:46
 msgid "Enter Supplier Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_invoice.php:43
+#: ../purchasing/supplier_invoice.php:51
+#, php-format
+msgid "Modifying Purchase Invoice # %d"
+msgstr ""
+
+#: ../purchasing/supplier_invoice.php:65
 msgid "Supplier invoice has been processed."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_invoice.php:44
+#: ../purchasing/supplier_invoice.php:66
 msgid "View this Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_invoice.php:50
+#: ../purchasing/supplier_invoice.php:72
 msgid "Enter Another Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_invoice.php:141
+#: ../purchasing/supplier_invoice.php:165
 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 ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_invoice.php:147
+#: ../purchasing/supplier_invoice.php:171
 msgid "You must enter an invoice reference."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_invoice.php:168
+#: ../purchasing/supplier_invoice.php:192
 msgid ""
 "The invoice as entered cannot be processed because the invoice date is in an "
 "incorrect format."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_invoice.php:187
-msgid ""
-"This invoice number has already been entered. It cannot be entered again."
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../purchasing/supplier_invoice.php:224
+#: ../purchasing/supplier_invoice.php:253
 msgid "The quantity to invoice must be numeric and greater than zero."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_invoice.php:231
+#: ../purchasing/supplier_invoice.php:260
 msgid "The price is not numeric."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../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 ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_invoice.php:245
-#: /var/www/fa_unstable/devel/../purchasing/supplier_invoice.php:258
+#: ../purchasing/supplier_invoice.php:274
+#: ../purchasing/supplier_invoice.php:287
 msgid "The over-charge percentage allowance is :"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../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 "
@@ -10127,3915 +11258,4283 @@ msgid ""
 "necessary."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_invoice.php:334
+#: ../purchasing/supplier_invoice.php:363
 #, php-format
 msgid "All yet non-invoiced items on delivery line # %d has been removed."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_invoice.php:376
+#: ../purchasing/supplier_invoice.php:405
 msgid "Enter Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_payment.php:31
+#: ../purchasing/supplier_payment.php:31
 msgid "Supplier Payment Entry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_payment.php:89
+#: ../purchasing/supplier_payment.php:90
 msgid "Invalid purchase invoice number."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_payment.php:96
+#: ../purchasing/supplier_payment.php:96
 msgid "Payment has been sucessfully entered"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_payment.php:98
+#: ../purchasing/supplier_payment.php:98
 msgid "&Print This Remittance"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_payment.php:99
+#: ../purchasing/supplier_payment.php:99
 msgid "&Email This Remittance"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_payment.php:101
+#: ../purchasing/supplier_payment.php:101
 msgid "View the GL &Journal Entries for this Payment"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_payment.php:105
+#: ../purchasing/supplier_payment.php:105
 msgid "Enter another supplier &payment"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_payment.php:152
-#: /var/www/fa_unstable/devel/../sales/customer_payments.php:139
+#: ../purchasing/supplier_payment.php:152
+#: ../sales/customer_payments.php:192
 msgid "The exchange rate must be numeric and greater than zero."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_payment.php:164
+#: ../purchasing/supplier_payment.php:164
 msgid "The entered discount is invalid or less than zero."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_payment.php:172
+#: ../purchasing/supplier_payment.php:172
 msgid ""
 "The total of the amount and the discount is zero or negative. Please enter "
 "positive values."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_payment.php:263
+#: ../purchasing/supplier_payment.php:273
 msgid "Payment To:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_payment.php:267
+#: ../purchasing/supplier_payment.php:280
 msgid "From Bank Account:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_payment.php:273
-#: /var/www/fa_unstable/devel/../purchasing/view/view_supp_payment.php:55
+#: ../purchasing/supplier_payment.php:288
+#: ../purchasing/view/view_supp_payment.php:55
 msgid "Date Paid"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_payment.php:296
-#: /var/www/fa_unstable/devel/../sales/customer_payments.php:287
+#: ../purchasing/supplier_payment.php:311
+#: ../sales/customer_payments.php:406
 msgid "Amount of Discount:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_payment.php:297
+#: ../purchasing/supplier_payment.php:312
 msgid "Amount of Payment:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_payment.php:303
+#: ../purchasing/supplier_payment.php:318
 msgid "The amount and discount are in the bank account's currency."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/supplier_payment.php:306
+#: ../purchasing/supplier_payment.php:321
 msgid "Enter Payment"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/view/view_grn.php:21
+#: ../purchasing/view/view_grn.php:21
 msgid "View Purchase Order Delivery"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/view/view_grn.php:27
+#: ../purchasing/view/view_grn.php:27
 msgid ""
 "This page must be called with a Purchase Order Delivery number to review."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/view/view_grn.php:37
-#: /var/www/fa_unstable/devel/../purchasing/view/view_po.php:41
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:196
+#: ../purchasing/view/view_grn.php:37
+#: ../purchasing/view/view_po.php:41
+#: ../sales/view/view_sales_order.php:216
+#: ../sales/view/view_sales_order.php.orig:198
 msgid "Line Details"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/view/view_grn.php:40
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:36
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:103
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_deliveries_view.php:181
+#: ../purchasing/view/view_grn.php:40
+#: ../reporting/includes/doctext.inc:77
+#: ../reporting/includes/doctext.inc:192
+#: ../reporting/includes/doctext.inc:244
+#: ../sales/inquiry/sales_deliveries_view.php:186
+#: ../sales/inquiry/sales_deliveries_view.php.orig:186
 msgid "Delivery Date"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/view/view_grn.php:70
-#: /var/www/fa_unstable/devel/../purchasing/view/view_po.php:84
-#: /var/www/fa_unstable/devel/../purchasing/view/view_supp_credit.php:60
-#: /var/www/fa_unstable/devel/../purchasing/view/view_supp_invoice.php:65
-#: /var/www/fa_unstable/devel/../sales/view/view_credit.php:136
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:232
+#: ../purchasing/view/view_grn.php:70
+#: ../purchasing/view/view_po.php:84
+#: ../purchasing/view/view_supp_credit.php:60
+#: ../purchasing/view/view_supp_invoice.php:66
+#: ../sales/view/view_credit.php:136
+#: ../sales/view/view_sales_order.php:252
+#: ../sales/view/view_sales_order.php.orig:234
 msgid "Sub Total"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/view/view_grn.php:86
+#: ../purchasing/view/view_grn.php:86
 msgid "This delivery has been voided."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/view/view_po.php:22
+#: ../purchasing/view/view_po.php:22
 msgid "View Purchase Order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/view/view_po.php:27
+#: ../purchasing/view/view_po.php:27
 msgid "This page must be called with a purchase order number to review."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/view/view_po.php:46
+#: ../purchasing/view/view_po.php:46
 msgid "Requested By"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/view/view_po.php:100
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_allocation_inquiry.php:147
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_inquiry.php:187
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_allocation_inquiry.php:162
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_inquiry.php:239
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_deliveries_view.php:201
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:307
+#: ../purchasing/view/view_po.php:100
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:147
+#: ../purchasing/inquiry/supplier_inquiry.php:197
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:196
+#: ../sales/inquiry/customer_allocation_inquiry.php:165
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:165
+#: ../sales/inquiry/customer_inquiry.php:227
+#: ../sales/inquiry/customer_inquiry.php.orig:251
+#: ../sales/inquiry/sales_deliveries_view.php:206
+#: ../sales/inquiry/sales_deliveries_view.php.orig:206
+#: ../sales/inquiry/sales_orders_view.php:344
+#: ../sales/inquiry/sales_orders_view.php.orig:317
 msgid "Marked items are overdue."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/view/view_po.php:113
-#: /var/www/fa_unstable/devel/../sales/view/view_invoice.php:98
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:50
+#: ../purchasing/view/view_po.php:113
+#: ../sales/view/view_invoice.php:98
+#: ../sales/view/view_sales_order.php:51
+#: ../sales/view/view_sales_order.php.orig:51
 msgid "Deliveries"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/view/view_po.php:115
+#: ../purchasing/view/view_po.php:115
 msgid "Delivered On"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/view/view_po.php:138
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:52
+#: ../purchasing/view/view_po.php:138
+#: ../sales/view/view_sales_order.php:53
+#: ../sales/view/view_sales_order.php.orig:53
 msgid "Invoices/Credits"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/view/view_supp_credit.php:23
+#: ../purchasing/view/view_supp_credit.php:23
 msgid "View Supplier Credit Note"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/view/view_supp_credit.php:38
+#: ../purchasing/view/view_supp_credit.php:38
 msgid "SUPPLIER CREDIT NOTE"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/view/view_supp_credit.php:47
-#: /var/www/fa_unstable/devel/../purchasing/view/view_supp_invoice.php:50
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:279
-#: /var/www/fa_unstable/devel/../sales/view/view_invoice.php:96
+#: ../purchasing/view/view_supp_credit.php:47
+#: ../purchasing/view/view_supp_invoice.php:51
+#: ../reporting/includes/doctext.inc:141
+#: ../sales/customer_credit_invoice.php:270
+#: ../sales/view/view_invoice.php:100
 msgid "Invoice Date"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/view/view_supp_credit.php:66
+#: ../purchasing/view/view_supp_credit.php:66
 msgid "TOTAL CREDIT NOTE"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/view/view_supp_credit.php:70
-#: /var/www/fa_unstable/devel/../sales/view/view_credit.php:147
+#: ../purchasing/view/view_supp_credit.php:71
+#: ../sales/view/view_credit.php:147
 msgid "This credit note has been voided."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/view/view_supp_invoice.php:23
+#: ../purchasing/view/view_supp_invoice.php:24
 msgid "View Supplier Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/view/view_supp_invoice.php:40
+#: ../purchasing/view/view_supp_invoice.php:41
 msgid "SUPPLIER INVOICE"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/view/view_supp_invoice.php:72
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:151
-#: /var/www/fa_unstable/devel/../sales/view/view_invoice.php:165
+#: ../purchasing/view/view_supp_invoice.php:73
+#: ../reporting/rep107.php:266
+#: ../reporting/rep107.php:272
+#: ../sales/view/view_invoice.php:166
 msgid "TOTAL INVOICE"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/view/view_supp_invoice.php:76
-#: /var/www/fa_unstable/devel/../sales/view/view_invoice.php:169
+#: ../purchasing/view/view_supp_invoice.php:77
+#: ../sales/view/view_invoice.php:170
 msgid "This invoice has been voided."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/view/view_supp_payment.php:22
+#: ../purchasing/view/view_supp_payment.php:22
 msgid "View Payment to Supplier"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/view/view_supp_payment.php:47
+#: ../purchasing/view/view_supp_payment.php:47
 msgid "Payment to Supplier"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/view/view_supp_payment.php:53
+#: ../purchasing/view/view_supp_payment.php:53
 msgid "To Supplier"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/view/view_supp_payment.php:59
-#: /var/www/fa_unstable/devel/../sales/view/view_receipt.php:43
+#: ../purchasing/view/view_supp_payment.php:59
+#: ../sales/view/view_receipt.php:43
 msgid "Payment Currency"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/view/view_supp_payment.php:66
+#: ../purchasing/view/view_supp_payment.php:62
+#: ../sales/customer_delivery.php:441
+#: ../sales/customer_invoice.php:540
+#: ../sales/customer_invoice.php:543
+#: ../sales/view/view_receipt.php:45
+#: ../sales/view/view_sales_order.php:220
+#: ../sales/view/view_sales_order.php.orig:202
+msgid "Discount"
+msgstr ""
+
+#: ../purchasing/view/view_supp_payment.php:69
 msgid "Supplier's Currency"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:21
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:33
+#: ../purchasing/manage/suppliers.php:27
+#: ../purchasing/manage/suppliers.php.orig:28
+#: ../sales/manage/customer_branches.php:33
 msgid ""
 "There are no tax groups defined in the system. At least one tax group is "
 "required before proceeding."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:83
+#: ../purchasing/manage/suppliers.php:91
+#: ../purchasing/manage/suppliers.php.orig:92
 msgid "Basic Data"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:85
+#: ../purchasing/manage/suppliers.php:93
+#: ../purchasing/manage/suppliers.php.orig:94
 msgid "Supplier Name:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:86
+#: ../purchasing/manage/suppliers.php:94
+#: ../purchasing/manage/suppliers.php.orig:95
 msgid "Supplier Short Name:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:89
+#: ../purchasing/manage/suppliers.php:97
+#: ../purchasing/manage/suppliers.php.orig:98
 msgid "Website:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:100
+#: ../purchasing/manage/suppliers.php:108
+#: ../purchasing/manage/suppliers.php.orig:109
 msgid "Our Customer No:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:103
-msgid "Contact Data"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:109
-msgid "System default"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:111
+#: ../purchasing/manage/suppliers.php:110
+#: ../purchasing/manage/suppliers.php.orig:120
 msgid "Purchasing"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:112
+#: ../purchasing/manage/suppliers.php:111
+#: ../purchasing/manage/suppliers.php.orig:121
 msgid "Bank Name/Account:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:113
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:228
+#: ../purchasing/manage/suppliers.php:112
+#: ../purchasing/manage/suppliers.php.orig:122
+#: ../sales/manage/customers.php:263
+#: ../sales/manage/sav.customers.php:263
 msgid "Credit Limit:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:114
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:230
+#: ../purchasing/manage/suppliers.php:113
+#: ../purchasing/manage/suppliers.php.orig:123
+#: ../sales/manage/customers.php:265
+#: ../sales/manage/sav.customers.php:265
 msgid "Payment Terms:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:120
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:123
+#: ../purchasing/manage/suppliers.php:119
+#: ../purchasing/manage/suppliers.php:122
+#: ../purchasing/manage/suppliers.php.orig:129
+#: ../purchasing/manage/suppliers.php.orig:132
 msgid "Prices contain tax included:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:125
-#: /var/www/fa_unstable/devel/../reporting/rep704.php:91
-#: /var/www/fa_unstable/devel/../reporting/rep704.php:101
-#: /var/www/fa_unstable/devel/../reporting/rep704.php:109
+#: ../purchasing/manage/suppliers.php:124
+#: ../purchasing/manage/suppliers.php.orig:134
+msgid "Tax Calculation Algorithm:"
+msgstr ""
+
+#: ../purchasing/manage/suppliers.php:128
+#: ../purchasing/manage/suppliers.php.orig:138
+#: ../reporting/rep704.php:92
+#: ../reporting/rep704.php:102
+#: ../reporting/rep704.php:110
 msgid "Accounts"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:126
+#: ../purchasing/manage/suppliers.php:129
+#: ../purchasing/manage/suppliers.php.orig:139
 msgid "Accounts Payable Account:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:127
+#: ../purchasing/manage/suppliers.php:130
+#: ../purchasing/manage/suppliers.php.orig:140
 msgid "Purchase Account:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:128
+#: ../purchasing/manage/suppliers.php:131
+#: ../purchasing/manage/suppliers.php.orig:141
 msgid "Use Item Inventory/COGS Account"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:146
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:267
+#: ../purchasing/manage/suppliers.php:134
+#: ../purchasing/manage/suppliers.php:137
+#: ../purchasing/manage/suppliers.php.orig:112
+msgid "Contact Data"
+msgstr ""
+
+#: ../purchasing/manage/suppliers.php:140
+#: ../purchasing/manage/suppliers.php.orig:118
+msgid "System default"
+msgstr ""
+
+#: ../purchasing/manage/suppliers.php:157
+#: ../purchasing/manage/suppliers.php.orig:159
+#: ../sales/manage/customer_branches.php:268
 msgid "Addresses"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:147
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:268
+#: ../purchasing/manage/suppliers.php:158
+#: ../purchasing/manage/suppliers.php.orig:160
+#: ../sales/manage/customer_branches.php:269
 msgid "Mailing Address:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:148
+#: ../purchasing/manage/suppliers.php:159
+#: ../purchasing/manage/suppliers.php.orig:161
 msgid "Physical Address:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:150
+#: ../purchasing/manage/suppliers.php:161
+#: ../purchasing/manage/suppliers.php.orig:163
 msgid "General"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:151
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:270
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:251
+#: ../purchasing/manage/suppliers.php:162
+#: ../purchasing/manage/suppliers.php.orig:164
+#: ../sales/manage/customer_branches.php:271
+#: ../sales/manage/customers.php:286
+#: ../sales/manage/sav.customers.php:286
 msgid "General Notes:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:153
+#: ../purchasing/manage/suppliers.php:164
+#: ../purchasing/manage/suppliers.php.orig:166
 msgid "Supplier status:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:160
+#: ../purchasing/manage/suppliers.php:170
+#: ../purchasing/manage/suppliers.php.orig:173
 msgid "Update Supplier"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:161
+#: ../purchasing/manage/suppliers.php:171
+#: ../purchasing/manage/suppliers.php.orig:174
 msgid "Update supplier data"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:162
+#: ../purchasing/manage/suppliers.php:172
+#: ../purchasing/manage/suppliers.php.orig:175
 msgid "Select this supplier and return to document entry."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:163
+#: ../purchasing/manage/suppliers.php:173
+#: ../purchasing/manage/suppliers.php.orig:176
 msgid "Delete Supplier"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:164
+#: ../purchasing/manage/suppliers.php:174
+#: ../purchasing/manage/suppliers.php.orig:177
 msgid "Delete supplier data if have been never used"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:168
+#: ../purchasing/manage/suppliers.php:178
+#: ../purchasing/manage/suppliers.php.orig:181
 msgid "Add New Supplier Details"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:187
+#: ../purchasing/manage/suppliers.php:197
+#: ../purchasing/manage/suppliers.php.orig:200
 msgid "The supplier name must be entered."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:194
+#: ../purchasing/manage/suppliers.php:204
+#: ../purchasing/manage/suppliers.php.orig:207
 msgid "The supplier short name must be entered."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:214
+#: ../purchasing/manage/suppliers.php:224
+#: ../purchasing/manage/suppliers.php.orig:227
 msgid "Supplier has been updated."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:232
+#: ../purchasing/manage/suppliers.php:242
+#: ../purchasing/manage/suppliers.php.orig:245
 msgid "A new supplier has been added."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:250
+#: ../purchasing/manage/suppliers.php:260
+#: ../purchasing/manage/suppliers.php.orig:263
 msgid ""
 "Cannot delete this supplier because there are transactions that refer to "
 "this supplier."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:258
+#: ../purchasing/manage/suppliers.php:268
+#: ../purchasing/manage/suppliers.php.orig:271
 msgid ""
 "Cannot delete the supplier record because purchase orders have been created "
 "against this supplier."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:279
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_allocation_inquiry.php:48
+#: ../purchasing/manage/suppliers.php:289
+#: ../purchasing/manage/suppliers.php.orig:292
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:48
 msgid "Select a supplier: "
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:280
+#: ../purchasing/manage/suppliers.php:290
+#: ../purchasing/manage/suppliers.php.orig:293
 msgid "New supplier"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:298
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:323
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:300
-msgid "&General settings"
+#: ../purchasing/manage/suppliers.php:309
+#: ../purchasing/manage/suppliers.php.orig:312
+#: ../sales/manage/customer_branches.php:325
+#: ../sales/manage/customers.php:343
+#: ../sales/manage/sav.customers.php:343
+msgid "&Contacts"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/manage/suppliers.php:299
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:324
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:301
-msgid "&Contacts"
+#: ../purchasing/manage/suppliers.php:311
+#: ../purchasing/manage/suppliers.php.orig:314
+msgid "Purchase &Orders"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search_completed.php:24
+#: ../purchasing/inquiry/po_search_completed.php:24
+#: ../purchasing/inquiry/po_search_completed.php.orig:25
 msgid "Search Purchase Orders"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search_completed.php:60
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search.php:62
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_deliveries_view.php:103
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:225
+#: ../purchasing/inquiry/po_search_completed.php:60
+#: ../purchasing/inquiry/po_search_completed.php.orig:61
+#: ../purchasing/inquiry/po_search.php:62
+#: ../sales/inquiry/sales_deliveries_view.php:103
+#: ../sales/inquiry/sales_deliveries_view.php.orig:103
+#: ../sales/inquiry/sales_orders_view.php:247
+#: ../sales/inquiry/sales_orders_view.php.orig:224
 msgid "#:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search_completed.php:65
+#: ../purchasing/inquiry/po_search_completed.php:65
+#: ../purchasing/inquiry/po_search_completed.php.orig:66
 msgid "into location:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search_completed.php:116
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search.php:130
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:258
+#: ../purchasing/inquiry/po_search_completed.php:125
+#: ../purchasing/inquiry/po_search_completed.php.orig:124
+#: ../purchasing/inquiry/po_search.php:135
+#: ../sales/inquiry/sales_orders_view.php:289
+#: ../sales/inquiry/sales_orders_view.php.orig:266
 msgid "Order Date"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search_completed.php:118
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search.php:132
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:261
+#: ../purchasing/inquiry/po_search_completed.php:127
+#: ../purchasing/inquiry/po_search_completed.php.orig:126
+#: ../purchasing/inquiry/po_search.php:137
+#: ../sales/inquiry/sales_orders_view.php:292
+#: ../sales/inquiry/sales_orders_view.php.orig:269
 msgid "Order Total"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search.php:25
+#: ../purchasing/inquiry/po_search.php:25
 msgid "Search Outstanding Purchase Orders"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search.php:93
+#: ../purchasing/inquiry/po_search.php:98
 msgid "Receive"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/po_search.php:143
+#: ../purchasing/inquiry/po_search.php:148
 msgid "Marked orders have overdue items."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_allocation_inquiry.php:23
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:23
 msgid "Supplier Allocation Inquiry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_allocation_inquiry.php:55
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_allocation_inquiry.php:49
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:55
+#: ../sales/inquiry/customer_allocation_inquiry.php:49
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:49
 msgid "show settled:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_allocation_inquiry.php:129
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:129
 msgid "Supp Reference"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_allocation_inquiry.php:135
-#: /var/www/fa_unstable/devel/../reporting/rep101.php:131
-#: /var/www/fa_unstable/devel/../reporting/rep201.php:119
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:117
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_allocation_inquiry.php:151
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:135
+#: ../reporting/rep101.php:131
+#: ../reporting/rep201.php:119
+#: ../reporting/includes/doctext.inc:247
+#: ../sales/inquiry/customer_allocation_inquiry.php:154
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:154
 msgid "Allocated"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_inquiry.php:25
+#: ../purchasing/inquiry/supplier_inquiry.php:25
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:25
 msgid "Supplier Inquiry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_inquiry.php:47
+#: ../purchasing/inquiry/supplier_inquiry.php:48
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:48
 msgid "Select a supplier:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_inquiry.php:66
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_inquiry.php:67
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_inquiry.php:68
-#: /var/www/fa_unstable/devel/../reporting/rep102.php:110
-#: /var/www/fa_unstable/devel/../reporting/rep102.php:111
-#: /var/www/fa_unstable/devel/../reporting/rep102.php:112
-#: /var/www/fa_unstable/devel/../reporting/rep102.php:227
-#: /var/www/fa_unstable/devel/../reporting/rep202.php:112
-#: /var/www/fa_unstable/devel/../reporting/rep202.php:113
-#: /var/www/fa_unstable/devel/../reporting/rep202.php:114
-#: /var/www/fa_unstable/devel/../reporting/rep202.php:143
-#: /var/www/fa_unstable/devel/../reporting/rep202.php:144
-#: /var/www/fa_unstable/devel/../reporting/rep202.php:145
-#: /var/www/fa_unstable/devel/../reporting/rep202.php:233
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:179
-#: /var/www/fa_unstable/devel/../sales/create_recurrent_invoices.php:98
-#: /var/www/fa_unstable/devel/../sales/manage/recurrent_invoices.php:85
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_inquiry.php:71
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_inquiry.php:72
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_inquiry.php:73
+#: ../purchasing/inquiry/supplier_inquiry.php:67
+#: ../purchasing/inquiry/supplier_inquiry.php:68
+#: ../purchasing/inquiry/supplier_inquiry.php:69
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:67
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:68
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:69
+#: ../reporting/rep102.php:118
+#: ../reporting/rep102.php:119
+#: ../reporting/rep102.php:120
+#: ../reporting/rep102.php:240
+#: ../reporting/rep108.php:150
+#: ../reporting/rep108.php:151
+#: ../reporting/rep108.php:152
+#: ../reporting/rep202.php:122
+#: ../reporting/rep202.php:123
+#: ../reporting/rep202.php:124
+#: ../reporting/rep202.php:154
+#: ../reporting/rep202.php:155
+#: ../reporting/rep202.php:156
+#: ../reporting/rep202.php:248
+#: ../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
+#: ../sales/inquiry/customer_inquiry.php.orig:72
+#: ../sales/inquiry/customer_inquiry.php.orig:73
+#: ../sales/inquiry/customer_inquiry.php.orig:74
 msgid "Days"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_inquiry.php:68
-#: /var/www/fa_unstable/devel/../reporting/rep102.php:112
-#: /var/www/fa_unstable/devel/../reporting/rep202.php:114
-#: /var/www/fa_unstable/devel/../reporting/rep202.php:145
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:180
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_inquiry.php:73
+#: ../purchasing/inquiry/supplier_inquiry.php:69
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:69
+#: ../reporting/rep102.php:120
+#: ../reporting/rep108.php:152
+#: ../reporting/rep202.php:124
+#: ../reporting/rep202.php:156
+#: ../sales/inquiry/customer_inquiry.php:73
+#: ../sales/inquiry/customer_inquiry.php.orig:74
 msgid "Over"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_inquiry.php:72
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_inquiry.php:76
+#: ../purchasing/inquiry/supplier_inquiry.php:73
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:73
+#: ../sales/inquiry/customer_inquiry.php:76
+#: ../sales/inquiry/customer_inquiry.php.orig:77
 msgid "Terms"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_inquiry.php:72
-#: /var/www/fa_unstable/devel/../reporting/rep102.php:115
-#: /var/www/fa_unstable/devel/../reporting/rep102.php:225
-#: /var/www/fa_unstable/devel/../reporting/rep202.php:118
-#: /var/www/fa_unstable/devel/../reporting/rep202.php:231
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:175
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_inquiry.php:76
+#: ../purchasing/inquiry/supplier_inquiry.php:73
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:73
+#: ../reporting/rep102.php:123
+#: ../reporting/rep102.php:238
+#: ../reporting/rep108.php:154
+#: ../reporting/rep202.php:128
+#: ../reporting/rep202.php:246
+#: ../sales/inquiry/customer_inquiry.php:76
+#: ../sales/inquiry/customer_inquiry.php.orig:77
 msgid "Current"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_inquiry.php:73
-#: /var/www/fa_unstable/devel/../reporting/rep102.php:116
-#: /var/www/fa_unstable/devel/../reporting/rep202.php:119
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:176
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_inquiry.php:77
+#: ../purchasing/inquiry/supplier_inquiry.php:74
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:74
+#: ../reporting/rep102.php:124
+#: ../reporting/rep108.php:154
+#: ../reporting/rep202.php:129
+#: ../sales/inquiry/customer_inquiry.php:77
+#: ../sales/inquiry/customer_inquiry.php.orig:78
 msgid "Total Balance"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_inquiry.php:127
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_inquiry.php:158
+#: ../purchasing/inquiry/supplier_inquiry.php:133
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:130
+#: ../sales/inquiry/customer_inquiry.php:162
+#: ../sales/inquiry/customer_inquiry.php.orig:161
 msgid "Credit This"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/inquiry/supplier_inquiry.php:149
+#: ../purchasing/inquiry/supplier_inquiry.php:155
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:152
 msgid "Print Remittance"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/allocations/supplier_allocate.php:29
+#: ../purchasing/allocations/supplier_allocate.php:29
 msgid "Allocate Supplier Payment or Credit Note"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/allocations/supplier_allocate.php:50
+#: ../purchasing/allocations/supplier_allocate.php:50
 msgid "Allocation of"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/allocations/supplier_allocate.php:55
-#: /var/www/fa_unstable/devel/../sales/allocations/customer_allocate.php:54
+#: ../purchasing/allocations/supplier_allocate.php:55
+#: ../sales/allocations/customer_allocate.php:54
 msgid "Total:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/allocations/supplier_allocate.php:64
-#: /var/www/fa_unstable/devel/../sales/allocations/customer_allocate.php:63
+#: ../purchasing/allocations/supplier_allocate.php:64
+#: ../sales/allocations/customer_allocate.php:63
 msgid "Start again allocation of selected amount"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/allocations/supplier_allocate.php:65
-#: /var/www/fa_unstable/devel/../sales/allocations/customer_allocate.php:64
+#: ../purchasing/allocations/supplier_allocate.php:65
+#: ../sales/allocations/customer_allocate.php:64
 msgid "Process allocations"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/allocations/supplier_allocate.php:66
-#: /var/www/fa_unstable/devel/../purchasing/allocations/supplier_allocate.php:72
-#: /var/www/fa_unstable/devel/../sales/allocations/customer_allocate.php:65
-#: /var/www/fa_unstable/devel/../sales/allocations/customer_allocate.php:71
+#: ../purchasing/allocations/supplier_allocate.php:66
+#: ../purchasing/allocations/supplier_allocate.php:72
+#: ../sales/allocations/customer_allocate.php:65
+#: ../sales/allocations/customer_allocate.php:71
 msgid "Back to Allocations"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/allocations/supplier_allocate.php:67
-#: /var/www/fa_unstable/devel/../purchasing/allocations/supplier_allocate.php:73
-#: /var/www/fa_unstable/devel/../sales/allocations/customer_allocate.php:65
-#: /var/www/fa_unstable/devel/../sales/allocations/customer_allocate.php:72
+#: ../purchasing/allocations/supplier_allocate.php:67
+#: ../purchasing/allocations/supplier_allocate.php:73
+#: ../sales/allocations/customer_allocate.php:65
+#: ../sales/allocations/customer_allocate.php:72
 msgid "Abandon allocations and return to selection of allocatable amounts"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/allocations/supplier_allocate.php:71
-#: /var/www/fa_unstable/devel/../sales/allocations/customer_allocate.php:69
+#: ../purchasing/allocations/supplier_allocate.php:71
+#: ../sales/allocations/customer_allocate.php:69
 msgid "There are no unsettled transactions to allocate."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/allocations/supplier_allocation_main.php:26
+#: ../purchasing/allocations/supplier_allocation_main.php:26
 msgid "Supplier Allocations"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/allocations/supplier_allocation_main.php:36
+#: ../purchasing/allocations/supplier_allocation_main.php:36
 msgid "Select a Supplier: "
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/allocations/supplier_allocation_main.php:39
-#: /var/www/fa_unstable/devel/../sales/allocations/customer_allocation_main.php:35
+#: ../purchasing/allocations/supplier_allocation_main.php:39
+#: ../sales/allocations/customer_allocation_main.php:35
 msgid "Show Settled Items:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/allocations/supplier_allocation_main.php:70
-#: /var/www/fa_unstable/devel/../sales/allocations/customer_allocation_main.php:74
+#: ../purchasing/allocations/supplier_allocation_main.php:70
+#: ../sales/allocations/customer_allocation_main.php:74
 msgid "Allocate"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../purchasing/allocations/supplier_allocation_main.php:111
-#: /var/www/fa_unstable/devel/../sales/allocations/customer_allocation_main.php:110
+#: ../purchasing/allocations/supplier_allocation_main.php:111
+#: ../sales/allocations/customer_allocation_main.php:110
 msgid "Marked items are settled."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep101.php:120
-#: /var/www/fa_unstable/devel/../reporting/rep102.php:100
-#: /var/www/fa_unstable/devel/../reporting/rep202.php:102
-#: /var/www/fa_unstable/devel/../reporting/rep203.php:81
+#: ../reporting/rep101.php:120
+#: ../reporting/rep102.php:106
+#: ../reporting/rep114.php:103
+#: ../reporting/rep202.php:110
+#: ../reporting/rep203.php:81
 msgid "Balances in Home Currency"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep101.php:130
-#: /var/www/fa_unstable/devel/../reporting/rep201.php:118
-#: /var/www/fa_unstable/devel/../reporting/rep203.php:91
-#: /var/www/fa_unstable/devel/../reporting/rep709.php:107
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:108
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:116
+#: ../reporting/rep101.php:130
+#: ../reporting/rep201.php:118
+#: ../reporting/rep203.php:91
+#: ../reporting/rep709.php:109
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:208
+#: ../reporting/includes/doctext.inc:246
 msgid "Trans Type"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep101.php:130
-#: /var/www/fa_unstable/devel/../reporting/rep201.php:118
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:116
+#: ../reporting/rep101.php:130
+#: ../reporting/rep201.php:118
+#: ../reporting/includes/doctext.inc:246
 msgid "Charges"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep101.php:130
-#: /var/www/fa_unstable/devel/../reporting/rep201.php:119
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:117
+#: ../reporting/rep101.php:130
+#: ../reporting/rep201.php:119
+#: ../reporting/includes/doctext.inc:247
 msgid "Credits"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep101.php:139
-#: /var/www/fa_unstable/devel/../reporting/rep102.php:125
-#: /var/www/fa_unstable/devel/../reporting/rep201.php:127
-#: /var/www/fa_unstable/devel/../reporting/rep202.php:128
-#: /var/www/fa_unstable/devel/../reporting/rep203.php:100
-#: /var/www/fa_unstable/devel/../reporting/rep303.php:124
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:35
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:43
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:127
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:135
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:143
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:182
+#: ../reporting/rep101.php:139
+#: ../reporting/rep102.php:134
+#: ../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:195
 msgid "Suppress Zeros"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep101.php:141
+#: ../reporting/rep101.php:141
 msgid "Customer Balances"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep101.php:244
-#: /var/www/fa_unstable/devel/../reporting/rep102.php:211
-#: /var/www/fa_unstable/devel/../reporting/rep106.php:177
-#: /var/www/fa_unstable/devel/../reporting/rep201.php:231
-#: /var/www/fa_unstable/devel/../reporting/rep202.php:216
-#: /var/www/fa_unstable/devel/../reporting/rep203.php:177
-#: /var/www/fa_unstable/devel/../reporting/rep204.php:144
-#: /var/www/fa_unstable/devel/../reporting/rep301.php:171
-#: /var/www/fa_unstable/devel/../reporting/rep304.php:193
-#: /var/www/fa_unstable/devel/../reporting/rep305.php:132
+#: ../reporting/rep101.php:244
+#: ../reporting/rep102.php:224
+#: ../reporting/rep106.php:167
+#: ../reporting/rep201.php:231
+#: ../reporting/rep202.php:231
+#: ../reporting/rep203.php:177
+#: ../reporting/rep204.php:144
+#: ../reporting/rep301.php:176
+#: ../reporting/rep304.php:191
+#: ../reporting/rep305.php:181
 msgid "Grand Total"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep102.php:94
-#: /var/www/fa_unstable/devel/../reporting/rep106.php:91
-#: /var/www/fa_unstable/devel/../reporting/rep202.php:96
-#: /var/www/fa_unstable/devel/../reporting/rep709.php:91
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:42
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:74
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:134
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:168
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:380
+#: ../reporting/rep102.php:100
+#: ../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:181
+#: ../reporting/reports_main.php:393
 msgid "Summary Only"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep102.php:96
-#: /var/www/fa_unstable/devel/../reporting/rep202.php:98
-#: /var/www/fa_unstable/devel/../reporting/rep709.php:93
+#: ../reporting/rep102.php:102
+#: ../reporting/rep202.php:106
+#: ../reporting/rep709.php:95
 msgid "Detailed Report"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep102.php:121
-#: /var/www/fa_unstable/devel/../reporting/rep202.php:124
-#: /var/www/fa_unstable/devel/../reporting/rep203.php:97
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:32
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:39
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:65
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:73
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:124
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:131
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:140
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:187
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:195
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:227
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:238
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:249
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:265
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:275
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:286
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:298
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:312
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:321
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:331
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:342
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:354
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:362
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:371
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:379
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:385
+#: ../reporting/rep102.php:129
+#: ../reporting/rep202.php:134
+#: ../reporting/rep203.php:97
+#: ../reporting/rep301.php:108
+#: ../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:178
+#: ../reporting/reports_main.php:200
+#: ../reporting/reports_main.php:208
+#: ../reporting/reports_main.php:240
+#: ../reporting/reports_main.php:251
+#: ../reporting/reports_main.php:262
+#: ../reporting/reports_main.php:278
+#: ../reporting/reports_main.php:288
+#: ../reporting/reports_main.php:299
+#: ../reporting/reports_main.php:311
+#: ../reporting/reports_main.php:325
+#: ../reporting/reports_main.php:334
+#: ../reporting/reports_main.php:344
+#: ../reporting/reports_main.php:355
+#: ../reporting/reports_main.php:367
+#: ../reporting/reports_main.php:375
+#: ../reporting/reports_main.php:384
+#: ../reporting/reports_main.php:392
+#: ../reporting/reports_main.php:398
 msgid "End Date"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep102.php:129
+#: ../reporting/rep102.php:133
+#: ../reporting/rep202.php:138
+#: ../reporting/reports_main.php:45
+#: ../reporting/reports_main.php:110
+#: ../reporting/reports_main.php:145
+msgid "Show Also Allocated"
+msgstr ""
+
+#: ../reporting/rep102.php:138
 msgid "Aged Customer Analysis"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep103.php:115
+#: ../reporting/rep103.php:115
 msgid "All Areas"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep103.php:119
+#: ../reporting/rep103.php:119
 msgid "All Sales Folk"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep103.php:123
+#: ../reporting/rep103.php:123
 msgid "Greater than "
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep103.php:127
+#: ../reporting/rep103.php:127
 msgid "Less than "
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep103.php:136
+#: ../reporting/rep103.php:136
 msgid "Customer Postal Address"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep103.php:136
+#: ../reporting/rep103.php:136
 msgid "Price/Turnover"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep103.php:136
+#: ../reporting/rep103.php:136
 msgid "Branch Contact Information"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep103.php:137
+#: ../reporting/rep103.php:137
 msgid "Branch Delivery Address"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep103.php:142
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:48
+#: ../reporting/rep103.php:142
+#: ../reporting/reports_main.php:52
 msgid "Activity Since"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep103.php:143
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:49
-#: /var/www/fa_unstable/devel/../sales/manage/sales_areas.php:16
+#: ../reporting/rep103.php:143
+#: ../reporting/reports_main.php:53
+#: ../sales/manage/sales_areas.php:16
 msgid "Sales Areas"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep103.php:144
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:50
+#: ../reporting/rep103.php:144
+#: ../reporting/reports_main.php:54
 msgid "Sales Folk"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep103.php:145
+#: ../reporting/rep103.php:145
 msgid "Activity"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep103.php:147
+#: ../reporting/rep103.php:147
 msgid "Customer Details Listing"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep103.php:175
+#: ../reporting/rep103.php:175
 msgid "Customers in"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep103.php:199
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:403
+#: ../reporting/rep103.php:196
 msgid "Price List"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep103.php:201
+#: ../reporting/rep103.php:207
 msgid "Turnover"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep103.php:208
+#: ../reporting/rep103.php:216
 msgid "Ph"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep104.php:109
+#: ../reporting/rep104.php:109
 msgid "Category/Items"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep104.php:109
-#: /var/www/fa_unstable/devel/../reporting/rep301.php:99
-#: /var/www/fa_unstable/devel/../reporting/rep303.php:109
-#: /var/www/fa_unstable/devel/../reporting/rep303.php:115
+#: ../reporting/rep104.php:109
+#: ../reporting/rep301.php:103
+#: ../reporting/rep303.php:109
+#: ../reporting/rep303.php:115
 msgid "UOM"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep104.php:109
+#: ../reporting/rep104.php:109
 msgid "GP %"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep104.php:117
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:60
+#: ../reporting/rep104.php:117
+#: ../reporting/reports_main.php:70
 msgid "Show GP %"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep104.php:124
+#: ../reporting/rep104.php:124
 msgid "Price Listing"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep104.php:191
+#: ../reporting/rep104.php:191
 msgid "Sales Kits"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep105.php:101
+#: ../reporting/rep105.php:101
 msgid "All Orders"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep105.php:103
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:68
+#: ../reporting/rep105.php:103
+#: ../reporting/reports_main.php:78
 msgid "Back Orders Only"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep105.php:107
-#: /var/www/fa_unstable/devel/../reporting/rep204.php:82
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_allocation_inquiry.php:144
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_inquiry.php:214
+#: ../reporting/rep105.php:107
+#: ../reporting/rep204.php:82
+#: ../sales/inquiry/customer_allocation_inquiry.php:147
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:147
+#: ../sales/inquiry/customer_inquiry.php:202
+#: ../sales/inquiry/customer_inquiry.php.orig:226
 msgid "Order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep105.php:107
-#: /var/www/fa_unstable/devel/../reporting/rep106.php:81
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:163
-#: /var/www/fa_unstable/devel/../sales/create_recurrent_invoices.php:98
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:247
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:337
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:370
-#: /var/www/fa_unstable/devel/../sales/manage/recurrent_invoices.php:85
-#: /var/www/fa_unstable/devel/../sales/view/view_credit.php:58
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_inquiry.php:219
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_deliveries_view.php:177
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:256
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:270
+#: ../reporting/rep105.php:107
+#: ../reporting/rep106.php:81
+#: ../reporting/rep112.php:164
+#: ../sales/create_recurrent_invoices.php:115
+#: ../sales/customer_credit_invoice.php:238
+#: ../sales/customer_delivery.php:347
+#: ../sales/customer_invoice.php:445
+#: ../sales/manage/customers.php:251
+#: ../sales/manage/customers.php:289
+#: ../sales/manage/recurrent_invoices.php:102
+#: ../sales/manage/sav.customers.php:251
+#: ../sales/manage/sav.customers.php:289
+#: ../sales/view/view_credit.php:58
+#: ../sales/inquiry/customer_inquiry.php:207
+#: ../sales/inquiry/customer_inquiry.php.orig:231
+#: ../sales/inquiry/sales_deliveries_view.php:182
+#: ../sales/inquiry/sales_deliveries_view.php.orig:182
+#: ../sales/inquiry/sales_orders_view.php:287
+#: ../sales/inquiry/sales_orders_view.php:301
+#: ../sales/inquiry/sales_orders_view.php.orig:264
+#: ../sales/inquiry/sales_orders_view.php.orig:278
 msgid "Branch"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep105.php:107
-#: /var/www/fa_unstable/devel/../reporting/rep106.php:81
+#: ../reporting/rep105.php:107
+#: ../reporting/rep106.php:81
 msgid "Customer Ref"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep105.php:108
+#: ../reporting/rep105.php:108
 msgid "Ord Date"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep105.php:108
+#: ../reporting/rep105.php:108
 msgid "Del Date"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep105.php:108
-#: /var/www/fa_unstable/devel/../reporting/rep401.php:69
+#: ../reporting/rep105.php:108
+#: ../reporting/rep401.php:69
 msgid "Loc"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep105.php:112
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:430
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:440
+#: ../reporting/rep105.php:112
+#: ../sales/customer_delivery.php:440
+#: ../sales/customer_invoice.php:542
 msgid "Invoiced"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep105.php:119
+#: ../reporting/rep105.php:119
 msgid "Selection"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep105.php:124
+#: ../reporting/rep105.php:124
 msgid "Order Status Listing"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep106.php:81
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_deliveries_view.php:161
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:142
-msgid "Invoice"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../reporting/rep106.php:82
+#: ../reporting/rep106.php:82
 msgid "Inv Date"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep106.php:82
-#: /var/www/fa_unstable/devel/../reporting/rep106.php:86
-#: /var/www/fa_unstable/devel/../reporting/rep106.php:87
-#: /var/www/fa_unstable/devel/../sales/manage/sales_people.php:99
-#: /var/www/fa_unstable/devel/../sales/manage/sales_people.php:159
-#: /var/www/fa_unstable/devel/../sales/manage/sales_people.php:161
+#: ../reporting/rep106.php:82
+#: ../reporting/rep106.php:86
+#: ../reporting/rep106.php:87
+#: ../sales/manage/sales_people.php:99
+#: ../sales/manage/sales_people.php:159
+#: ../sales/manage/sales_people.php:161
 msgid "Provision"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep106.php:86
+#: ../reporting/rep106.php:86
 msgid "Salesman"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep106.php:86
-#: /var/www/fa_unstable/devel/../reporting/includes/header2.inc:98
-#: /var/www/fa_unstable/devel/../sales/manage/sales_people.php:99
+#: ../reporting/rep106.php:86
+#: ../reporting/includes/header2.inc:110
+#: ../sales/manage/sales_people.php:99
 msgid "Email"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep106.php:87
-#: /var/www/fa_unstable/devel/../sales/manage/sales_people.php:99
+#: ../reporting/rep106.php:87
+#: ../sales/manage/sales_people.php:99
 msgid "Break Pt."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep106.php:96
+#: ../reporting/rep106.php:96
 msgid "Salesman Listing"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep107.php:66
-#: /var/www/fa_unstable/devel/../reporting/rep107.php:100
-#: /var/www/fa_unstable/devel/../reporting/rep107.php:111
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:92
+#: ../reporting/rep107.php:85
+#: ../reporting/rep107.php:105
+#: ../reporting/includes/doctext.inc:118
 msgid "INVOICE"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep107.php:105
-#: /var/www/fa_unstable/devel/../reporting/rep107.php:111
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:100
-msgid "CREDIT NOTE"
+#: ../reporting/rep107.php:186
+msgid "Prepayments invoiced to this order up to day:"
+msgstr ""
+
+#: ../reporting/rep107.php:193
+msgid "Invoice reference"
+msgstr ""
+
+#: ../reporting/rep107.php:210
+msgid "Total payments:"
+msgstr ""
+
+#: ../reporting/rep107.php:220
+#: ../reporting/rep109.php:155
+#: ../reporting/rep110.php:164
+#: ../reporting/rep111.php:140
+#: ../reporting/rep113.php:150
+#: ../sales/view/view_credit.php:138
+#: ../sales/view/view_dispatch.php:155
+#: ../sales/view/view_invoice.php:159
+#: ../sales/view/view_sales_order.php:245
+#: ../sales/view/view_sales_order.php.orig:227
+#: ../sales/includes/ui/sales_credit_ui.inc:222
+msgid "Shipping"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep108.php:84
-#: /var/www/fa_unstable/devel/../reporting/rep108.php:115
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:115
+#: ../reporting/rep107.php:266
+#: ../reporting/rep109.php:207
+#: ../reporting/rep111.php:192
+msgid "TOTAL ORDER VAT INCL."
+msgstr ""
+
+#: ../reporting/rep107.php:272
+msgid "THIS INVOICE"
+msgstr ""
+
+#: ../reporting/rep108.php:84
+#: ../reporting/rep108.php:115
+#: ../reporting/includes/doctext.inc:238
 msgid "STATEMENT"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep109.php:65
-#: /var/www/fa_unstable/devel/../reporting/rep109.php:93
-#: /var/www/fa_unstable/devel/../reporting/rep109.php:99
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:90
+#: ../reporting/rep108.php:126
+msgid "Outstanding Transactions"
+msgstr ""
+
+#: ../reporting/rep108.php:169
+msgid "Statement"
+msgstr ""
+
+#: ../reporting/rep108.php:169
+msgid "as of"
+msgstr ""
+
+#: ../reporting/rep109.php:66
+#: ../reporting/rep109.php:94
+#: ../reporting/rep109.php:100
+#: ../reporting/includes/doctext.inc:65
 msgid "SALES ORDER"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep109.php:67
-#: /var/www/fa_unstable/devel/../reporting/rep109.php:88
-#: /var/www/fa_unstable/devel/../reporting/rep109.php:99
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:90
+#: ../reporting/rep109.php:68
+#: ../reporting/rep109.php:89
+#: ../reporting/rep109.php:100
+#: ../reporting/includes/doctext.inc:65
 msgid "QUOTE"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep110.php:68
+#: ../reporting/rep109.php:161
+#: ../reporting/rep111.php:146
+msgid "TOTAL ORDER EX VAT"
+msgstr ""
+
+#: ../reporting/rep110.php:68
 msgid "DELIVERY"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep110.php:70
-#: /var/www/fa_unstable/devel/../reporting/rep110.php:97
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:88
+#: ../reporting/rep110.php:70
+#: ../reporting/rep110.php:97
+#: ../reporting/includes/doctext.inc:82
 msgid "PACKING SLIP"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep110.php:92
-#: /var/www/fa_unstable/devel/../reporting/rep110.php:103
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:88
+#: ../reporting/rep110.php:92
+#: ../reporting/rep110.php:103
+#: ../reporting/includes/doctext.inc:82
 msgid "DELIVERY NOTE"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep111.php:60
-#: /var/www/fa_unstable/devel/../reporting/rep111.php:85
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:84
+#: ../reporting/rep110.php:208
+msgid "TOTAL DELIVERY INCL. VAT"
+msgstr ""
+
+#: ../reporting/rep111.php:61
+#: ../reporting/rep111.php:86
+#: ../reporting/includes/doctext.inc:50
 msgid "SALES QUOTATION"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep112.php:92
-#: /var/www/fa_unstable/devel/../reporting/rep112.php:112
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:98
+#: ../reporting/rep112.php:80
+#: ../reporting/rep112.php:101
+#: ../reporting/includes/doctext.inc:198
 msgid "RECEIPT"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep201.php:108
+#: ../reporting/rep112.php:110
+#: ../reporting/rep210.php:124
+msgid "As advance / full / part / payment towards:"
+msgstr ""
+
+#: ../reporting/rep112.php:145
+msgid "TOTAL RECEIPT"
+msgstr ""
+
+#: ../reporting/rep112.php:155
+msgid "Received / Sign"
+msgstr ""
+
+#: ../reporting/rep112.php:157
+msgid "By Cash / Cheque* / Draft No."
+msgstr ""
+
+#: ../reporting/rep112.php:159
+msgid "Dated"
+msgstr ""
+
+#: ../reporting/rep112.php:162
+msgid "Drawn on Bank"
+msgstr ""
+
+#: ../reporting/rep113.php:66
+#: ../reporting/rep113.php:91
+#: ../reporting/rep113.php:96
+#: ../reporting/includes/doctext.inc:103
+msgid "CREDIT NOTE"
+msgstr ""
+
+#: ../reporting/rep113.php:194
+#: ../sales/view/view_credit.php:143
+msgid "TOTAL CREDIT"
+msgstr ""
+
+#: ../reporting/rep114.php:85
+msgid "Sales Summary Report"
+msgstr ""
+
+#: ../reporting/rep114.php:89
+#: ../reporting/reports_main.php:62
+msgid "Tax Id Only"
+msgstr ""
+
+#: ../reporting/rep114.php:93
+msgid "Tax Id"
+msgstr ""
+
+#: ../reporting/rep114.php:93
+msgid "Total ex. Tax"
+msgstr ""
+
+#: ../reporting/rep114.php:93
+#: ../reporting/rep709.php:110
+#: ../taxes/tax_groups.php:171
+#: ../taxes/tax_groups.php.orig:173
+#: ../taxes/tax_groups.php.sav:173
+msgid "Tax"
+msgstr ""
+
+#: ../reporting/rep201.php:108
 msgid "Balances in Home currency"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep201.php:129
+#: ../reporting/rep201.php:129
 msgid "Supplier Balances"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep202.php:131
+#: ../reporting/rep202.php:142
 msgid "currency"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep202.php:132
+#: ../reporting/rep202.php:143
 msgid "Aged Supplier Analysis"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep203.php:102
+#: ../reporting/rep203.php:102
 msgid "Payment Report"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep204.php:82
-msgid "GRN"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../reporting/rep204.php:82
+#: ../reporting/rep204.php:82
 msgid "Qty Recd"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep204.php:82
+#: ../reporting/rep204.php:82
 msgid "qty Inv"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep204.php:83
+#: ../reporting/rep204.php:83
 msgid "Act Price"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep204.php:90
+#: ../reporting/rep204.php:90
 msgid "Outstanding GRNs Report"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep209.php:88
-#: /var/www/fa_unstable/devel/../reporting/rep209.php:107
-#: /var/www/fa_unstable/devel/../reporting/rep209.php:112
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:86
+#: ../reporting/rep209.php:88
+#: ../reporting/rep209.php:107
+#: ../reporting/rep209.php:112
+#: ../reporting/includes/doctext.inc:171
 msgid "PURCHASE ORDER"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep210.php:94
-#: /var/www/fa_unstable/devel/../reporting/rep210.php:121
-#: /var/www/fa_unstable/devel/../reporting/rep210.php:126
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:96
+#: ../reporting/rep209.php:214
+msgid "TOTAL PO"
+msgstr ""
+
+#: ../reporting/rep210.php:82
+#: ../reporting/rep210.php:110
+#: ../reporting/rep210.php:115
+#: ../reporting/includes/doctext.inc:151
 msgid "REMITTANCE"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep301.php:107
+#: ../reporting/rep210.php:159
+msgid "TOTAL REMITTANCE"
+msgstr ""
+
+#: ../reporting/rep301.php:112
 msgid "Inventory Valuation Report"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep302.php:123
+#: ../reporting/rep302.php:123
 msgid "QOH"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep302.php:123
+#: ../reporting/rep302.php:123
 msgid "Cust Ord"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep302.php:123
+#: ../reporting/rep302.php:123
 msgid "Supp Ord"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep302.php:123
+#: ../reporting/rep302.php:123
 msgid "Sugg Ord"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep302.php:132
+#: ../reporting/rep302.php:132
 msgid "Inventory Planning Report"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep303.php:97
+#: ../reporting/rep303.php:97
 msgid "Shortage"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep303.php:109
-#: /var/www/fa_unstable/devel/../reporting/rep303.php:115
-#: /var/www/fa_unstable/devel/../reporting/rep305.php:72
+#: ../reporting/rep303.php:109
+#: ../reporting/rep303.php:115
+#: ../reporting/rep305.php:95
 msgid "Stock ID"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep303.php:109
+#: ../reporting/rep303.php:109
 msgid "Check"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep303.php:123
+#: ../reporting/rep303.php:123
 msgid "Only Shortage"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep303.php:131
+#: ../reporting/rep303.php:131
 msgid "Stock Check Sheets"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep304.php:114
+#: ../reporting/rep304.php:112
+#: ../reporting/rep305.php:95
 msgid "Qty"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep304.php:114
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:241
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:224
+#: ../reporting/rep304.php:112
+#: ../sales/manage/customer_branches.php:241
+#: ../sales/manage/customers.php:259
+#: ../sales/manage/sav.customers.php:259
 msgid "Sales"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep304.php:114
+#: ../reporting/rep304.php:112
 msgid "Cost"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep304.php:114
+#: ../reporting/rep304.php:112
 msgid "Contribution"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep304.php:126
+#: ../reporting/rep304.php:124
 msgid "Inventory Sales Report"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep305.php:72
+#: ../reporting/rep305.php:95
 msgid "PO No"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep305.php:72
-msgid "Qty Received"
+#: ../reporting/rep305.php:95
+msgid "Inv"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep305.php:72
-msgid "Unit Price"
+#: ../reporting/rep305.php:95
+msgid "Inv Price"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep305.php:72
-msgid "Actual Price"
+#: ../reporting/rep305.php:95
+msgid "PO Price"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep305.php:79
+#: ../reporting/rep305.php:102
 msgid "GRN Valuation Report"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep401.php:69
+#: ../reporting/rep401.php:69
 msgid "Wrk Ctr"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep401.php:76
+#: ../reporting/rep401.php:76
 msgid "Bill of Material Listing"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep409.php:60
-#: /var/www/fa_unstable/devel/../reporting/rep409.php:79
-#: /var/www/fa_unstable/devel/../reporting/rep409.php:84
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:94
+#: ../reporting/rep409.php:58
+#: ../reporting/rep409.php:77
+#: ../reporting/rep409.php:82
+#: ../reporting/includes/doctext.inc:214
 msgid "WORK ORDER"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep409.php:134
+#: ../reporting/rep409.php:132
 msgid "Insufficient stock"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep409.php:148
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:136
-msgid "Work Order No."
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../reporting/rep501.php:85
+#: ../reporting/rep501.php:85
 msgid "YTD"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep501.php:92
+#: ../reporting/rep501.php:92
 msgid "Dimension Summary"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep601.php:83
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:70
+#: ../reporting/rep601.php:83
+#: ../reporting/rep602.php:87
+#: ../reporting/includes/doctext.inc:260
 msgid "Bank Account"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep601.php:144
+#: ../reporting/rep601.php:144
+#: ../reporting/rep602.php:151
 msgid "Total Debit / Credit"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep601.php:161
+#: ../reporting/rep601.php:161
+#: ../reporting/rep602.php:167
 msgid "Net Change"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../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:51
 msgid "Type/Account"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep702.php:51
+#: ../reporting/rep702.php:51
 msgid "Date/Dim."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep702.php:52
+#: ../reporting/rep702.php:52
 msgid "Person/Item/Memo"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep702.php:62
+#: ../reporting/rep702.php:62
 msgid "List of Journal Entries"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep704.php:66
+#: ../reporting/rep704.php:67
 msgid "GL Account Transactions"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep704.php:78
-#: /var/www/fa_unstable/devel/../reporting/rep704.php:81
-#: /var/www/fa_unstable/devel/../reporting/rep704.php:84
-#: /var/www/fa_unstable/devel/../reporting/rep709.php:107
-#: /var/www/fa_unstable/devel/../sales/view/view_credit.php:68
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:94
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:127
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:159
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:228
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:254
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:268
-msgid "Ref"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../reporting/rep705.php:243
-#: /var/www/fa_unstable/devel/../reporting/rep705.php:256
-#: /var/www/fa_unstable/devel/../reporting/rep705.php:267
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:257
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:305
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:348
+#: ../reporting/rep705.php:243
+#: ../reporting/rep705.php:256
+#: ../reporting/rep705.php:267
+#: ../reporting/reports_main.php:270
+#: ../reporting/reports_main.php:318
+#: ../reporting/reports_main.php:361
 msgid "Year"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep705.php:249
-#: /var/www/fa_unstable/devel/../reporting/rep705.php:260
-#: /var/www/fa_unstable/devel/../reporting/rep705.php:269
-#: /var/www/fa_unstable/devel/../reporting/rep706.php:194
-#: /var/www/fa_unstable/devel/../reporting/rep706.php:202
-#: /var/www/fa_unstable/devel/../reporting/rep706.php:208
-#: /var/www/fa_unstable/devel/../reporting/rep707.php:218
-#: /var/www/fa_unstable/devel/../reporting/rep707.php:226
-#: /var/www/fa_unstable/devel/../reporting/rep707.php:232
+#: ../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
 msgid "Tags"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep705.php:250
-#: /var/www/fa_unstable/devel/../reporting/rep705.php:261
-#: /var/www/fa_unstable/devel/../reporting/rep705.php:270
+#: ../reporting/rep705.php:250
+#: ../reporting/rep705.php:261
+#: ../reporting/rep705.php:270
 msgid "Amounts in thousands"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep705.php:274
+#: ../reporting/rep705.php:274
 msgid "Annual Expense Breakdown"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep706.php:182
+#: ../reporting/rep706.php:182
 msgid "Close Balance"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep706.php:302
-#: /var/www/fa_unstable/devel/../reporting/rep707.php:320
-#: /var/www/fa_unstable/devel/../sales/create_recurrent_invoices.php:98
-#: /var/www/fa_unstable/devel/../sales/manage/recurrent_invoices.php:85
-msgid "Group"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../reporting/rep707.php:254
+#: ../reporting/rep707.php:254
 msgid "Profit and Loss Statement"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep709.php:89
+#: ../reporting/rep709.php:91
 msgid "Tax Report"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep709.php:107
+#: ../reporting/rep709.php:109
 msgid "Branch Name"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep709.php:108
+#: ../reporting/rep709.php:110
 msgid "Net"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep709.php:108
-#: /var/www/fa_unstable/devel/../taxes/item_tax_types.php:180
+#: ../reporting/rep709.php:110
+#: ../taxes/item_tax_types.php:185
 msgid "Rate"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep709.php:108
-#: /var/www/fa_unstable/devel/../taxes/tax_groups.php:214
-msgid "Tax"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../reporting/rep709.php:168
+#: ../reporting/rep709.php:172
 msgid "Tax Rate"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep709.php:168
+#: ../reporting/rep709.php:172
 msgid "Net Tax"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep710.php:75
+#: ../reporting/rep710.php:75
 msgid "Time"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep710.php:75
+#: ../reporting/rep710.php:75
 msgid "Trans Date"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep710.php:76
+#: ../reporting/rep710.php:76
 msgid "Action"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep710.php:87
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:383
+#: ../reporting/rep710.php:87
+#: ../reporting/reports_main.php:396
 msgid "Audit Trail"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/rep710.php:107
+#: ../reporting/rep710.php:107
 msgid "Changed"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:23
+#: ../reporting/reports_main.php:26
 msgid "Reports and Analysis"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:30
+#: ../reporting/reports_main.php:33
 msgid "Customer &Balances"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:34
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:41
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:56
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:80
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:92
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:99
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:106
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:112
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:118
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:126
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:133
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:142
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:153
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:159
+#: ../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
 msgid "Currency Filter"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:37
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:46
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:54
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:62
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:70
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:76
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:129
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:138
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:145
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:149
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:170
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:175
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:184
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:192
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:197
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:204
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:218
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:229
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:235
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:241
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:255
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:262
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:272
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:283
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:292
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:303
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:309
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:318
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:328
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:336
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:346
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:351
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:359
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:368
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:375
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:382
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:389
+#: ../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:183
+#: ../reporting/reports_main.php:188
+#: ../reporting/reports_main.php:197
+#: ../reporting/reports_main.php:205
+#: ../reporting/reports_main.php:210
+#: ../reporting/reports_main.php:217
+#: ../reporting/reports_main.php:231
+#: ../reporting/reports_main.php:242
+#: ../reporting/reports_main.php:248
+#: ../reporting/reports_main.php:254
+#: ../reporting/reports_main.php:268
+#: ../reporting/reports_main.php:275
+#: ../reporting/reports_main.php:285
+#: ../reporting/reports_main.php:296
+#: ../reporting/reports_main.php:305
+#: ../reporting/reports_main.php:316
+#: ../reporting/reports_main.php:322
+#: ../reporting/reports_main.php:331
+#: ../reporting/reports_main.php:341
+#: ../reporting/reports_main.php:349
+#: ../reporting/reports_main.php:359
+#: ../reporting/reports_main.php:364
+#: ../reporting/reports_main.php:372
+#: ../reporting/reports_main.php:381
+#: ../reporting/reports_main.php:388
+#: ../reporting/reports_main.php:395
+#: ../reporting/reports_main.php:402
 msgid "Destination"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:38
+#: ../reporting/reports_main.php:41
 msgid "&Aged Customer Analysis"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:44
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:136
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:270
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:281
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:316
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:326
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:357
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:366
+#: ../reporting/reports_main.php:48
+#: ../reporting/reports_main.php:148
+#: ../reporting/reports_main.php:283
+#: ../reporting/reports_main.php:294
+#: ../reporting/reports_main.php:329
+#: ../reporting/reports_main.php:339
+#: ../reporting/reports_main.php:370
+#: ../reporting/reports_main.php:379
 msgid "Graphics"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:47
+#: ../reporting/reports_main.php:51
 msgid "Customer &Detail Listing"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:51
+#: ../reporting/reports_main.php:55
 msgid "Activity Greater Than"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:52
+#: ../reporting/reports_main.php:56
 msgid "Activity Less Than"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:55
+#: ../reporting/reports_main.php:59
+msgid "Sales &Summary Report"
+msgstr ""
+
+#: ../reporting/reports_main.php:65
 msgid "&Price Listing"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:57
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:66
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:166
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:172
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:177
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:188
+#: ../reporting/reports_main.php:67
+#: ../reporting/reports_main.php:76
+#: ../reporting/reports_main.php:179
+#: ../reporting/reports_main.php:185
+#: ../reporting/reports_main.php:190
+#: ../reporting/reports_main.php:201
 msgid "Inventory Category"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:58
-#: /var/www/fa_unstable/devel/../sales/manage/sales_types.php:16
+#: ../reporting/reports_main.php:68
+#: ../sales/manage/sales_types.php:16
 msgid "Sales Types"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:59
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:179
+#: ../reporting/reports_main.php:69
+#: ../reporting/reports_main.php:192
 msgid "Show Pictures"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:63
+#: ../reporting/reports_main.php:73
 msgid "&Order Status Listing"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:67
+#: ../reporting/reports_main.php:77
 msgid "Stock Location"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:71
+#: ../reporting/reports_main.php:81
 msgid "&Salesman Listing"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:77
-msgid "Print &Invoices/Credit Notes"
+#: ../reporting/reports_main.php:87
+msgid "Print &Invoices"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:81
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:87
+#: ../reporting/reports_main.php:91
+#: ../reporting/reports_main.php:98
+#: ../reporting/reports_main.php:104
 msgid "email Customers"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:82
+#: ../reporting/reports_main.php:92
+#: ../reporting/reports_main.php:99
 msgid "Payment Link"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:84
+#: ../reporting/reports_main.php:94
+msgid "Print &Credit Notes"
+msgstr ""
+
+#: ../reporting/reports_main.php:101
 msgid "Print &Deliveries"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:88
+#: ../reporting/reports_main.php:105
 msgid "Print as Packing Slip"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:90
+#: ../reporting/reports_main.php:107
 msgid "Print &Statements"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:93
-msgid "Show Outstanding Only"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:94
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:100
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:107
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:113
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:154
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:160
+#: ../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
 msgid "Email Customers"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:96
+#: ../reporting/reports_main.php:113
 msgid "&Print Sales Orders"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:101
+#: ../reporting/reports_main.php:118
 msgid "Print as Quote"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:103
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:109
+#: ../reporting/reports_main.php:120
 msgid "&Print Sales Quotations"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:115
+#: ../reporting/reports_main.php:126
 msgid "Print Receipts"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:122
+#: ../reporting/reports_main.php:133
 msgid "Supplier &Balances"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:130
+#: ../reporting/reports_main.php:141
 msgid "&Aged Supplier Analyses"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:139
+#: ../reporting/reports_main.php:151
 msgid "&Payment Report"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:146
+#: ../reporting/reports_main.php:158
 msgid "Outstanding &GRNs Report"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:150
+#: ../reporting/reports_main.php:162
 msgid "Print Purchase &Orders"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:156
-msgid "Print Remittances"
+#: ../reporting/reports_main.php:168
+msgid "Print Remi&ttances"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:165
+#: ../reporting/reports_main.php:177
 msgid "Inventory &Valuation Report"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:171
+#: ../reporting/reports_main.php:184
 msgid "Inventory &Planning Report"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:176
+#: ../reporting/reports_main.php:189
 msgid "Stock &Check Sheets"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:180
+#: ../reporting/reports_main.php:193
 msgid "Inventory Column"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:181
+#: ../reporting/reports_main.php:194
 msgid "Show Shortage"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:185
+#: ../reporting/reports_main.php:198
 msgid "Inventory &Sales Report"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:193
+#: ../reporting/reports_main.php:206
 msgid "&GRN Valuation Report"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:199
+#: ../reporting/reports_main.php:212
 msgid "Manufacturing"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:200
+#: ../reporting/reports_main.php:213
 msgid "&Bill of Material Listing"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:201
+#: ../reporting/reports_main.php:214
 msgid "From product"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:202
+#: ../reporting/reports_main.php:215
 msgid "To product"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:205
+#: ../reporting/reports_main.php:218
 msgid "Print &Work Orders"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:208
+#: ../reporting/reports_main.php:221
 msgid "Email Locations"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:213
+#: ../reporting/reports_main.php:226
 msgid "Dimension &Summary"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:214
+#: ../reporting/reports_main.php:227
 msgid "From Dimension"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:215
+#: ../reporting/reports_main.php:228
 msgid "To Dimension"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:216
+#: ../reporting/reports_main.php:229
 msgid "Show Balance"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:223
+#: ../reporting/reports_main.php:236
 msgid "Banking"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:224
+#: ../reporting/reports_main.php:237
 msgid "Bank &Statement"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:231
+#: ../reporting/reports_main.php:244
 msgid "General Ledger"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:232
+#: ../reporting/reports_main.php:245
 msgid "Chart of &Accounts"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:233
+#: ../reporting/reports_main.php:246
 msgid "Show Balances"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:236
+#: ../reporting/reports_main.php:249
 msgid "List of &Journal Entries"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:247
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:296
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:340
+#: ../reporting/reports_main.php:260
+#: ../reporting/reports_main.php:309
+#: ../reporting/reports_main.php:353
 msgid "GL Account &Transactions"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:250
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:299
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:343
+#: ../reporting/reports_main.php:263
+#: ../reporting/reports_main.php:312
+#: ../reporting/reports_main.php:356
 msgid "From Account"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:251
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:300
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:344
+#: ../reporting/reports_main.php:264
+#: ../reporting/reports_main.php:313
+#: ../reporting/reports_main.php:357
 msgid "To Account"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:256
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:304
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:347
+#: ../reporting/reports_main.php:269
+#: ../reporting/reports_main.php:317
+#: ../reporting/reports_main.php:360
 msgid "Annual &Expense Breakdown"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:263
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:310
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:352
+#: ../reporting/reports_main.php:276
+#: ../reporting/reports_main.php:323
+#: ../reporting/reports_main.php:365
 msgid "&Balance Sheet"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:269
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:280
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:315
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:325
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:356
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:365
+#: ../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
 msgid "Decimal values"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:273
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:319
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:360
+#: ../reporting/reports_main.php:286
+#: ../reporting/reports_main.php:332
+#: ../reporting/reports_main.php:373
 msgid "&Profit and Loss Statement"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:287
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:332
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:372
+#: ../reporting/reports_main.php:300
+#: ../reporting/reports_main.php:345
+#: ../reporting/reports_main.php:385
 msgid "Zero values"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/reports_main.php:377
+#: ../reporting/reports_main.php:390
 msgid "Ta&x Report"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:14
-msgid "Cust no"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:18
-msgid "Order To"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:20
-msgid "Deliver To"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:22
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:29
-#: /var/www/fa_unstable/devel/../sales/view/view_dispatch.php:51
-#: /var/www/fa_unstable/devel/../sales/view/view_invoice.php:51
+#: ../reporting/includes/doctext.inc:18
+#: ../reporting/includes/doctext.inc:156
+#: ../sales/view/view_dispatch.php:51
+#: ../sales/view/view_invoice.php:53
 msgid "Charge To"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:27
-msgid "With thanks from"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:30
-#: /var/www/fa_unstable/devel/../sales/view/view_dispatch.php:74
-#: /var/www/fa_unstable/devel/../sales/view/view_invoice.php:74
+#: ../reporting/includes/doctext.inc:23
+#: ../sales/view/view_dispatch.php:74
 msgid "Delivered To"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:34
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:68
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:273
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:599
-msgid "Valid until"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:39
-msgid "Your Ref"
+#: ../reporting/includes/doctext.inc:30
+#: ../sales/customer_credit_invoice.php:283
+#: ../sales/view/view_credit.php:91
+#: ../sales/view/view_dispatch.php:113
+#: ../sales/view/view_invoice.php:116
+#: ../sales/includes/ui/sales_credit_ui.inc:168
+#: ../sales/includes/ui/sales_order_ui.inc:142
+#: ../sales/includes/ui/sales_order_ui.inc.orig:142
+msgid "Discount %"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:54
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:297
-msgid "Sales Person"
+#: ../reporting/includes/doctext.inc:33
+msgid "All amounts stated in"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:55
-msgid "Your VAT no."
+#: ../reporting/includes/doctext.inc:51
+msgid "Quotation No."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:57
+#: ../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:161
+#: ../reporting/includes/doctext.inc:184
+#: ../reporting/includes/doctext.inc:202
+#: ../reporting/includes/doctext.inc:240
 msgid "Customers Reference"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:58
-#: /var/www/fa_unstable/devel/../sales/view/view_dispatch.php:87
-#: /var/www/fa_unstable/devel/../sales/view/view_invoice.php:87
-msgid "Our Order No"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:60
-msgid "Our VAT No."
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:61
-msgid "Domicile"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:66
-msgid "* Subject to Realisation of the Cheque."
+#: ../reporting/includes/doctext.inc:57
+#: ../reporting/includes/doctext.inc:74
+#: ../reporting/includes/doctext.inc:95
+#: ../reporting/includes/doctext.inc:109
+#: ../reporting/includes/doctext.inc:132
+#: ../reporting/includes/doctext.inc:185
+#: ../reporting/includes/doctext.inc:241
+#: ../sales/manage/customer_branches.php:298
+msgid "Sales Person"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:68
-msgid "All amounts stated in"
+#: ../reporting/includes/doctext.inc:58
+#: ../reporting/includes/doctext.inc:75
+#: ../reporting/includes/doctext.inc:96
+#: ../reporting/includes/doctext.inc:110
+#: ../reporting/includes/doctext.inc:133
+#: ../reporting/includes/doctext.inc:163
+#: ../reporting/includes/doctext.inc:186
+#: ../reporting/includes/doctext.inc:204
+#: ../reporting/includes/doctext.inc:242
+msgid "Your VAT no."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:72
-msgid "Please quote Invoice no. when paying. All amounts stated in"
+#: ../reporting/includes/doctext.inc:59
+msgid "Our Quotation No"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:73
-msgid "Please quote Credit no. when paying. All amounts stated in"
+#: ../reporting/includes/doctext.inc:60
+#: ../sales/view/view_sales_order.php:69
+#: ../sales/view/view_sales_order.php.orig:69
+#: ../sales/inquiry/sales_orders_view.php:304
+#: ../sales/inquiry/sales_orders_view.php.orig:281
+#: ../sales/includes/ui/sales_order_ui.inc:606
+#: ../sales/includes/ui/sales_order_ui.inc.orig:606
+msgid "Valid until"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:76
-msgid "Phone/Fax/Email"
+#: ../reporting/includes/doctext.inc:65
+msgid "PREPAYMENT ORDER"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:78
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:125
-msgid "You can pay through"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:111
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:292
-#: /var/www/fa_unstable/devel/../sales/view/view_credit.php:91
-#: /var/www/fa_unstable/devel/../sales/view/view_dispatch.php:113
-#: /var/www/fa_unstable/devel/../sales/view/view_invoice.php:115
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_credit_ui.inc:168
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:148
-msgid "Discount %"
+#: ../reporting/includes/doctext.inc:66
+msgid "Order No."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:116
-msgid "DueDate"
+#: ../reporting/includes/doctext.inc:76
+#: ../reporting/includes/doctext.inc:97
+#: ../reporting/includes/doctext.inc:111
+#: ../reporting/includes/doctext.inc:138
+#: ../reporting/includes/doctext.inc:164
+#: ../reporting/includes/doctext.inc:187
+#: ../reporting/includes/doctext.inc:205
+#: ../reporting/includes/doctext.inc:243
+#: ../sales/view/view_dispatch.php:87
+#: ../sales/view/view_invoice.php:87
+msgid "Our Order No"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:122
-msgid "Dear"
+#: ../reporting/includes/doctext.inc:83
+msgid "Delivery Note No."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:123
-msgid "Attached you will find "
+#: ../reporting/includes/doctext.inc:98
+msgid "To Be Invoiced Before"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:124
-msgid "Kindest regards"
+#: ../reporting/includes/doctext.inc:104
+msgid "Credit No."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:129
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:138
-msgid "Delivery Note No."
+#: ../reporting/includes/doctext.inc:105
+msgid "Please quote Credit no. when paying. All amounts stated in"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:130
-msgid "Receipt No."
+#: ../reporting/includes/doctext.inc:117
+msgid "PREPAYMENT INVOICE"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:131
-msgid "Remittance No."
+#: ../reporting/includes/doctext.inc:118
+msgid "FINAL INVOICE"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:132
-msgid "Purchase Order No."
+#: ../reporting/includes/doctext.inc:119
+msgid "Invoice No."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:133
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:139
-msgid "Order No."
+#: ../reporting/includes/doctext.inc:121
+msgid "Please quote Invoice no. when paying. All amounts stated in"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:134
-msgid "Quotation No."
+#: ../reporting/includes/doctext.inc:137
+msgid "Date of Payment"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:135
-msgid "Invoice No."
+#: ../reporting/includes/doctext.inc:143
+msgid "Date of Sale"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:136
-msgid "Credit No."
+#: ../reporting/includes/doctext.inc:152
+msgid "Remittance No."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:148
-#: /var/www/fa_unstable/devel/../sales/view/view_credit.php:138
-#: /var/www/fa_unstable/devel/../sales/view/view_dispatch.php:156
-#: /var/www/fa_unstable/devel/../sales/view/view_invoice.php:158
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:225
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_credit_ui.inc:222
-msgid "Shipping"
+#: ../reporting/includes/doctext.inc:153
+#: ../reporting/includes/doctext.inc:173
+msgid "Order To"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:151
-#: /var/www/fa_unstable/devel/../sales/view/view_credit.php:143
-msgid "TOTAL CREDIT"
+#: ../reporting/includes/doctext.inc:172
+msgid "Purchase Order No."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:152
-msgid "TOTAL ORDER EX VAT"
+#: ../reporting/includes/doctext.inc:176
+msgid "Deliver To"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:153
-msgid "TOTAL ORDER VAT INCL."
+#: ../reporting/includes/doctext.inc:199
+msgid "Receipt No."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:154
-msgid "TOTAL PO"
+#: ../reporting/includes/doctext.inc:200
+msgid "With thanks from"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:155
-msgid "TOTAL DELIVERY INCL. VAT"
+#: ../reporting/includes/doctext.inc:215
+msgid "Work Order No."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:159
-msgid "As advance / full / part / payment towards:"
+#: ../reporting/includes/doctext.inc:246
+msgid "DueDate"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:160
-msgid "By Cash / Cheque* / Draft No."
+#: ../reporting/includes/doctext.inc:272
+#: ../reporting/includes/pdf_report.inc:1013
+msgid "You can pay through"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:161
-msgid "Dated"
+#: ../reporting/includes/doctext.inc:276
+msgid "* Subject to Realisation of the Cheque."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:162
-msgid "Drawn on Bank"
+#: ../reporting/includes/excel_report.inc:67
+#: ../reporting/includes/pdf_report.inc:80
+msgid ""
+"The security settings on your account do not permit you to print this report"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:164
-msgid "Received / Sign"
+#: ../reporting/includes/excel_report.inc:262
+#: ../reporting/includes/pdf_report.inc:316
+msgid "Print Out Date"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:168
-msgid "TOTAL RECEIPT"
+#: ../reporting/includes/excel_report.inc:268
+#: ../reporting/includes/pdf_report.inc:325
+msgid "Fiscal Year"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:170
-msgid "TOTAL REMITTANCE"
+#: ../reporting/includes/excel_report.inc:396
+msgid "Report Date"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:174
-msgid "Outstanding Transactions"
+#: ../reporting/includes/excel_report.inc:413
+#: ../reporting/includes/pdf_report.inc:600
+msgid "Generated At"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:177
-msgid "Statement"
+#: ../reporting/includes/excel_report.inc:419
+#: ../reporting/includes/pdf_report.inc:609
+msgid "Generated By"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/doctext.inc:178
-msgid "as of"
+#: ../reporting/includes/header2.inc:122
+msgid "Our VAT No."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/excel_report.inc:64
-#: /var/www/fa_unstable/devel/../reporting/includes/pdf_report.inc:80
-msgid ""
-"The security settings on your account do not permit you to print this report"
+#: ../reporting/includes/header2.inc:128
+msgid "Domicile"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/excel_report.inc:247
-#: /var/www/fa_unstable/devel/../reporting/includes/pdf_report.inc:316
-msgid "Print Out Date"
+#: ../reporting/includes/header2.inc:143
+#: ../reporting/includes/pdf_report.inc:352
+#: ../reporting/includes/pdf_report.inc:500
+#: ../reporting/includes/pdf_report.inc:628
+msgid "Page"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/excel_report.inc:253
-#: /var/www/fa_unstable/devel/../reporting/includes/pdf_report.inc:325
-msgid "Fiscal Year"
+#: ../reporting/includes/pdf_report.inc:583
+msgid "Report Period"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/excel_report.inc:381
-msgid "Report Date"
+#: ../reporting/includes/pdf_report.inc:980
+msgid "You have no email contact defined for this type of document"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/excel_report.inc:398
-#: /var/www/fa_unstable/devel/../reporting/includes/pdf_report.inc:597
-msgid "Generated At"
+#: ../reporting/includes/pdf_report.inc:999
+msgid "Dear"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/excel_report.inc:404
-#: /var/www/fa_unstable/devel/../reporting/includes/pdf_report.inc:606
-msgid "Generated By"
+#: ../reporting/includes/pdf_report.inc:1000
+msgid "Attached you will find "
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/header2.inc:150
-#: /var/www/fa_unstable/devel/../reporting/includes/pdf_report.inc:352
-#: /var/www/fa_unstable/devel/../reporting/includes/pdf_report.inc:497
-#: /var/www/fa_unstable/devel/../reporting/includes/pdf_report.inc:625
-msgid "Page"
+#: ../reporting/includes/pdf_report.inc:1016
+msgid "Kindest regards"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/pdf_report.inc:580
-msgid "Report Period"
+#: ../reporting/includes/pdf_report.inc:1028
+msgid "There is no contact email set for this document type."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/pdf_report.inc:994
-msgid "You have no email contact defined for this type of document"
+#: ../reporting/includes/pdf_report.inc:1031
+msgid "Sending document by email failed"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/pdf_report.inc:1034
-msgid "Sending document by email failed"
+#: ../reporting/includes/pdf_report.inc:1031
+#: ../reporting/includes/pdf_report.inc:1034
+msgid "Email:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/pdf_report.inc:1037
+#: ../reporting/includes/pdf_report.inc:1034
 msgid "has been sent by email to destination."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/pdf_report.inc:1067
+#: ../reporting/includes/pdf_report.inc:1064
 msgid "Report has been sent to network printer "
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/printer_class.inc:39
+#: ../reporting/includes/printer_class.inc:39
 msgid "Cannot open connection to printer"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/printer_class.inc:50
+#: ../reporting/includes/printer_class.inc:50
 msgid "Printer does not acept the job"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/printer_class.inc:61
+#: ../reporting/includes/printer_class.inc:61
 msgid "Error sending print job control file"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/printer_class.inc:68
+#: ../reporting/includes/printer_class.inc:68
 msgid "Print control file not accepted"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/printer_class.inc:76
+#: ../reporting/includes/printer_class.inc:76
 msgid "Cannot send report to printer"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/printer_class.inc:86
+#: ../reporting/includes/printer_class.inc:86
 msgid "No ack after report printout"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/printer_class.inc:100
+#: ../reporting/includes/printer_class.inc:100
 msgid "Cannot flush printing queue"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:57
+#: ../reporting/includes/reports_classes.inc:61
 msgid "Report Classes:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:68
+#: ../reporting/includes/reports_classes.inc:81
 msgid "Reports For Class: "
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:83
+#: ../reporting/includes/reports_classes.inc:101
 msgid "Display: "
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:113
-msgid "Invalid date format"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:149
+#: ../reporting/includes/reports_classes.inc:149
 msgid "Unknown report parameter type:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:174
+#: ../reporting/includes/reports_classes.inc:175
 msgid "No Currency Filter"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:219
-msgid "No payment Link"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:223
+#: ../reporting/includes/reports_classes.inc:227
 msgid "PDF/Printer"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:234
+#: ../reporting/includes/reports_classes.inc:238
 msgid "No Graphics"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:234
+#: ../reporting/includes/reports_classes.inc:238
 msgid "Vertical bars"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:234
+#: ../reporting/includes/reports_classes.inc:238
 msgid "Horizontal bars"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:235
+#: ../reporting/includes/reports_classes.inc:239
 msgid "Dots"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:235
+#: ../reporting/includes/reports_classes.inc:239
 msgid "Lines"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:235
+#: ../reporting/includes/reports_classes.inc:239
 msgid "Pie"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:235
+#: ../reporting/includes/reports_classes.inc:239
 msgid "Donut"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:239
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:242
+#: ../reporting/includes/reports_classes.inc:243
+#: ../reporting/includes/reports_classes.inc:246
 msgid "No Type Filter"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:251
+#: ../reporting/includes/reports_classes.inc:256
 msgid "No Account Group Filter"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:266
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:272
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:278
+#: ../reporting/includes/reports_classes.inc:271
+#: ../reporting/includes/reports_classes.inc:277
+#: ../reporting/includes/reports_classes.inc:283
 msgid "No Dimension Filter"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:284
+#: ../reporting/includes/reports_classes.inc:289
 msgid "No Customer Filter"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:295
+#: ../reporting/includes/reports_classes.inc:297
 msgid "No Supplier Filter"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:303
-msgid "IV"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:304
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:347
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:357
-msgid "CN"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:312
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:444
-msgid "DN"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:345
-msgid "BP"
+#: ../reporting/includes/reports_classes.inc:379
+msgid "No Location Filter"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:346
-msgid "SP"
+#: ../reporting/includes/reports_classes.inc:382
+msgid "No Category Filter"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:355
-msgid "BD"
+#: ../reporting/includes/reports_classes.inc:391
+msgid "No Sales Folk Filter"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:356
-msgid "CP"
+#: ../reporting/includes/reports_classes.inc:398
+msgid "No Users Filter"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:374
-msgid "No Location Filter"
+#: ../sales/create_recurrent_invoices.php:24
+msgid "Create and Print Recurrent Invoices"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:377
-msgid "No Category Filter"
+#: ../sales/create_recurrent_invoices.php:40
+#, php-format
+msgid "Recurrent Invoice covers period %s - %s."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:386
-msgid "No Sales Folk Filter"
+#: ../sales/create_recurrent_invoices.php:97
+#, php-format
+msgid "%s recurrent invoice(s) created, # %s - # %s."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../reporting/includes/reports_classes.inc:393
-msgid "No Users Filter"
+#: ../sales/create_recurrent_invoices.php:102
+#, php-format
+msgid "&Print Recurrent Invoices # %s - # %s"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/create_recurrent_invoices.php:24
-msgid "Create and Print Recurrent Invoices"
+#: ../sales/create_recurrent_invoices.php:104
+#, php-format
+msgid "&Email Recurrent Invoices # %s - # %s"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/create_recurrent_invoices.php:98
-#: /var/www/fa_unstable/devel/../sales/manage/recurrent_invoices.php:85
+#: ../sales/create_recurrent_invoices.php:115
+#: ../sales/manage/recurrent_invoices.php:102
 msgid "Template No"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/create_recurrent_invoices.php:98
-#: /var/www/fa_unstable/devel/../sales/manage/recurrent_invoices.php:85
+#: ../sales/create_recurrent_invoices.php:115
+#: ../sales/manage/recurrent_invoices.php:102
 msgid "Begin"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/create_recurrent_invoices.php:98
-#: /var/www/fa_unstable/devel/../sales/manage/recurrent_invoices.php:85
+#: ../sales/create_recurrent_invoices.php:115
+#: ../sales/manage/recurrent_invoices.php:102
 msgid "End"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/create_recurrent_invoices.php:98
-#: /var/www/fa_unstable/devel/../sales/manage/recurrent_invoices.php:85
+#: ../sales/create_recurrent_invoices.php:115
+#: ../sales/manage/recurrent_invoices.php:102
+#: ../sales/manage/recurrent_invoices.php:185
 msgid "Last Created"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/create_recurrent_invoices.php:142
+#: ../sales/create_recurrent_invoices.php:156
 msgid "Create Invoices"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/create_recurrent_invoices.php:149
+#: ../sales/create_recurrent_invoices.php:164
 msgid "Marked items are due."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/create_recurrent_invoices.php:151
+#: ../sales/create_recurrent_invoices.php:166
 msgid "No recurrent invoices are due."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/credit_note_entry.php:40
+#: ../sales/credit_note_entry.php:40
 #, php-format
 msgid "Modifying Customer Credit Note #%d"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/credit_note_entry.php:51
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:643
+#: ../sales/credit_note_entry.php:51
+#: ../sales/sales_order_entry.php:672
 msgid ""
 "There are no customers, or there are no customers with branches. Please "
 "define customers and customer branches."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/credit_note_entry.php:66
+#: ../sales/credit_note_entry.php:66
 #, php-format
 msgid "Credit Note # %d has been processed"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/credit_note_entry.php:68
+#: ../sales/credit_note_entry.php:68
 msgid "&View this credit note"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/credit_note_entry.php:70
+#: ../sales/credit_note_entry.php:70
 msgid "&Print This Credit Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/credit_note_entry.php:71
+#: ../sales/credit_note_entry.php:71
 msgid "&Email This Credit Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/credit_note_entry.php:73
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:60
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:75
+#: ../sales/credit_note_entry.php:73
+#: ../sales/customer_credit_invoice.php:60
+#: ../sales/customer_credit_invoice.php:77
 msgid "View the GL &Journal Entries for this Credit Note"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/credit_note_entry.php:75
+#: ../sales/credit_note_entry.php:75
 msgid "Enter Another &Credit Note"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/credit_note_entry.php:153
+#: ../sales/credit_note_entry.php:157
 msgid "The entered date for the credit note is invalid."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/credit_note_entry.php:170
+#: ../sales/credit_note_entry.php:174
 msgid ""
 "For credit notes created to write off the stock, a general ledger account is "
 "required to be selected."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/credit_note_entry.php:171
+#: ../sales/credit_note_entry.php:175
 msgid ""
 "Please select an account to write the cost of the stock off to, then click "
 "on Process again."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/credit_note_entry.php:191
+#: ../sales/credit_note_entry.php:195
 msgid "The quantity must be greater than zero."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/credit_note_entry.php:196
+#: ../sales/credit_note_entry.php:200
 msgid "The entered price is negative or invalid."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/credit_note_entry.php:201
+#: ../sales/credit_note_entry.php:205
 msgid "The entered discount percent is negative, greater than 100 or invalid."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/credit_note_entry.php:269
+#: ../sales/credit_note_entry.php:273
 msgid "Credit Note Items"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/credit_note_entry.php:279
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:393
+#: ../sales/credit_note_entry.php:283
+#: ../sales/customer_credit_invoice.php:384
 msgid "Process Credit Note"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:38
+#: ../sales/customer_credit_invoice.php:38
 #, php-format
 msgid "Modifying Credit Invoice # %d."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:42
+#: ../sales/customer_credit_invoice.php:42
 msgid "Credit all or part of an Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:53
+#: ../sales/customer_credit_invoice.php:53
 msgid "Credit Note has been processed"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:55
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:70
+#: ../sales/customer_credit_invoice.php:55
+#: ../sales/customer_credit_invoice.php:72
 msgid "&View This Credit Note"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:57
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:72
+#: ../sales/customer_credit_invoice.php:57
+#: ../sales/customer_credit_invoice.php:74
 msgid "&Print This Credit Note"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:58
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:73
+#: ../sales/customer_credit_invoice.php:58
+#: ../sales/customer_credit_invoice.php:75
 msgid "&Email This Credit Note"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:68
+#: ../sales/customer_credit_invoice.php:70
 msgid "Credit Note has been updated"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:112
+#: ../sales/customer_credit_invoice.php:114
 msgid "The entered shipping cost is invalid or less than zero."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:117
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:152
+#: ../sales/customer_credit_invoice.php:119
+#: ../sales/customer_credit_invoice.php:141
 msgid ""
 "Selected quantity cannot be less than zero nor more than quantity not "
 "credited yet."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:150
+#: ../sales/customer_credit_invoice.php:139
 msgid ""
 "This page can only be opened if an invoice has been selected for crediting."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:260
+#: ../sales/customer_credit_invoice.php:251
 msgid "Crediting Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:281
+#: ../sales/customer_credit_invoice.php:272
 msgid "Credit Note Date"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:291
+#: ../sales/customer_credit_invoice.php:282
 msgid "Invoiced Quantity"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:292
+#: ../sales/customer_credit_invoice.php:283
 msgid "Credit Quantity"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:326
+#: ../sales/customer_credit_invoice.php:317
 msgid "Credit Shipping Cost"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:359
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_credit_ui.inc:320
+#: ../sales/customer_credit_invoice.php:350
+#: ../sales/includes/ui/sales_credit_ui.inc:323
 msgid "Credit Note Type"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:367
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_credit_ui.inc:328
+#: ../sales/customer_credit_invoice.php:358
+#: ../sales/includes/ui/sales_credit_ui.inc:331
 msgid "Items Returned to Location"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:372
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_credit_ui.inc:333
+#: ../sales/customer_credit_invoice.php:363
+#: ../sales/includes/ui/sales_credit_ui.inc:336
 msgid "Write off the cost of the items to"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_credit_invoice.php:391
+#: ../sales/customer_credit_invoice.php:382
 msgid "Update credit value for quantities entered"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:37
+#: ../sales/customer_delivery.php:37
 #, php-format
 msgid "Modifying Delivery Note # %d."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:41
+#: ../sales/customer_delivery.php:41
 msgid "Deliver Items for a Sales Order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:50
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:173
+#: ../sales/customer_delivery.php:50
+#: ../sales/sales_order_entry.php:176
 #, php-format
 msgid "Delivery # %d has been entered."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:52
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:175
+#: ../sales/customer_delivery.php:52
+#: ../sales/sales_order_entry.php:178
 msgid "&View This Delivery"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:54
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:75
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:177
+#: ../sales/customer_delivery.php:54
+#: ../sales/customer_delivery.php:75
+#: ../sales/sales_order_entry.php:180
 msgid "&Print Delivery Note"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:55
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:76
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:178
+#: ../sales/customer_delivery.php:55
+#: ../sales/customer_delivery.php:76
+#: ../sales/sales_order_entry.php:181
 msgid "&Email Delivery Note"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:56
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:77
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:179
+#: ../sales/customer_delivery.php:56
+#: ../sales/customer_delivery.php:77
+#: ../sales/sales_order_entry.php:182
 msgid "P&rint as Packing Slip"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:57
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:78
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:180
+#: ../sales/customer_delivery.php:57
+#: ../sales/customer_delivery.php:78
+#: ../sales/sales_order_entry.php:183
 msgid "E&mail as Packing Slip"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:59
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:183
+#: ../sales/customer_delivery.php:59
+#: ../sales/sales_order_entry.php:186
 msgid "View the GL Journal Entries for this Dispatch"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:61
+#: ../sales/customer_delivery.php:61
 msgid "Invoice This Delivery"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:63
+#: ../sales/customer_delivery.php:63
 msgid "Select Another Order For Dispatch"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:71
+#: ../sales/customer_delivery.php:71
 #, php-format
 msgid "Delivery Note # %d has been updated."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:73
+#: ../sales/customer_delivery.php:73
 msgid "View this delivery"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:80
+#: ../sales/customer_delivery.php:80
 msgid "Confirm Delivery and Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:82
+#: ../sales/customer_delivery.php:82
 msgid "Select A Different Delivery"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:96
+#: ../sales/customer_delivery.php:94
+#: ../sales/customer_delivery.php:99
 msgid "Select a different sales order to delivery"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:97
+#: ../sales/customer_delivery.php:95
 msgid "This order has no items. There is nothing to delivery."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:119
+#: ../sales/customer_delivery.php:101
+msgid ""
+"This prepayment order is not yet ready for delivery due to insufficient "
+"amount received."
+msgstr ""
+
+#: ../sales/customer_delivery.php:118
 msgid "Select a different delivery"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:120
+#: ../sales/customer_delivery.php:119
 msgid "This delivery has all items invoiced. There is nothing to modify."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:130
+#: ../sales/customer_delivery.php:129
 msgid ""
 "This page can only be opened if an order or delivery note has been selected. "
 "Please select it first."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:132
+#: ../sales/customer_delivery.php:131
 msgid "Select a Sales Order to Delivery"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:141
+#: ../sales/customer_delivery.php:140
 msgid ""
 "Selected quantity cannot be less than quantity invoiced nor more than "
 "quantity\tnot dispatched on sales order."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:144
+#: ../sales/customer_delivery.php:143
 msgid "Freight cost cannot be less than zero"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:156
+#: ../sales/customer_delivery.php:155
 msgid "The entered date of delivery is invalid."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:162
-msgid "The entered date of delivery is not in fiscal year."
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:168
+#: ../sales/customer_delivery.php:167
 msgid "The entered dead-line for invoice is invalid."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:191
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:298
+#: ../sales/customer_delivery.php:190
+#: ../sales/customer_invoice.php:351
 msgid "The entered shipping value is not numeric."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:197
+#: ../sales/customer_delivery.php:196
 msgid "There are no item quantities on this delivery note."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:290
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:480
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:250
+#: ../sales/customer_delivery.php:299
+#: ../sales/sales_order_entry.php:501
+#: ../sales/includes/ui/sales_order_ui.inc:244
+#: ../sales/includes/ui/sales_order_ui.inc.orig:244
 msgid ""
 "The delivery cannot be processed because there is an insufficient quantity "
 "for item:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:351
+#: ../sales/customer_delivery.php:361
 msgid "For Sales Order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:360
+#: ../sales/customer_delivery.php:370
 msgid "Delivery From"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:409
+#: ../sales/customer_delivery.php:419
 msgid "Invoice Dead-line"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:419
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:430
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:82
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:361
+#: ../sales/customer_delivery.php:429
+#: ../sales/customer_invoice.php:528
+#: ../sales/includes/ui/sales_order_ui.inc:82
+#: ../sales/includes/ui/sales_order_ui.inc:368
+#: ../sales/includes/ui/sales_order_ui.inc.orig:82
+#: ../sales/includes/ui/sales_order_ui.inc.orig:368
 msgid ""
 "The selected customer account is currently on hold. Please contact the "
 "credit control personnel to discuss."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:424
+#: ../sales/customer_delivery.php:434
 msgid "Delivery Items"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:430
+#: ../sales/customer_delivery.php:440
 msgid "Max. delivery"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:430
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:440
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:147
+#: ../sales/customer_delivery.php:440
+#: ../sales/customer_invoice.php:542
+#: ../sales/includes/ui/sales_order_ui.inc:141
+#: ../sales/includes/ui/sales_order_ui.inc.orig:141
 msgid "Delivered"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:431
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:441
-#: /var/www/fa_unstable/devel/../sales/view/view_receipt.php:45
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:200
-msgid "Discount"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:491
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:525
+#: ../sales/customer_delivery.php:501
+#: ../sales/customer_invoice.php:631
 msgid "Shipping Cost"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:511
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:248
+#: ../sales/customer_delivery.php:521
+#: ../sales/includes/ui/sales_order_ui.inc:242
+#: ../sales/includes/ui/sales_order_ui.inc.orig:242
 msgid ""
 "Marked items have insufficient quantities in stock as on day of delivery."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:515
+#: ../sales/customer_delivery.php:525
 msgid "Action For Balance"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:522
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:554
+#: ../sales/customer_delivery.php:532
+#: ../sales/customer_invoice.php:683
 msgid "Refresh document page"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:523
+#: ../sales/customer_delivery.php:533
 msgid "Process Dispatch"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_delivery.php:524
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:556
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:691
+#: ../sales/customer_delivery.php:534
+#: ../sales/customer_invoice.php:685
+#: ../sales/sales_order_entry.php:719
 msgid "Check entered data and save document"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:37
+#: ../sales/customer_invoice.php:38
 #, php-format
 msgid "Modifying Sales Invoice # %d."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:40
+#: ../sales/customer_invoice.php:41
 msgid "Issue an Invoice for Delivery Note"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:42
+#: ../sales/customer_invoice.php:43
 msgid "Issue Batch Invoice for Delivery Notes"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:55
+#: ../sales/customer_invoice.php:45
+msgid "Prepayment or Final Invoice Entry"
+msgstr ""
+
+#: ../sales/customer_invoice.php:57
 msgid "Selected deliveries has been processed"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:57
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:75
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:202
+#: ../sales/customer_invoice.php:59
+#: ../sales/customer_invoice.php:79
+#: ../sales/sales_order_entry.php:205
 msgid "&View This Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:59
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:77
+#: ../sales/customer_invoice.php:61
+#: ../sales/customer_invoice.php:81
 msgid "&Print This Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:60
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:78
+#: ../sales/customer_invoice.php:62
+#: ../sales/customer_invoice.php:82
 msgid "&Email This Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:62
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:215
+#: ../sales/customer_invoice.php:64
+#: ../sales/sales_order_entry.php:218
 msgid "View the GL &Journal Entries for this Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:64
+#: ../sales/customer_invoice.php:66
 msgid "Select Another &Delivery For Invoicing"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:73
+#: ../sales/customer_invoice.php:77
 #, php-format
 msgid "Sales Invoice # %d has been updated."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:80
+#: ../sales/customer_invoice.php:84
 msgid "Select Another &Invoice to Modify"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:118
+#: ../sales/customer_invoice.php:123
 msgid "Select a different delivery to invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:119
+#: ../sales/customer_invoice.php:124
 msgid ""
 "There are no delivered items with a quantity left to invoice. There is "
 "nothing left to invoice."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:134
+#: ../sales/customer_invoice.php:146
 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 ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:143
+#: ../sales/customer_invoice.php:152
 msgid ""
-"All quantities on this invoice has been credited. There is nothing to modify "
-"on this invoice"
+"You have to set Deferred Income Account in GL Setup to entry prepayment "
+"invoices."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:149
+#: ../sales/customer_invoice.php:160
+msgid ""
+"Please select correct Sales Order Prepayment to be invoiced and try again."
+msgstr ""
+
+#: ../sales/customer_invoice.php:191
 msgid ""
 "This page can only be opened after delivery selection. Please select "
 "delivery to invoicing first."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:151
+#: ../sales/customer_invoice.php:193
 msgid "Select Delivery to Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:156
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:309
+#: ../sales/customer_invoice.php:198
+#: ../sales/customer_invoice.php:362
 msgid ""
 "Selected quantity cannot be less than quantity credited nor more than "
 "quantity not invoiced yet."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:262
+#: ../sales/customer_invoice.php:312
 msgid "The entered invoice date is invalid."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:268
-msgid "The entered invoice date is not in fiscal year."
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:274
+#: ../sales/customer_invoice.php:325
 msgid "The entered invoice due date is invalid."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:304
+#: ../sales/customer_invoice.php:357
 msgid "There are no item quantities on this invoice."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:372
+#: ../sales/customer_invoice.php:367
+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:449
 msgid "Payment terms:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:374
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:398
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:400
-msgid "Payment:"
+#: ../sales/customer_invoice.php:534
+#: ../sales/sales_order_entry.php:695
+msgid "Sales Order Items"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:436
+#: ../sales/customer_invoice.php:534
 msgid "Invoice Items"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:441
+#: ../sales/customer_invoice.php:543
 msgid "This Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:449
+#: ../sales/customer_invoice.php:550
 msgid "Credited"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_invoice.php:543
+#: ../sales/customer_invoice.php:652
 msgid "Invoice Total"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_payments.php:33
+#: ../sales/customer_invoice.php:661
+msgid "Sales order:"
+msgstr ""
+
+#: ../sales/customer_invoice.php:673
+msgid "Payments received:"
+msgstr ""
+
+#: ../sales/customer_invoice.php:674
+msgid "Invoiced here:"
+msgstr ""
+
+#: ../sales/customer_invoice.php:675
+msgid "Left to be invoiced:"
+msgstr ""
+
+#: ../sales/customer_payments.php:33
 msgid "Customer Payment Entry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_payments.php:37
+#: ../sales/customer_payments.php:37
 msgid "There are no customers defined in the system."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_payments.php:62
+#: ../sales/customer_payments.php:68
+msgid "Invalid sales invoice number."
+msgstr ""
+
+#: ../sales/customer_payments.php:92
 msgid "The customer payment has been successfully entered."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_payments.php:64
+#: ../sales/customer_payments.php:94
+#: ../sales/customer_payments.php:109
 msgid "&Print This Receipt"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_payments.php:66
+#: ../sales/customer_payments.php:96
+#: ../sales/customer_payments.php:111
 msgid "&View the GL Journal Entries for this Customer Payment"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_payments.php:70
+#: ../sales/customer_payments.php:100
+#: ../sales/customer_payments.php:115
 msgid "Enter Another &Customer Payment"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_payments.php:83
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:322
+#: ../sales/customer_payments.php:107
+msgid "The customer payment has been successfully updated."
+msgstr ""
+
+#: ../sales/customer_payments.php:128
+#: ../sales/sales_order_entry.php:332
 msgid "There is no customer selected."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_payments.php:90
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:329
+#: ../sales/customer_payments.php:135
+#: ../sales/sales_order_entry.php:339
 msgid "This customer has no branch defined."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_payments.php:96
+#: ../sales/customer_payments.php:141
 msgid "The entered date is invalid. Please enter a valid date for the payment."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_payments.php:118
-#: /var/www/fa_unstable/devel/../sales/customer_payments.php:124
+#: ../sales/customer_payments.php:171
+#: ../sales/customer_payments.php:177
 msgid "The entered amount is invalid or negative and cannot be processed."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_payments.php:150
+#: ../sales/customer_payments.php:203
 msgid "The entered discount is not a valid number."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_payments.php:157
+#: ../sales/customer_payments.php:210
 msgid ""
 "The balance of the amount and discout is zero or negative. Please enter "
 "valid amounts."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_payments.php:234
+#: ../sales/customer_payments.php:341
+#: ../sales/customer_payments.php:343
 msgid "From Customer:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_payments.php:249
-msgid "This customer account is on hold."
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../sales/customer_payments.php:255
+#: ../sales/customer_payments.php:378
 msgid "Into Bank Account:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_payments.php:262
+#: ../sales/customer_payments.php:383
 msgid "Date of Deposit:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_payments.php:286
+#: ../sales/customer_payments.php:405
 msgid "Customer prompt payment discount :"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_payments.php:295
+#: ../sales/customer_payments.php:414
 msgid "Amount and discount are in customer's currency."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/customer_payments.php:299
+#: ../sales/customer_payments.php:419
+msgid "Update Payment"
+msgstr ""
+
+#: ../sales/customer_payments.php:421
 msgid "Add Payment"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:56
+#: ../sales/sales_order_entry.php:56
 msgid "Direct Sales Delivery"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:61
+#: ../sales/sales_order_entry.php:61
 msgid "Direct Sales Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:67
+#: ../sales/sales_order_entry.php:67
 #, php-format
 msgid "Modifying Sales Order # %d"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:73
+#: ../sales/sales_order_entry.php:73
 #, php-format
 msgid "Modifying Sales Quotation # %d"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:78
+#: ../sales/sales_order_entry.php:78
 msgid "New Sales Order Entry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:82
+#: ../sales/sales_order_entry.php:82
 msgid "New Sales Quotation Entry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:85
+#: ../sales/sales_order_entry.php:85
 msgid "Sales Order Entry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:101
+#: ../sales/sales_order_entry.php:102
 #, php-format
 msgid "Order # %d has been entered."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:103
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:121
+#: ../sales/sales_order_entry.php:104
+#: ../sales/sales_order_entry.php:124
 msgid "&View This Order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:109
+#: ../sales/sales_order_entry.php:110
 msgid "Make &Delivery Against This Order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:112
+#: ../sales/sales_order_entry.php:115
 msgid "Enter a &New Order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:119
+#: ../sales/sales_order_entry.php:122
 #, php-format
 msgid "Order # %d has been updated."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:127
+#: ../sales/sales_order_entry.php:130
 msgid "Confirm Order Quantities and Make &Delivery"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:130
+#: ../sales/sales_order_entry.php:133
 msgid "Select A Different &Order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:137
+#: ../sales/sales_order_entry.php:140
 #, php-format
 msgid "Quotation # %d has been entered."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:139
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:157
+#: ../sales/sales_order_entry.php:142
+#: ../sales/sales_order_entry.php:160
 msgid "&View This Quotation"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:141
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:159
+#: ../sales/sales_order_entry.php:144
+#: ../sales/sales_order_entry.php:162
 msgid "&Print This Quotation"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:142
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:160
+#: ../sales/sales_order_entry.php:145
+#: ../sales/sales_order_entry.php:163
 msgid "&Email This Quotation"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:145
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:163
+#: ../sales/sales_order_entry.php:148
+#: ../sales/sales_order_entry.php:166
 msgid "Make &Sales Order Against This Quotation"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:148
+#: ../sales/sales_order_entry.php:151
 msgid "Enter a New &Quotation"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:155
+#: ../sales/sales_order_entry.php:158
 #, php-format
 msgid "Quotation # %d has been updated."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:166
+#: ../sales/sales_order_entry.php:169
 msgid "Select A Different &Quotation"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:185
+#: ../sales/sales_order_entry.php:188
 msgid "Make &Invoice Against This Delivery"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:189
+#: ../sales/sales_order_entry.php:192
 msgid "Enter a New Template &Delivery"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:192
+#: ../sales/sales_order_entry.php:195
 msgid "Enter a &New Delivery"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:200
+#: ../sales/sales_order_entry.php:203
 #, php-format
 msgid "Invoice # %d has been entered."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:204
+#: ../sales/sales_order_entry.php:207
 msgid "&Print Sales Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:205
+#: ../sales/sales_order_entry.php:208
 msgid "&Email Sales Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:213
+#: ../sales/sales_order_entry.php:216
 msgid "Print &Receipt"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:218
+#: ../sales/sales_order_entry.php:221
 msgid "Enter a &New Template Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:221
+#: ../sales/sales_order_entry.php:224
 msgid "Enter a &New Direct Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:340
-msgid "The entered date is not in fiscal year"
+#: ../sales/sales_order_entry.php:362
+msgid "Pre-payment required have to be positive and less than total amount."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:351
+#: ../sales/sales_order_entry.php:367
 msgid ""
 "You must enter the person or company to whom delivery should be made to."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:358
+#: ../sales/sales_order_entry.php:374
 msgid ""
 "You should enter the street address in the box provided. Orders cannot be "
 "accepted without a valid street address."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:367
+#: ../sales/sales_order_entry.php:383
 msgid "The shipping cost entered is expected to be numeric."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:373
+#: ../sales/sales_order_entry.php:389
 msgid "The Valid date is invalid."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:375
+#: ../sales/sales_order_entry.php:391
 msgid "The delivery date is invalid."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:382
+#: ../sales/sales_order_entry.php:398
 msgid "The requested valid date is before the date of the quotation."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:384
+#: ../sales/sales_order_entry.php:400
 msgid "The requested delivery date is before the date of the order."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:393
+#: ../sales/sales_order_entry.php:409
 msgid "You need to define a cash account for your Sales Point."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:459
+#: ../sales/sales_order_entry.php:480
 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 ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:463
-msgid "Price for item must be entered and can not be less than 0"
+#: ../sales/sales_order_entry.php:484
+msgid "Price for inventory item must be entered and can not be less than 0"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:470
+#: ../sales/sales_order_entry.php:491
 msgid ""
 "You attempting to make the quantity ordered a quantity less than has already "
 "been delivered. The quantity delivered cannot be modified retrospectively."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:509
+#: ../sales/sales_order_entry.php:522
+#, php-format
+msgid "Price %s is below Standard Cost %s"
+msgstr ""
+
+#: ../sales/sales_order_entry.php:547
 msgid ""
 "This item cannot be deleted because some of it has already been delivered."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:537
+#: ../sales/sales_order_entry.php:576
 msgid "Direct delivery entry has been cancelled as requested."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:538
+#: ../sales/sales_order_entry.php:577
 msgid "Enter a New Sales Delivery"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:541
+#: ../sales/sales_order_entry.php:580
 msgid "Direct invoice entry has been cancelled as requested."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:542
+#: ../sales/sales_order_entry.php:581
 msgid "Enter a New Sales Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:547
+#: ../sales/sales_order_entry.php:586
 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 ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:552
+#: ../sales/sales_order_entry.php:591
 msgid "This sales quotation has been cancelled as requested."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:553
+#: ../sales/sales_order_entry.php:592
 msgid "Enter a New Sales Quotation"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:557
+#: ../sales/sales_order_entry.php:596
 msgid "This sales order has been cancelled as requested."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:558
+#: ../sales/sales_order_entry.php:597
 msgid "Enter a New Sales Order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:646
-msgid "Invoice Date:"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:647
+#: ../sales/sales_order_entry.php:676
 msgid "Sales Invoice Items"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:648
+#: ../sales/sales_order_entry.php:677
 msgid "Enter Delivery Details and Confirm Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:650
+#: ../sales/sales_order_entry.php:679
 msgid "Place Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:652
-msgid "Delivery Date:"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:653
+#: ../sales/sales_order_entry.php:682
 msgid "Delivery Note Items"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:654
+#: ../sales/sales_order_entry.php:683
 msgid "Enter Delivery Details and Confirm Dispatch"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:655
+#: ../sales/sales_order_entry.php:684
 msgid "Cancel Delivery"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:656
+#: ../sales/sales_order_entry.php:685
 msgid "Place Delivery"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:658
+#: ../sales/sales_order_entry.php:687
 msgid "Quotation Date:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:659
+#: ../sales/sales_order_entry.php:688
 msgid "Sales Quotation Items"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:660
+#: ../sales/sales_order_entry.php:689
 msgid "Enter Delivery Details and Confirm Quotation"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:661
+#: ../sales/sales_order_entry.php:690
 msgid "Cancel Quotation"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:662
+#: ../sales/sales_order_entry.php:691
 msgid "Place Quotation"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:663
+#: ../sales/sales_order_entry.php:692
 msgid "Commit Quotations Changes"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:666
-msgid "Sales Order Items"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:667
+#: ../sales/sales_order_entry.php:696
 msgid "Enter Delivery Details and Confirm Order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:670
+#: ../sales/sales_order_entry.php:699
 msgid "Commit Order Changes"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:692
+#: ../sales/sales_order_entry.php:720
 msgid "You are about to void this Document.\\nDo you want to continue?"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:695
+#: ../sales/sales_order_entry.php:723
 msgid "Validate changes and update document"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/sales_order_entry.php:699
+#: ../sales/sales_order_entry.php:727
 msgid ""
 "Cancels document entry or removes sales order when editing an old document"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/allocations/customer_allocate.php:28
+#: ../sales/allocations/customer_allocate.php:28
 msgid "Allocate Customer Payment or Credit Note"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/allocations/customer_allocate.php:48
+#: ../sales/allocations/customer_allocate.php:48
 #, php-format
 msgid "Allocation of %s # %d"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/allocations/customer_allocation_main.php:22
+#: ../sales/allocations/customer_allocation_main.php:22
 msgid "Customer Allocations"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/allocations/customer_allocation_main.php:32
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:281
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:280
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_allocation_inquiry.php:42
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_inquiry.php:44
+#: ../sales/allocations/customer_allocation_main.php:32
+#: ../sales/manage/customer_branches.php:282
+#: ../sales/manage/customers.php:322
+#: ../sales/manage/sav.customers.php:322
+#: ../sales/inquiry/customer_allocation_inquiry.php:42
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:42
+#: ../sales/inquiry/customer_inquiry.php:44
+#: ../sales/inquiry/customer_inquiry.php.orig:45
+#: ../sales/inquiry/sales_orders_view.php:265
+#: ../sales/inquiry/sales_orders_view.php.orig:242
 msgid "Select a customer: "
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/credit_status.php:16
+#: ../sales/manage/credit_status.php:16
 msgid "Credit Status"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/credit_status.php:30
+#: ../sales/manage/credit_status.php:30
 msgid "The credit status description cannot be empty."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/credit_status.php:44
+#: ../sales/manage/credit_status.php:44
 msgid "New credit status has been added"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/credit_status.php:52
+#: ../sales/manage/credit_status.php:52
 msgid "Selected credit status has been updated"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/credit_status.php:63
+#: ../sales/manage/credit_status.php:63
 msgid ""
 "Cannot delete this credit status because customer accounts have been created "
 "referring to it."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/credit_status.php:79
+#: ../sales/manage/credit_status.php:79
 msgid "Selected credit status has been deleted"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/credit_status.php:97
+#: ../sales/manage/credit_status.php:97
 msgid "Dissallow Invoices"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/credit_status.php:109
+#: ../sales/manage/credit_status.php:109
 msgid "Invoice OK"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/credit_status.php:113
+#: ../sales/manage/credit_status.php:113
 msgid "NO INVOICING"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/credit_status.php:147
+#: ../sales/manage/credit_status.php:147
 msgid "Dissallow invoicing ?"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:18
+#: ../sales/manage/customer_branches.php:18
 msgid "Customer Branches"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:25
+#: ../sales/manage/customer_branches.php:25
 msgid ""
 "There are no customers defined in the system. Please define a customer to "
 "add customer branches."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:27
+#: ../sales/manage/customer_branches.php:27
 msgid ""
 "There are no sales people defined in the system. At least one sales person "
 "is required before proceeding."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:29
+#: ../sales/manage/customer_branches.php:29
 msgid ""
 "There are no sales areas defined in the system. At least one sales area is "
 "required before proceeding."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:31
+#: ../sales/manage/customer_branches.php:31
 msgid ""
 "There are no shipping companies defined in the system. At least one shipping "
 "company is required before proceeding."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:63
+#: ../sales/manage/customer_branches.php:63
 msgid "The Branch name cannot be empty."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:70
+#: ../sales/manage/customer_branches.php:70
 msgid "The Branch short name cannot be empty."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:88
+#: ../sales/manage/customer_branches.php:88
 msgid "Selected customer branch has been updated"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:106
+#: ../sales/manage/customer_branches.php:106
 msgid "New customer branch has been added"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:125
+#: ../sales/manage/customer_branches.php:125
 msgid ""
 "Cannot delete this branch because customer transactions have been created to "
 "this branch."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:132
+#: ../sales/manage/customer_branches.php:132
 msgid ""
 "Cannot delete this branch because sales orders exist for it. Purge old sales "
 "orders first."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:137
+#: ../sales/manage/customer_branches.php:137
 msgid "Selected customer branch has been deleted"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:218
+#: ../sales/manage/customer_branches.php:218
 msgid "Main Branch"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:237
+#: ../sales/manage/customer_branches.php:237
 msgid "Name and Contact"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:238
+#: ../sales/manage/customer_branches.php:238
 msgid "Branch Name:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:239
+#: ../sales/manage/customer_branches.php:239
 msgid "Branch Short Name:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:242
+#: ../sales/manage/customer_branches.php:242
+#: ../sales/manage/customers.php:290
+#: ../sales/manage/sav.customers.php:290
 msgid "Sales Person:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:243
+#: ../sales/manage/customer_branches.php:243
+#: ../sales/manage/customers.php:291
+#: ../sales/manage/sav.customers.php:291
 msgid "Sales Area:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:244
-#: /var/www/fa_unstable/devel/../sales/manage/recurrent_invoices.php:156
+#: ../sales/manage/customer_branches.php:244
+#: ../sales/manage/recurrent_invoices.php:174
 msgid "Sales Group:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:245
+#: ../sales/manage/customer_branches.php:245
 msgid "Default Inventory Location:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:246
+#: ../sales/manage/customer_branches.php:246
 msgid "Default Shipping Company:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:253
+#: ../sales/manage/customer_branches.php:253
 msgid "Accounts Receivable Account:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:259
+#: ../sales/manage/customer_branches.php:260
 msgid "General contact data"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:269
+#: ../sales/manage/customer_branches.php:270
 msgid "Billing Address:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:273
+#: ../sales/manage/customer_branches.php:274
 msgid "Disable this Branch:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:296
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_deliveries_view.php:178
+#: ../sales/manage/customer_branches.php:297
+#: ../sales/inquiry/sales_deliveries_view.php:183
+#: ../sales/inquiry/sales_deliveries_view.php.orig:183
 msgid "Contact"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:298
+#: ../sales/manage/customer_branches.php:299
 msgid "Area"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:299
+#: ../sales/manage/customer_branches.php:300
 msgid "Phone No"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:300
+#: ../sales/manage/customer_branches.php:301
 msgid "Fax No"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:302
+#: ../sales/manage/customer_branches.php:303
 msgid "Tax Group"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customer_branches.php:320
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:305
+#: ../sales/manage/customer_branches.php:321
+#: ../sales/includes/ui/sales_order_ui.inc:299
+#: ../sales/includes/ui/sales_order_ui.inc.orig:299
 msgid ""
 "The selected customer does not have any branches. Please create at least one "
 "branch."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:35
+#: ../sales/manage/customers.php:42
+#: ../sales/manage/sav.customers.php:42
 msgid "The customer name cannot be empty."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:42
+#: ../sales/manage/customers.php:49
+#: ../sales/manage/sav.customers.php:49
 msgid "The customer short name cannot be empty."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:49
+#: ../sales/manage/customers.php:56
+#: ../sales/manage/sav.customers.php:56
 msgid "The credit limit must be numeric and not less than zero."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:56
+#: ../sales/manage/customers.php:63
+#: ../sales/manage/sav.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 ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:63
+#: ../sales/manage/customers.php:70
+#: ../sales/manage/sav.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 ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:91
+#: ../sales/manage/customers.php:98
+#: ../sales/manage/sav.customers.php:98
 msgid "Customer has been updated."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:105
+#: ../sales/manage/customers.php:127
+#: ../sales/manage/sav.customers.php:127
 msgid "A new customer has been added."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:127
+#: ../sales/manage/customers.php:130
+#: ../sales/manage/sav.customers.php:130
+msgid ""
+"A default Branch has been automatically created, please check default Branch "
+"values by using link below."
+msgstr ""
+
+#: ../sales/manage/customers.php:153
+#: ../sales/manage/sav.customers.php:153
 msgid ""
 "This customer cannot be deleted because there are transactions that refer to "
 "it."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:134
+#: ../sales/manage/customers.php:160
+#: ../sales/manage/sav.customers.php:160
 msgid ""
 "Cannot delete the customer record because orders have been created against "
 "it."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:141
+#: ../sales/manage/customers.php:167
+#: ../sales/manage/sav.customers.php:167
 msgid ""
 "Cannot delete this customer because there are branch records set up against "
 "it."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:152
+#: ../sales/manage/customers.php:178
+#: ../sales/manage/sav.customers.php:178
 msgid "Selected customer has been deleted."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:199
+#: ../sales/manage/customers.php:227
+#: ../sales/manage/sav.customers.php:227
 msgid "Name and Address"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:201
+#: ../sales/manage/customers.php:229
+#: ../sales/manage/sav.customers.php:229
 msgid "Customer Name:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:202
+#: ../sales/manage/customers.php:230
+#: ../sales/manage/sav.customers.php:230
 msgid "Customer Short Name:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:210
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:214
+#: ../sales/manage/customers.php:238
+#: ../sales/manage/customers.php:242
+#: ../sales/manage/sav.customers.php:238
+#: ../sales/manage/sav.customers.php:242
 msgid "Customer's Currency:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:217
+#: ../sales/manage/customers.php:245
+#: ../sales/manage/sav.customers.php:245
 msgid "Sales Type/Price List:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:220
+#: ../sales/manage/customers.php:248
+#: ../sales/manage/sav.customers.php:248
 msgid "Customer status:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:226
+#: ../sales/manage/customers.php:261
+#: ../sales/manage/sav.customers.php:261
 msgid "Discount Percent:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:227
+#: ../sales/manage/customers.php:262
+#: ../sales/manage/sav.customers.php:262
 msgid "Prompt Payment Discount Percent:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:231
+#: ../sales/manage/customers.php:266
+#: ../sales/manage/sav.customers.php:266
 msgid "Credit Status:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:244
+#: ../sales/manage/customers.php:279
+#: ../sales/manage/sav.customers.php:279
 msgid "Customer branches"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:246
+#: ../sales/manage/customers.php:281
+#: ../sales/manage/sav.customers.php:281
 msgid "Select or &Add"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:246
+#: ../sales/manage/customers.php:281
+#: ../sales/manage/sav.customers.php:281
 msgid "&Add or Edit "
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:257
+#: ../sales/manage/customers.php:299
+#: ../sales/manage/sav.customers.php:299
 msgid "Add New Customer"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:261
+#: ../sales/manage/customers.php:303
+#: ../sales/manage/sav.customers.php:303
 msgid "Update Customer"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:262
+#: ../sales/manage/customers.php:304
+#: ../sales/manage/sav.customers.php:304
 msgid "Update customer data"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:263
+#: ../sales/manage/customers.php:305
+#: ../sales/manage/sav.customers.php:305
 msgid "Select this customer and return to document entry."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:264
+#: ../sales/manage/customers.php:306
+#: ../sales/manage/sav.customers.php:306
 msgid "Delete Customer"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:265
+#: ../sales/manage/customers.php:307
+#: ../sales/manage/sav.customers.php:307
 msgid "Delete customer data if have been never used"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:272
+#: ../sales/manage/customers.php:314
+#: ../sales/manage/sav.customers.php:314
 msgid ""
 "There are no sales types defined. Please define at least one sales type "
 "before adding a customer."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/customers.php:281
+#: ../sales/manage/customers.php:323
+#: ../sales/manage/sav.customers.php:323
 msgid "New customer"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/recurrent_invoices.php:24
+#: ../sales/manage/customers.php:345
+#: ../sales/manage/sav.customers.php:345
+msgid "Sales &Orders"
+msgstr ""
+
+#: ../sales/manage/recurrent_invoices.php:24
 msgid "Recurrent Invoices"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/recurrent_invoices.php:36
-#: /var/www/fa_unstable/devel/../sales/manage/sales_areas.php:30
-#: /var/www/fa_unstable/devel/../sales/manage/sales_groups.php:30
+#: ../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."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/recurrent_invoices.php:46
+#: ../sales/manage/recurrent_invoices.php:63
 msgid "Selected recurrent invoice has been updated"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/recurrent_invoices.php:52
+#: ../sales/manage/recurrent_invoices.php:69
 msgid "New recurrent invoice has been added"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/recurrent_invoices.php:69
+#: ../sales/manage/recurrent_invoices.php:86
 msgid "Selected recurrent invoice has been deleted"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/recurrent_invoices.php:149
+#: ../sales/manage/recurrent_invoices.php:167
 msgid "Template:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/recurrent_invoices.php:158
+#: ../sales/manage/recurrent_invoices.php:176
 msgid "Days:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/recurrent_invoices.php:160
+#: ../sales/manage/recurrent_invoices.php:178
 msgid "Monthly:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/recurrent_invoices.php:162
+#: ../sales/manage/recurrent_invoices.php:180
 msgid "Begin:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/recurrent_invoices.php:164
+#: ../sales/manage/recurrent_invoices.php:182
 msgid "End:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_areas.php:39
+#: ../sales/manage/sales_areas.php:39
 msgid "Selected sales area has been updated"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_areas.php:44
+#: ../sales/manage/sales_areas.php:44
 msgid "New sales area has been added"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_areas.php:62
+#: ../sales/manage/sales_areas.php:62
 msgid ""
 "Cannot delete this area because customer branches have been created using "
 "this area."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_areas.php:68
+#: ../sales/manage/sales_areas.php:68
 msgid "Selected sales area has been deleted"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_areas.php:88
+#: ../sales/manage/sales_areas.php:88
 msgid "Area Name"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_areas.php:127
+#: ../sales/manage/sales_areas.php:127
 msgid "Area Name:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_groups.php:16
+#: ../sales/manage/sales_groups.php:16
 msgid "Sales Groups"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_groups.php:39
+#: ../sales/manage/sales_groups.php:39
 msgid "Selected sales group has been updated"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_groups.php:44
+#: ../sales/manage/sales_groups.php:44
 msgid "New sales group has been added"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_groups.php:62
+#: ../sales/manage/sales_groups.php:62
 msgid ""
 "Cannot delete this group because customers have been created using this "
 "group."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_groups.php:67
+#: ../sales/manage/sales_groups.php:67
 msgid "Selected sales group has been deleted"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_groups.php:85
-#: /var/www/fa_unstable/devel/../sales/manage/sales_groups.php:120
+#: ../sales/manage/sales_groups.php:85
+#: ../sales/manage/sales_groups.php:120
 msgid "ID"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_groups.php:123
+#: ../sales/manage/sales_groups.php:123
 msgid "Group Name:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_people.php:16
+#: ../sales/manage/sales_people.php:16
 msgid "Sales Persons"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_people.php:32
+#: ../sales/manage/sales_people.php:32
 msgid "The sales person name cannot be empty."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_people.php:38
+#: ../sales/manage/sales_people.php:38
 msgid "Salesman provision cannot be less than 0 or more than 100%."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_people.php:43
+#: ../sales/manage/sales_people.php:43
 msgid "Salesman provision breakpoint must be numeric and not less than 0."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_people.php:62
+#: ../sales/manage/sales_people.php:62
 msgid "Selected sales person data have been updated"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_people.php:64
+#: ../sales/manage/sales_people.php:64
 msgid "New sales person data have been added"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_people.php:81
+#: ../sales/manage/sales_people.php:81
 msgid "Selected sales person data have been deleted"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_people.php:155
+#: ../sales/manage/sales_people.php:155
 msgid "Sales person name:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_people.php:156
+#: ../sales/manage/sales_people.php:156
 msgid "Telephone number:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_people.php:157
+#: ../sales/manage/sales_people.php:157
 msgid "Fax number:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_people.php:160
+#: ../sales/manage/sales_people.php:160
 msgid "Break Pt.:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_points.php:16
+#: ../sales/manage/sales_points.php:16
 msgid "POS settings"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_points.php:28
+#: ../sales/manage/sales_points.php:28
 msgid "The POS name cannot be empty."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_points.php:41
+#: ../sales/manage/sales_points.php:41
 msgid "New point of sale has been added"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_points.php:52
+#: ../sales/manage/sales_points.php:52
 msgid "Selected point of sale has been updated"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_points.php:62
+#: ../sales/manage/sales_points.php:62
 msgid "Cannot delete this POS because it is used in users setup."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_points.php:65
+#: ../sales/manage/sales_points.php:65
 msgid "Selected point of sale has been deleted"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_points.php:84
+#: ../sales/manage/sales_points.php:84
 msgid "POS Name"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_points.php:84
+#: ../sales/manage/sales_points.php:84
 msgid "Credit sale"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_points.php:84
+#: ../sales/manage/sales_points.php:84
 msgid "Cash sale"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_points.php:84
+#: ../sales/manage/sales_points.php:84
 msgid "Default account"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_points.php:110
+#: ../sales/manage/sales_points.php:110
 msgid "To have cash POS first define at least one cash bank account."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_points.php:129
+#: ../sales/manage/sales_points.php:129
 msgid "Point of Sale Name"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_points.php:131
+#: ../sales/manage/sales_points.php:131
 msgid "Allowed credit sale terms selection:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_points.php:132
+#: ../sales/manage/sales_points.php:132
 msgid "Allowed cash sale terms selection:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_points.php:133
+#: ../sales/manage/sales_points.php:133
 msgid "Default cash account"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_points.php:139
+#: ../sales/manage/sales_points.php:139
 msgid "POS location"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_types.php:28
+#: ../sales/manage/sales_types.php:28
 msgid "The sales type description cannot be empty."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_types.php:35
+#: ../sales/manage/sales_types.php:35
 msgid "Calculation factor must be valid positive number."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_types.php:48
+#: ../sales/manage/sales_types.php:48
 msgid "New sales type has been added"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_types.php:59
+#: ../sales/manage/sales_types.php:59
 msgid "Selected sales type has been updated"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_types.php:71
+#: ../sales/manage/sales_types.php:71
 msgid ""
 "Cannot delete this sale type because customer transactions have been created "
 "using this sales type."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_types.php:78
+#: ../sales/manage/sales_types.php:78
 msgid ""
 "Cannot delete this sale type because customers are currently set up to use "
 "this sales type."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_types.php:83
+#: ../sales/manage/sales_types.php:83
 msgid "Selected sales type has been deleted"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_types.php:103
+#: ../sales/manage/sales_types.php:103
 msgid "Type Name"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_types.php:103
+#: ../sales/manage/sales_types.php:103
 msgid "Factor"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_types.php:103
+#: ../sales/manage/sales_types.php:103
 msgid "Tax Incl"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_types.php:117
+#: ../sales/manage/sales_types.php:117
 msgid "Base"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_types.php:128
+#: ../sales/manage/sales_types.php:128
 msgid ""
 "Marked sales type is the company base pricelist for prices calculations."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_types.php:154
+#: ../sales/manage/sales_types.php:154
 msgid "Sales Type Name"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_types.php:155
+#: ../sales/manage/sales_types.php:155
 msgid "Calculation factor"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/manage/sales_types.php:156
+#: ../sales/manage/sales_types.php:156
 msgid "Tax included"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/view/view_credit.php:24
+#: ../sales/view/view_credit.php:24
 msgid "View Credit Note"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/view/view_credit.php:39
+#: ../sales/view/view_credit.php:39
 #, php-format
 msgid "CREDIT NOTE #%d"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/view/view_credit.php:126
+#: ../sales/view/view_credit.php:126
 msgid "There are no line items on this credit note."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/view/view_dispatch.php:23
+#: ../sales/view/view_dispatch.php:23
 msgid "View Sales Dispatch"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/view/view_dispatch.php:43
+#: ../sales/view/view_dispatch.php:43
 #, php-format
 msgid "DISPATCH NOTE #%d"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/view/view_dispatch.php:65
-#: /var/www/fa_unstable/devel/../sales/view/view_invoice.php:65
+#: ../sales/view/view_dispatch.php:65
+#: ../sales/view/view_invoice.php:67
 msgid "Charge Branch"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/view/view_dispatch.php:91
-#: /var/www/fa_unstable/devel/../sales/view/view_invoice.php:91
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:62
+#: ../sales/view/view_dispatch.php:91
+#: ../sales/view/view_invoice.php:91
+#: ../sales/view/view_sales_order.php:63
+#: ../sales/view/view_sales_order.php.orig:63
 msgid "Customer Order Ref."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/view/view_dispatch.php:96
+#: ../sales/view/view_dispatch.php:96
 msgid "Dispatch Date"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/view/view_dispatch.php:148
+#: ../sales/view/view_dispatch.php:151
 msgid "There are no line items on this dispatch."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/view/view_dispatch.php:163
+#: ../sales/view/view_dispatch.php:162
 msgid "TOTAL VALUE"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/view/view_dispatch.php:167
+#: ../sales/view/view_dispatch.php:166
 msgid "This dispatch has been voided."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/view/view_invoice.php:23
+#: ../sales/view/view_invoice.php:23
 msgid "View Sales Invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../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 ""
 
-#: /var/www/fa_unstable/devel/../sales/view/view_invoice.php:150
+#: ../sales/view/view_invoice.php:154
 msgid "There are no line items on this invoice."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/view/view_receipt.php:24
+#: ../sales/view/view_receipt.php:24
 msgid "View Customer Payment"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/view/view_receipt.php:33
+#: ../sales/view/view_receipt.php:33
 #, php-format
 msgid "Customer Payment #%d"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/view/view_receipt.php:38
+#: ../sales/view/view_receipt.php:38
 msgid "From Customer"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/view/view_receipt.php:39
+#: ../sales/view/view_receipt.php:39
 msgid "Into Bank Account"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/view/view_receipt.php:40
+#: ../sales/view/view_receipt.php:40
 msgid "Date of Deposit"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/view/view_receipt.php:56
+#: ../sales/view/view_receipt.php:56
 msgid "This customer payment has been voided."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:28
+#: ../sales/view/view_sales_order.php:28
+#: ../sales/view/view_sales_order.php.orig:28
 msgid "View Sales Quotation"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:29
+#: ../sales/view/view_sales_order.php:29
+#: ../sales/view/view_sales_order.php.orig:29
 #, php-format
 msgid "Sales Quotation #%d"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:33
+#: ../sales/view/view_sales_order.php:33
+#: ../sales/view/view_sales_order.php.orig:33
 msgid "View Sales Order"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:34
+#: ../sales/view/view_sales_order.php:34
+#: ../sales/view/view_sales_order.php.orig:34
 #, php-format
 msgid "Sales Order #%d"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:46
+#: ../sales/view/view_sales_order.php:49
+#: ../sales/view/view_sales_order.php.orig:49
 msgid "Order Information"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:59
+#: ../sales/view/view_sales_order.php:60
+#: ../sales/view/view_sales_order.php.orig:60
 msgid "Customer Name"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:63
+#: ../sales/view/view_sales_order.php:64
+#: ../sales/view/view_sales_order.php.orig:64
 msgid "Deliver To Branch"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:70
+#: ../sales/view/view_sales_order.php:71
+#: ../sales/view/view_sales_order.php.orig:71
 msgid "Requested Delivery"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:74
+#: ../sales/view/view_sales_order.php:75
+#: ../sales/view/view_sales_order.php.orig:75
 msgid "Deliver From Location"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:80
+#: ../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
+#: ../sales/view/view_sales_order.php.orig:82
 msgid "Telephone"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:195
+#: ../sales/view/view_sales_order.php:215
+#: ../sales/view/view_sales_order.php.orig:197
 msgid "This Sales Order is used as a Template."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/view/view_sales_order.php:200
+#: ../sales/view/view_sales_order.php:220
+#: ../sales/view/view_sales_order.php.orig:202
 msgid "Quantity Delivered"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_allocation_inquiry.php:25
+#: ../sales/inquiry/customer_allocation_inquiry.php:25
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:25
 msgid "Customer Allocation Inquiry"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_allocation_inquiry.php:96
+#: ../sales/inquiry/customer_allocation_inquiry.php:96
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:96
 msgid "Allocation"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_inquiry.php:26
+#: ../sales/inquiry/customer_allocation_inquiry.php:116
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:116
+msgid "Payment"
+msgstr ""
+
+#: ../sales/inquiry/customer_inquiry.php:26
+#: ../sales/inquiry/customer_inquiry.php.orig:27
 msgid "Customer Transactions"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_inquiry.php:68
+#: ../sales/inquiry/customer_inquiry.php:68
+#: ../sales/inquiry/customer_inquiry.php.orig:69
 msgid "CUSTOMER ACCOUNT IS ON HOLD"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_inquiry.php:193
+#: ../sales/inquiry/customer_inquiry.php:181
+#: ../sales/inquiry/customer_inquiry.php.orig:205
 msgid "Print Receipt"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_inquiry.php:223
-#: /var/www/fa_unstable/devel/../sales/inquiry/customer_inquiry.php:236
+#: ../sales/inquiry/customer_inquiry.php:211
+#: ../sales/inquiry/customer_inquiry.php:224
+#: ../sales/inquiry/customer_inquiry.php.orig:235
+#: ../sales/inquiry/customer_inquiry.php.orig:248
 msgid "RB"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_deliveries_view.php:29
+#: ../sales/inquiry/sales_deliveries_view.php:29
+#: ../sales/inquiry/sales_deliveries_view.php.orig:29
 msgid "Search Not Invoiced Deliveries"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_deliveries_view.php:34
+#: ../sales/inquiry/sales_deliveries_view.php:34
+#: ../sales/inquiry/sales_deliveries_view.php.orig:34
 msgid "Search All Deliveries"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_deliveries_view.php:70
+#: ../sales/inquiry/sales_deliveries_view.php:70
+#: ../sales/inquiry/sales_deliveries_view.php.orig:70
 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 ""
 
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_deliveries_view.php:174
+#: ../sales/inquiry/sales_deliveries_view.php:179
+#: ../sales/inquiry/sales_deliveries_view.php.orig:179
 msgid "Delivery #"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_deliveries_view.php:180
+#: ../sales/inquiry/sales_deliveries_view.php:185
+#: ../sales/inquiry/sales_deliveries_view.php.orig:185
 msgid "Cust Ref"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_deliveries_view.php:182
+#: ../sales/inquiry/sales_deliveries_view.php:187
+#: ../sales/inquiry/sales_deliveries_view.php.orig:187
 msgid "Due By"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_deliveries_view.php:183
+#: ../sales/inquiry/sales_deliveries_view.php:188
+#: ../sales/inquiry/sales_deliveries_view.php.orig:188
 msgid "Delivery Total"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_deliveries_view.php:185
+#: ../sales/inquiry/sales_deliveries_view.php:190
+#: ../sales/inquiry/sales_deliveries_view.php.orig:190
 msgid "Batch"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_deliveries_view.php:185
+#: ../sales/inquiry/sales_deliveries_view.php:190
+#: ../sales/inquiry/sales_deliveries_view.php.orig:190
 msgid "Batch Invoicing"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:46
+#: ../sales/inquiry/sales_orders_view.php:44
+#: ../sales/inquiry/sales_orders_view.php.orig:40
 msgid "Search Outstanding Sales Orders"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:51
+#: ../sales/inquiry/sales_orders_view.php:49
+#: ../sales/inquiry/sales_orders_view.php.orig:45
 msgid "Search Template for Invoicing"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:56
+#: ../sales/inquiry/sales_orders_view.php:54
+#: ../sales/inquiry/sales_orders_view.php.orig:50
 msgid "Select Template for Delivery"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../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
+#: ../sales/inquiry/sales_orders_view.php.orig:55
 msgid "Search All Sales Orders"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:67
+#: ../sales/inquiry/sales_orders_view.php:70
+#: ../sales/inquiry/sales_orders_view.php.orig:61
 msgid "Search All Sales Quotations"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:131
+#: ../sales/inquiry/sales_orders_view.php:148
+#: ../sales/inquiry/sales_orders_view.php.orig:135
 msgid "Dispatch"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:171
+#: ../sales/inquiry/sales_orders_view.php:191
+#: ../sales/inquiry/sales_orders_view.php.orig:178
 msgid "Set this order as a template for direct deliveries/invoices"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:237
+#: ../sales/inquiry/sales_orders_view.php:200
+msgid "Prepayment Invoice"
+msgstr ""
+
+#: ../sales/inquiry/sales_orders_view.php:200
+msgid "Final Invoice"
+msgstr ""
+
+#: ../sales/inquiry/sales_orders_view.php:267
+#: ../sales/inquiry/sales_orders_view.php.orig:244
 msgid "Show All:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:253
+#: ../sales/inquiry/sales_orders_view.php:284
+#: ../sales/inquiry/sales_orders_view.php.orig:261
 msgid "Order #"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:257
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:271
+#: ../sales/inquiry/sales_orders_view.php:288
+#: ../sales/inquiry/sales_orders_view.php:302
+#: ../sales/inquiry/sales_orders_view.php.orig:265
+#: ../sales/inquiry/sales_orders_view.php.orig:279
 msgid "Cust Order Ref"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:260
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:274
+#: ../sales/inquiry/sales_orders_view.php:291
+#: ../sales/inquiry/sales_orders_view.php:305
+#: ../sales/inquiry/sales_orders_view.php.orig:268
+#: ../sales/inquiry/sales_orders_view.php.orig:282
 msgid "Delivery To"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:267
+#: ../sales/inquiry/sales_orders_view.php:298
+#: ../sales/inquiry/sales_orders_view.php.orig:275
 msgid "Quote #"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:272
+#: ../sales/inquiry/sales_orders_view.php:303
+#: ../sales/inquiry/sales_orders_view.php.orig:280
 msgid "Quote Date"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:275
+#: ../sales/inquiry/sales_orders_view.php:306
+#: ../sales/inquiry/sales_orders_view.php.orig:283
 msgid "Quote Total"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/inquiry/sales_orders_view.php:300
+#: ../sales/inquiry/sales_orders_view.php:337
+#: ../sales/inquiry/sales_orders_view.php.orig:310
 msgid "Tmpl"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/includes/cart_class.inc:360
+#: ../sales/includes/cart_class.inc:359
 msgid "You have to enter valid stock code or nonempty description"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/includes/sales_ui.inc:48
+#: ../sales/includes/sales_ui.inc:50
 msgid ""
 "This edit session has been abandoned by opening sales document in another "
 "browser tab. You cannot edit more than one sales document at once."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/includes/db/custalloc_db.inc:265
+#: ../sales/includes/db/custalloc_db.inc:350
 msgid ""
 "Unsuspected overallocation happened due to sparse credit notes exists for "
 "this invoice.\n"
@@ -14043,338 +15542,392 @@ msgid ""
 "charges."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/includes/db/sales_invoice_db.inc:178
+#: ../sales/includes/db/sales_invoice_db.inc:196
 msgid "Cash invoice"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/includes/db/sales_order_db.inc:103
-#: /var/www/fa_unstable/devel/../sales/includes/db/sales_order_db.inc:254
+#: ../sales/includes/db/sales_order_db.inc:109
+#: ../sales/includes/db/sales_order_db.inc:271
 msgid "Stocks below Re-Order Level at "
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/includes/db/sales_order_db.inc:106
-#: /var/www/fa_unstable/devel/../sales/includes/db/sales_order_db.inc:259
+#: ../sales/includes/db/sales_order_db.inc:112
+#: ../sales/includes/db/sales_order_db.inc:276
 msgid "Below"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/includes/db/sales_order_db.inc:107
-#: /var/www/fa_unstable/devel/../sales/includes/db/sales_order_db.inc:260
+#: ../sales/includes/db/sales_order_db.inc:113
+#: ../sales/includes/db/sales_order_db.inc:277
 msgid "Please reorder"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/includes/db/sales_order_db.inc:134
+#: ../sales/includes/db/sales_order_db.inc:141
 msgid "Deleted."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_credit_ui.inc:94
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:372
+#: ../sales/includes/ui/sales_credit_ui.inc:94
+#: ../sales/includes/ui/sales_order_ui.inc:379
+#: ../sales/includes/ui/sales_order_ui.inc.orig:379
 msgid "Customer Currency:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_credit_ui.inc:112
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:633
+#: ../sales/includes/ui/sales_credit_ui.inc:112
+#: ../sales/includes/ui/sales_order_ui.inc:647
+#: ../sales/includes/ui/sales_order_ui.inc.orig:639
 msgid "Shipping Company:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_credit_ui.inc:114
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:379
+#: ../sales/includes/ui/sales_credit_ui.inc:114
+#: ../sales/includes/ui/sales_order_ui.inc:386
+#: ../sales/includes/ui/sales_order_ui.inc.orig:386
 msgid "Customer Discount:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:61
+#: ../sales/includes/ui/sales_order_ui.inc:61
+#: ../sales/includes/ui/sales_order_ui.inc.orig:61
 msgid "This item is already on this document. You have been warned."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:104
+#: ../sales/includes/ui/sales_order_ui.inc:104
+#: ../sales/includes/ui/sales_order_ui.inc.orig:104
 msgid ""
 "The selected customer and branch are not valid, or the customer does not "
 "have any branches."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:230
+#: ../sales/includes/ui/sales_order_ui.inc:224
+#: ../sales/includes/ui/sales_order_ui.inc.orig:224
 msgid "Shipping Charge"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:303
+#: ../sales/includes/ui/sales_order_ui.inc:297
+#: ../sales/includes/ui/sales_order_ui.inc.orig:297
 msgid "No customer found for entered text."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:366
+#: ../sales/includes/ui/sales_order_ui.inc:323
+#: ../sales/includes/ui/sales_order_ui.inc.orig:323
+#, 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.orig:373
 msgid "Reference number unique for this document type"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:405
+#: ../sales/includes/ui/sales_order_ui.inc:413
+#: ../sales/includes/ui/sales_order_ui.inc:415
+#: ../sales/includes/ui/sales_order_ui.inc.orig:413
+#: ../sales/includes/ui/sales_order_ui.inc.orig:415
 msgid "Price List:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:422
+#: ../sales/includes/ui/sales_order_ui.inc:432
+#: ../sales/includes/ui/sales_order_ui.inc.orig:432
 msgid "Date of order receive"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:577
+#: ../sales/includes/ui/sales_order_ui.inc:582
+#: ../sales/includes/ui/sales_order_ui.inc.orig:582
 msgid "Cash payment"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:579
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:610
+#: ../sales/includes/ui/sales_order_ui.inc:585
+#: ../sales/includes/ui/sales_order_ui.inc:617
+#: ../sales/includes/ui/sales_order_ui.inc.orig:585
+#: ../sales/includes/ui/sales_order_ui.inc.orig:617
 msgid "Deliver from Location:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:582
+#: ../sales/includes/ui/sales_order_ui.inc:588
+#: ../sales/includes/ui/sales_order_ui.inc.orig:588
 msgid "Cash account:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:588
+#: ../sales/includes/ui/sales_order_ui.inc:595
+#: ../sales/includes/ui/sales_order_ui.inc.orig:595
 msgid "Delivery Details"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:593
+#: ../sales/includes/ui/sales_order_ui.inc:600
+#: ../sales/includes/ui/sales_order_ui.inc.orig:600
 msgid "Invoice Delivery Details"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:594
+#: ../sales/includes/ui/sales_order_ui.inc:601
+#: ../sales/includes/ui/sales_order_ui.inc.orig:601
 msgid "Invoice before"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:598
+#: ../sales/includes/ui/sales_order_ui.inc:605
+#: ../sales/includes/ui/sales_order_ui.inc.orig:605
 msgid "Quotation Delivery Details"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:603
+#: ../sales/includes/ui/sales_order_ui.inc:610
+#: ../sales/includes/ui/sales_order_ui.inc.orig:610
 msgid "Order Delivery Details"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:617
+#: ../sales/includes/ui/sales_order_ui.inc:631
+#: ../sales/includes/ui/sales_order_ui.inc.orig:623
 msgid "Enter requested day of delivery"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:618
+#: ../sales/includes/ui/sales_order_ui.inc:632
+#: ../sales/includes/ui/sales_order_ui.inc.orig:624
 msgid "Enter Valid until Date"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:619
+#: ../sales/includes/ui/sales_order_ui.inc:633
+#: ../sales/includes/ui/sales_order_ui.inc.orig:625
 msgid "Deliver To:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:620
+#: ../sales/includes/ui/sales_order_ui.inc:634
+#: ../sales/includes/ui/sales_order_ui.inc.orig:626
 msgid "Additional identifier for delivery e.g. name of receiving person"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:623
+#: ../sales/includes/ui/sales_order_ui.inc:637
+#: ../sales/includes/ui/sales_order_ui.inc.orig:629
 msgid "Delivery address. Default is address of customer branch"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:627
+#: ../sales/includes/ui/sales_order_ui.inc:641
+#: ../sales/includes/ui/sales_order_ui.inc.orig:633
 msgid "Contact Phone Number:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:628
+#: ../sales/includes/ui/sales_order_ui.inc:642
+#: ../sales/includes/ui/sales_order_ui.inc.orig:634
 msgid "Phone number of ordering person. Defaults to branch phone number"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:629
+#: ../sales/includes/ui/sales_order_ui.inc:643
+#: ../sales/includes/ui/sales_order_ui.inc.orig:635
 msgid "Customer Reference:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sales/includes/ui/sales_order_ui.inc:630
+#: ../sales/includes/ui/sales_order_ui.inc:644
+#: ../sales/includes/ui/sales_order_ui.inc.orig:636
 msgid "Customer reference number for this order (if any)"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../taxes/item_tax_types.php:17
+#: ../taxes/item_tax_types.php:17
 msgid "Item Tax Types"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../taxes/item_tax_types.php:35
+#: ../taxes/item_tax_types.php:35
 msgid "The item tax type description cannot be empty."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../taxes/item_tax_types.php:60
+#: ../taxes/item_tax_types.php:60
 msgid "Selected item tax type has been updated"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../taxes/item_tax_types.php:65
+#: ../taxes/item_tax_types.php:65
 msgid "New item tax type has been added"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../taxes/item_tax_types.php:77
+#: ../taxes/item_tax_types.php:77
 msgid ""
 "Cannot delete this item tax type because items have been created referring "
 "to it."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../taxes/item_tax_types.php:93
+#: ../taxes/item_tax_types.php:82
+msgid ""
+"Cannot delete this item tax type because item categories have been created "
+"referring to it."
+msgstr ""
+
+#: ../taxes/item_tax_types.php:98
 msgid "Selected item tax type has been deleted"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../taxes/item_tax_types.php:112
+#: ../taxes/item_tax_types.php:117
 msgid "Tax exempt"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../taxes/item_tax_types.php:170
+#: ../taxes/item_tax_types.php:175
 msgid "Is Fully Tax-exempt:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../taxes/item_tax_types.php:177
+#: ../taxes/item_tax_types.php:182
 msgid "Select which taxes this item tax type is exempt from."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../taxes/item_tax_types.php:180
+#: ../taxes/item_tax_types.php:185
 msgid "Tax Name"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../taxes/item_tax_types.php:180
+#: ../taxes/item_tax_types.php:185
 msgid "Is exempt"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../taxes/tax_groups.php:17
+#: ../taxes/tax_groups.php:17
+#: ../taxes/tax_groups.php.orig:17
+#: ../taxes/tax_groups.php.sav:17
 msgid "Tax Groups"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../taxes/tax_groups.php:27
+#: ../taxes/tax_groups.php:27
+#: ../taxes/tax_groups.php.orig:27
+#: ../taxes/tax_groups.php.sav:27
 msgid ""
 "There are no tax types defined. Define tax types before defining tax groups."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../taxes/tax_groups.php:40
+#: ../taxes/tax_groups.php:40
+#: ../taxes/tax_groups.php.orig:40
+#: ../taxes/tax_groups.php.sav:40
 msgid "The tax group name cannot be empty."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../taxes/tax_groups.php:84
+#: ../taxes/tax_groups.php:60
+#: ../taxes/tax_groups.php.orig:62
+#: ../taxes/tax_groups.php.sav:62
 msgid "Selected tax group has been updated"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../taxes/tax_groups.php:89
+#: ../taxes/tax_groups.php:65
+#: ../taxes/tax_groups.php.orig:67
+#: ../taxes/tax_groups.php.sav:67
 msgid "New tax group has been added"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../taxes/tax_groups.php:104
+#: ../taxes/tax_groups.php:80
+#: ../taxes/tax_groups.php.orig:82
+#: ../taxes/tax_groups.php.sav:82
 msgid ""
 "Cannot delete this tax group because customer branches been created "
 "referring to it."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../taxes/tax_groups.php:110
+#: ../taxes/tax_groups.php:86
+#: ../taxes/tax_groups.php.orig:88
+#: ../taxes/tax_groups.php.sav:88
 msgid ""
 "Cannot delete this tax group because suppliers been created referring to it."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../taxes/tax_groups.php:127
+#: ../taxes/tax_groups.php:103
+#: ../taxes/tax_groups.php.orig:105
+#: ../taxes/tax_groups.php.sav:105
 msgid "Selected tax group has been deleted"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../taxes/tax_groups.php:146
-msgid "Shipping Tax"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../taxes/tax_groups.php:205
-msgid "Tax applied to Shipping:"
-msgstr ""
-
-#: /var/www/fa_unstable/devel/../taxes/tax_groups.php:209
+#: ../taxes/tax_groups.php:166
+#: ../taxes/tax_groups.php.orig:168
+#: ../taxes/tax_groups.php.sav:168
 msgid "Select the taxes that are included in this group."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../taxes/tax_groups.php:214
-msgid "Rate (%)"
+#: ../taxes/tax_groups.php:171
+#: ../taxes/tax_groups.php.orig:173
+#: ../taxes/tax_groups.php.sav:173
+msgid "Shipping Tax"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../taxes/tax_types.php:16
+#: ../taxes/tax_types.php:16
 msgid "Tax Types"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../taxes/tax_types.php:30
+#: ../taxes/tax_types.php:30
 msgid "The tax type name cannot be empty."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../taxes/tax_types.php:36
+#: ../taxes/tax_types.php:36
 msgid "The default tax rate must be numeric and not less than zero."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../taxes/tax_types.php:42
+#: ../taxes/tax_types.php:42
 msgid "Selected GL Accounts cannot be used by another tax type."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../taxes/tax_types.php:56
+#: ../taxes/tax_types.php:56
 msgid "New tax type has been added"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../taxes/tax_types.php:67
+#: ../taxes/tax_types.php:67
 msgid "Selected tax type has been updated"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../taxes/tax_types.php:77
+#: ../taxes/tax_types.php:77
 msgid ""
 "Cannot delete this tax type because tax groups been created referring to it."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../taxes/tax_types.php:94
+#: ../taxes/tax_types.php:94
 msgid "Selected tax type has been deleted"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../taxes/tax_types.php:112
+#: ../taxes/tax_types.php:112
 msgid ""
 "To avoid problems with manual journal entry all tax types should have unique "
 "Sales/Purchasing GL accounts."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../taxes/tax_types.php:115
+#: ../taxes/tax_types.php:115
 msgid "Default Rate (%)"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../taxes/tax_types.php:116
+#: ../taxes/tax_types.php:116
 msgid "Sales GL Account"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../taxes/tax_types.php:116
+#: ../taxes/tax_types.php:116
 msgid "Purchasing GL Account"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../taxes/tax_types.php:159
+#: ../taxes/tax_types.php:159
 msgid "Default Rate:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../taxes/tax_types.php:161
+#: ../taxes/tax_types.php:161
 msgid "Sales GL Account:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../taxes/tax_types.php:162
+#: ../taxes/tax_types.php:162
 msgid "Purchasing GL Account:"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../themes/default/renderer.php:17
+#: ../themes/default/renderer.php:27
 msgid "Main Menu"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../themes/default/renderer.php:43
-#: /var/www/fa_unstable/devel/../themes/default/renderer.php:67
+#: ../themes/default/renderer.php:53
+#: ../themes/default/renderer.php:76
 msgid "Help"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../themes/default/renderer.php:62
+#: ../themes/default/renderer.php:71
 msgid "Preferences"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sql/alter2.1.php:18
+#: ../sql/alter2.1.php:18
 msgid "Upgrade from version 2.0 to 2.1"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sql/alter2.1.php:35
+#: ../sql/alter2.1.php:36
 msgid "Cannot retrieve bank accounts codes"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sql/alter2.1.php:43
+#: ../sql/alter2.1.php:44
 msgid "Cannot update bank transactions"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sql/alter2.1.php:52
+#: ../sql/alter2.1.php:53
 msgid "Cannot select stock identificators"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sql/alter2.1.php:63
+#: ../sql/alter2.1.php:64
 msgid "Cannot insert stock id into item_codes"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sql/alter2.1.php:139
+#: ../sql/alter2.1.php:140
 msgid ""
 "Seems that system upgrade to version 2.1 has \n"
 "\t\t\tbeen performed for this company already.<br> If something has gone \n"
@@ -14382,24 +15935,28 @@ msgid ""
 "\t\t\tdatabase restore from last backup file first."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sql/alter2.2.php:23
+#: ../sql/alter2.2.php:23
 msgid "Upgrade from version 2.1/2.2beta to 2.2"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sql/alter2.2.php:84
+#: ../sql/alter2.2.php:85
 msgid "Cannot query max sales order number."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sql/alter2.2.php:95
+#: ../sql/alter2.2.php:96
 msgid "Cannot store next sales order reference."
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sql/alter2.2.php:246
+#: ../sql/alter2.2.php:251
 msgid ""
 "Cannot upgrade extensions system: file /modules/installed_modules.php is not "
 "writeable"
 msgstr ""
 
-#: /var/www/fa_unstable/devel/../sql/alter2.3.php:20
+#: ../sql/alter2.3.php:20
 msgid "Upgrade from version 2.2 to 2.3"
 msgstr ""
+
+#: ../sql/alter2.4.php:19
+msgid "Upgrade from version 2.3 to 2.4"
+msgstr ""