Merged changes from stable branch up to 2.3.12
[fa-stable.git] / lang / new_language_template / LC_MESSAGES / empty.po
index 8cd9e5d1b896da814ffc9811721d39ddb8437453..39e655ec3c0380206533391d84694ea9b0135ff1 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-15 09:38+0200\n"
+"POT-Creation-Date: 2012-09-18 14:10+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"
@@ -17,1542 +17,1825 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: frontaccounting.php:73 frontaccounting.php:74
+#: ../frontaccounting.php:73
+#: ../frontaccounting.php:74
 msgid "Main  Menu"
 msgstr ""
 
-#: frontaccounting.php:75 access/logout.php:18 themes/default/renderer.php:52
-#: themes/default/renderer.php:78 themes/default/renderer.php:53
-#: themes/default/renderer.php:82
+#: ../frontaccounting.php:75
+#: ../access/logout.php:18
+#: ../themes/default/renderer.php:53
+#: ../themes/default/renderer.php:82
 msgid "Logout"
 msgstr ""
 
-#: access/login.php:13 admin/db/login.php:13
+#: ../access/login.php:13
 msgid "Restricted access"
 msgstr ""
 
-#: access/login.php:27 admin/db/login.php:28
+#: ../access/login.php:27
 msgid "Login as user: demouser and password: password"
 msgstr ""
 
-#: access/login.php:31 admin/db/login.php:32
+#: ../access/login.php:31
 msgid "Please login here"
 msgstr ""
 
-#: access/login.php:39 access/login.php:69 admin/db/login.php:40
-#: admin/db/login.php:70 access/login.php:49 access/login.php:79
+#: ../access/login.php:36
+msgid "Too many failed login attempts.<br>Please wait a while or try later."
+msgstr ""
+
+#: ../access/login.php:49
+#: ../access/login.php:79
 msgid "Authorization timeout"
 msgstr ""
 
-#: access/login.php:39 access/login.php:76 admin/db/login.php:40
-#: admin/db/login.php:77 access/login.php:49 access/login.php:86
+#: ../access/login.php:49
+#: ../access/login.php:86
 msgid "Login"
 msgstr ""
 
-#: access/login.php:76 admin/inst_upgrade.php:137 admin/db/login.php:77
-#: access/login.php:86
+#: ../access/login.php:86
+#: ../admin/inst_upgrade.php:141
 msgid "Version"
 msgstr ""
 
-#: access/login.php:79 admin/db/login.php:80 access/login.php:89
+#: ../access/login.php:89
 msgid "User name"
 msgstr ""
 
-#: access/login.php:83 admin/change_current_user_password.php:78
-#: admin/users.php:191 admin/db/login.php:84 access/login.php:93
+#: ../access/login.php:93
+#: ../admin/change_current_user_password.php:78
+#: ../admin/users.php:191
 msgid "Password:"
 msgstr ""
 
-#: access/login.php:92 admin/create_coy.php:249 admin/create_coy.php:331
-#: admin/db/login.php:93 access/login.php:103 access/login.php:110
-#: admin/create_coy.php:253 admin/create_coy.php:336
+#: ../access/login.php:103
+#: ../access/login.php:110
+#: ../admin/create_coy.php:253
+#: ../admin/create_coy.php:336
+#: ../includes/sysnames.inc:194
 msgid "Company"
 msgstr ""
 
-#: access/login.php:101 admin/db/login.php:102 access/login.php:117
+#: ../access/login.php:117
 msgid "Login -->"
 msgstr ""
 
-#: access/login.php:132 admin/display_prefs.php:111 admin/db/login.php:133
-#: themes/default/renderer.php:123 access/login.php:148
-#: themes/default/renderer.php:127
+#: ../access/login.php:148
+#: ../admin/display_prefs.php:111
+#: ../themes/default/renderer.php:127
 msgid "Theme:"
 msgstr ""
 
-#: access/logout.php:29
+#: ../access/logout.php:29
 msgid "Thank you for using"
 msgstr ""
 
-#: access/logout.php:40
+#: ../access/logout.php:40
 msgid "Click here to Login Again."
 msgstr ""
 
-#: admin/attachments.php:72
+#: ../admin/attachments.php:72
 msgid "Attach Documents"
 msgstr ""
 
-#: admin/attachments.php:123 admin/attachments.php:121
+#: ../admin/attachments.php:84
+msgid "No transaction has been selected."
+msgstr ""
+
+#: ../admin/attachments.php:86
+msgid "Select attachment file."
+msgstr ""
+
+#: ../admin/attachments.php:121
 msgid "Attachment has been inserted."
 msgstr ""
 
-#: admin/attachments.php:129 admin/attachments.php:127
+#: ../admin/attachments.php:127
 msgid "Attachment has been updated."
 msgstr ""
 
-#: admin/attachments.php:141 admin/attachments.php:140
+#: ../admin/attachments.php:140
 msgid "Attachment has been deleted."
 msgstr ""
 
-#: admin/attachments.php:159 admin/view_print_transaction.php:72
-#: admin/void_transaction.php:157 gl/inquiry/journal_inquiry.php:47
-#: inventory/includes/item_adjustments_ui.inc:47
-#: manufacturing/work_order_add_finished.php:203
-#: manufacturing/work_order_costs.php:150
-#: manufacturing/work_order_entry.php:379
-#: manufacturing/work_order_entry.php:387
-#: manufacturing/includes/work_order_issue_ui.inc:161
-#: sales/inquiry/customer_allocation_inquiry.php:47 admin/attachments.php:158
+#: ../admin/attachments.php:158
+#: ../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
 msgid "Type:"
 msgstr ""
 
-#: 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:234
-#: 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:263
-#: inventory/inquiry/stock_movements.php:81
-#: 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:121
-#: purchasing/inquiry/po_search.php:130
-#: purchasing/inquiry/supplier_allocation_inquiry.php:127
-#: purchasing/inquiry/supplier_inquiry.php:169
-#: purchasing/inquiry/supplier_inquiry.php.orig:163
-#: purchasing/allocations/supplier_allocation_main.php:95
-#: reporting/rep101.php:130 reporting/rep201.php:118 reporting/rep203.php:91
-#: reporting/rep601.php:76 reporting/rep704.php:79 reporting/rep704.php:82
-#: reporting/rep704.php:85 reporting/rep710.php:76
-#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186
-#: reporting/includes/doctext.inc:224
-#: sales/allocations/customer_allocation_main.php:94
-#: sales/view/view_sales_order.php:96 sales/view/view_sales_order.php:129
-#: sales/view/view_sales_order.php:161
-#: sales/inquiry/customer_allocation_inquiry.php:145
-#: sales/inquiry/customer_inquiry.php:225
-#: sales/inquiry/customer_inquiry.php.orig:225 admin/attachments.php:170
+#: ../admin/attachments.php:170
+#: ../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_inquiry.php:201
 msgid "#"
 msgstr ""
 
-#: 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:471
-#: purchasing/includes/ui/invoice_ui.inc:483
-#: 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:295
-#: sales/inquiry/sales_orders_view.php:299
-#: sales/inquiry/sales_orders_view.php.orig:293
-#: sales/inquiry/sales_orders_view.php.orig:297 taxes/tax_groups.php:124
-#: taxes/tax_types.php:115 admin/attachments.php:170 admin/attachments.php:220
-#: reporting/rep305.php:98 sales/create_recurrent_invoices.php:132
+#: ../admin/attachments.php:170
+#: ../admin/attachments.php:220
+#: ../admin/crm_categories.php:88
+#: ../admin/inst_upgrade.php:141
+#: ../admin/payment_terms.php:127
+#: ../admin/printers.php:84
+#: ../admin/print_profiles.php:148
+#: ../gl/inquiry/tax_inquiry.php:82
+#: ../gl/manage/gl_quick_entries.php:186
+#: ../gl/manage/gl_quick_entries.php:224
+#: ../includes/ui/view_package.php: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:98
+#: ../reporting/rep401.php:69
+#: ../sales/create_recurrent_invoices.php:132
+#: ../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
+#: ../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 ""
 
-#: admin/attachments.php:171 admin/backups.php:63 admin/backups.php:149
-#: admin/attachments.php:170
+#: ../admin/attachments.php:170
+#: ../admin/backups.php:63
+#: ../admin/backups.php:149
 msgid "Filename"
 msgstr ""
 
-#: admin/attachments.php:171 admin/attachments.php:170
+#: ../admin/attachments.php:170
 msgid "Size"
 msgstr ""
 
-#: admin/attachments.php:171 admin/attachments.php:170
+#: ../admin/attachments.php:170
 msgid "Filetype"
 msgstr ""
 
-#: admin/attachments.php:171 admin/attachments.php:170
+#: ../admin/attachments.php:170
 msgid "Date Uploaded"
 msgstr ""
 
-#: admin/attachments.php:186 admin/create_coy.php:273
-#: admin/crm_categories.php:106 admin/fiscalyears.php:164
-#: admin/inst_lang.php:100 admin/inst_lang.php.orig: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:130
-#: gl/manage/bank_accounts.php.orig:130 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:166 gl/includes/ui/gl_journal_ui.inc:122
-#: includes/ui/contacts_view.inc:64 includes/ui/simple_crud_class.inc:52
-#: inventory/prices.php:145 inventory/purchasing_data.php:146
-#: inventory/includes/item_adjustments_ui.inc:87
-#: inventory/includes/stock_transfers_ui.inc:79
-#: inventory/manage/item_categories.php:121
-#: inventory/manage/item_codes.php:140 inventory/manage/item_units.php:110
-#: inventory/manage/locations.php:161 inventory/manage/movement_types.php:106
-#: inventory/manage/sales_kits.php:55 manufacturing/search_work_orders.php:109
-#: manufacturing/manage/bom_edit.php:86
-#: manufacturing/manage/work_centres.php:114
-#: manufacturing/includes/work_order_issue_ui.inc:58
-#: purchasing/includes/ui/invoice_ui.inc:520
-#: purchasing/includes/ui/po_ui.inc:266
-#: purchasing/inquiry/po_search_completed.php:106
-#: 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/customer_inquiry.php:198
-#: sales/inquiry/customer_inquiry.php.orig:198
-#: sales/inquiry/sales_deliveries_view.php:154
-#: sales/inquiry/sales_orders_view.php:128
-#: sales/inquiry/sales_orders_view.php.orig:126
-#: sales/includes/ui/sales_credit_ui.inc:197
-#: sales/includes/ui/sales_order_ui.inc:202 taxes/item_tax_types.php:139
-#: taxes/tax_groups.php:142 taxes/tax_types.php:132 admin/attachments.php:185
-#: sales/includes/ui/sales_order_ui.inc:206 admin/create_coy.php:277
+#: ../admin/attachments.php:185
+#: ../admin/create_coy.php:277
+#: ../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:960
+#: ../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/includes/ui/po_ui.inc.orig: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_orders_view.php:136
+#: ../sales/includes/ui/sales_credit_ui.inc:197
+#: ../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 ""
 
-#: admin/attachments.php:187 gl/inquiry/journal_inquiry.php:135
-#: admin/attachments.php:186
+#: ../admin/attachments.php:186
+#: ../gl/inquiry/journal_inquiry.php:135
 msgid "View"
 msgstr ""
 
-#: admin/attachments.php:188 admin/attachments.php:187
+#: ../admin/attachments.php:187
 msgid "Download"
 msgstr ""
 
-#: 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_lang.php.orig: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:131
-#: gl/manage/bank_accounts.php.orig:131 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:168 gl/includes/ui/gl_journal_ui.inc:124
-#: includes/ui/contacts_view.inc:67 includes/ui/radio.ui_input.inc:284
-#: includes/ui/simple_crud_class.inc:54 includes/ui/ui_input.inc:284
-#: inventory/prices.php:146 inventory/purchasing_data.php:147
-#: inventory/includes/item_adjustments_ui.inc:89
-#: inventory/includes/stock_transfers_ui.inc:81
-#: inventory/manage/item_categories.php:122
-#: inventory/manage/item_codes.php:141 inventory/manage/item_units.php:111
-#: inventory/manage/locations.php:162 inventory/manage/movement_types.php:107
-#: inventory/manage/sales_kits.php:56 manufacturing/manage/bom_edit.php:87
-#: manufacturing/manage/work_centres.php:115
-#: manufacturing/includes/work_order_issue_ui.inc:60
-#: purchasing/includes/ui/invoice_ui.inc:284
-#: purchasing/includes/ui/po_ui.inc:268 sales/manage/credit_status.php:120
-#: sales/manage/customer_branches.php:163
-#: sales/manage/recurrent_invoices.php:131 sales/manage/sales_areas.php:104
-#: sales/manage/sales_groups.php:100 sales/manage/sales_people.php:120
-#: sales/manage/sales_points.php:100 sales/manage/sales_types.php:122
-#: sales/includes/ui/sales_credit_ui.inc:199
-#: sales/includes/ui/sales_order_ui.inc:204 taxes/item_tax_types.php:140
-#: taxes/tax_groups.php:143 taxes/tax_types.php:133 admin/attachments.php:188
-#: sales/includes/ui/sales_order_ui.inc:208 admin/create_coy.php:278
-#: includes/ui/ui_input.inc:285
+#: ../admin/attachments.php:188
+#: ../admin/create_coy.php:278
+#: ../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:286
+#: ../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
+#: ../purchasing/includes/ui/po_ui.inc.orig: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.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 ""
 
-#: admin/attachments.php:215 admin/attachments.php:220
-#: admin/attachments.php:214 admin/attachments.php:219
+#: ../admin/attachments.php:214
+#: ../admin/attachments.php:219
 msgid "Transaction #"
 msgstr ""
 
-#: admin/attachments.php:222 admin/attachments.php:221
+#: ../admin/attachments.php:221
 msgid "Attached File"
 msgstr ""
 
-#: admin/backups.php:21 admin/backups.php:40 admin/backups.php:114
-#: admin/backups.php:142 admin/backups.php:155 admin/backups.php:173
+#: ../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 ""
 
-#: admin/backups.php:43
+#: ../admin/backups.php:43
 msgid "Backup and Restore Database"
 msgstr ""
 
-#: admin/backups.php:50
+#: ../admin/backups.php:50
 msgid "Backup paths have not been set correctly."
 msgstr ""
 
-#: admin/backups.php:51
+#: ../admin/backups.php:51
 msgid "Please contact System Administrator."
 msgstr ""
 
-#: admin/backups.php:52
+#: ../admin/backups.php:52
 msgid "cannot find backup directory"
 msgstr ""
 
-#: admin/backups.php:62
+#: ../admin/backups.php:62
 msgid "Backup successfully generated."
 msgstr ""
 
-#: admin/backups.php:65
+#: ../admin/backups.php:65
 msgid "Database backup failed."
 msgstr ""
 
-#: admin/backups.php:98 admin/create_coy.php:261 admin/fiscalyears.php:155
-#: admin/inst_lang.php:85 admin/inst_lang.php:97 admin/inst_lang.php.orig:85
-#: admin/inst_lang.php.orig:97 admin/void_transaction.php:125
-#: dimensions/inquiry/search_dimensions.php:107
-#: gl/manage/bank_accounts.php:127 gl/manage/bank_accounts.php.orig:127
-#: 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/sav.ui_lists.inc:1649 includes/ui/ui_lists.inc:1670
-#: purchasing/manage/suppliers.php:120 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
-#: taxes/tax_groups.php:139 admin/create_coy.php:265
+#: ../admin/backups.php:98
+#: ../admin/create_coy.php:265
+#: ../admin/fiscalyears.php:155
+#: ../admin/inst_lang.php:85
+#: ../admin/inst_lang.php:97
+#: ../dimensions/inquiry/search_dimensions.php:107
+#: ../gl/manage/bank_accounts.php: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
+#: ../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 ""
 
-#: admin/backups.php:139
+#: ../admin/backups.php:139
 msgid "Restore backup completed."
 msgstr ""
 
-#: admin/backups.php:148
+#: ../admin/backups.php:148
 msgid "File successfully deleted."
 msgstr ""
 
-#: admin/backups.php:153
+#: ../admin/backups.php:153
 msgid "Can't delete backup file."
 msgstr ""
 
-#: admin/backups.php:165
+#: ../admin/backups.php:165
 msgid "You can only upload *.sql backup files"
 msgstr ""
 
-#: admin/backups.php:171
+#: ../admin/backups.php:171
 msgid "File was not uploaded into the system."
 msgstr ""
 
-#: admin/backups.php:180
+#: ../admin/backups.php:180
 msgid "Create backup"
 msgstr ""
 
-#: admin/backups.php:181 sales/includes/ui/sales_order_ui.inc:589
-#: sales/includes/ui/sales_order_ui.inc:637
-#: sales/includes/ui/sales_order_ui.inc:593
-#: sales/includes/ui/sales_order_ui.inc:641
+#: ../admin/backups.php:181
+#: ../sales/includes/ui/sales_order_ui.inc.orig:589
+#: ../sales/includes/ui/sales_order_ui.inc.orig:645
 msgid "Comments:"
 msgstr ""
 
-#: admin/backups.php:182
+#: ../admin/backups.php:182
 msgid "Compression:"
 msgstr ""
 
-#: admin/backups.php:184
+#: ../admin/backups.php:184
 msgid "Create Backup"
 msgstr ""
 
-#: admin/backups.php:186
+#: ../admin/backups.php:186
 msgid "Backup scripts maintenance"
 msgstr ""
 
-#: admin/backups.php:192
+#: ../admin/backups.php:192
 msgid "View Backup"
 msgstr ""
 
-#: admin/backups.php:193
+#: ../admin/backups.php:193
 msgid "Download Backup"
 msgstr ""
 
-#: admin/backups.php:194
+#: ../admin/backups.php:194
 msgid "Restore Backup"
 msgstr ""
 
-#: admin/backups.php:195
+#: ../admin/backups.php:195
 msgid ""
 "You are about to restore database from backup file.\n"
 "Do you want to continue?"
 msgstr ""
 
-#: admin/backups.php:197
+#: ../admin/backups.php:197
 msgid "Delete Backup"
 msgstr ""
 
-#: admin/backups.php:199
+#: ../admin/backups.php:199
 #, php-format
 msgid ""
 "You are about to remove selected backup file.\n"
 "Do you want to continue ?"
 msgstr ""
 
-#: admin/backups.php:205
+#: ../admin/backups.php:205
 msgid "Upload file"
 msgstr ""
 
-#: admin/change_current_user_password.php:16
-#: admin/change_current_user_password.php:85 themes/default/renderer.php:72
-#: themes/default/renderer.php:76
+#: ../admin/change_current_user_password.php:16
+#: ../admin/change_current_user_password.php:85
+#: ../themes/default/renderer.php:76
 msgid "Change password"
 msgstr ""
 
-#: admin/change_current_user_password.php:28 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 ""
 
-#: admin/change_current_user_password.php:35 admin/users.php:47
+#: ../admin/change_current_user_password.php:35
+#: ../admin/users.php:47
 msgid "The password cannot contain the user login."
 msgstr ""
 
-#: admin/change_current_user_password.php:42
+#: ../admin/change_current_user_password.php:42
 msgid "The passwords entered are not the same."
 msgstr ""
 
-#: admin/change_current_user_password.php:56
+#: ../admin/change_current_user_password.php:56
 msgid "Password cannot be changed in demo mode."
 msgstr ""
 
-#: admin/change_current_user_password.php:61
+#: ../admin/change_current_user_password.php:61
 msgid "Your password has been updated."
 msgstr ""
 
-#: admin/change_current_user_password.php:73 admin/users.php:180
+#: ../admin/change_current_user_password.php:73
+#: ../admin/users.php:180
 msgid "User login:"
 msgstr ""
 
-#: admin/change_current_user_password.php:79
+#: ../admin/change_current_user_password.php:79
 msgid "Repeat password:"
 msgstr ""
 
-#: admin/change_current_user_password.php:81
+#: ../admin/change_current_user_password.php:81
 msgid "Enter your new password in the fields."
 msgstr ""
 
-#: admin/company_preferences.php:16 applications/setup.php:18
-#: applications/setup.php.orig:18
+#: ../admin/company_preferences.php:16
+#: ../applications/setup.php:18
 msgid "Company Setup"
 msgstr ""
 
-#: admin/company_preferences.php:31
+#: ../admin/company_preferences.php:31
 msgid "Login timeout must be positive number not less than 10."
 msgstr ""
 
-#: admin/company_preferences.php:38
+#: ../admin/company_preferences.php:38
 msgid "The company name must be entered."
 msgstr ""
 
-#: admin/company_preferences.php:54
+#: ../admin/company_preferences.php:54
 msgid ""
 "Only jpg and png files are supported - a file extension of .jpg or .png is "
 "expected"
 msgstr ""
 
-#: admin/company_preferences.php:59 inventory/manage/items.php:85
+#: ../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 ""
 
-#: admin/company_preferences.php:64 inventory/manage/items.php:75
+#: ../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 ""
 
-#: admin/company_preferences.php:72 admin/company_preferences.php:93
-#: inventory/manage/items.php:93
+#: ../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 ""
 
-#: admin/company_preferences.php:82
+#: ../admin/company_preferences.php:82
 msgid "Error uploading logo file"
 msgstr ""
 
-#: admin/company_preferences.php:115
+#: ../admin/company_preferences.php:115
 msgid "Company setup has been updated."
 msgstr ""
 
-#: admin/company_preferences.php:159
+#: ../admin/company_preferences.php:159
 msgid "Name (to appear on reports):"
 msgstr ""
 
-#: 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/customers.php.orig:228
-#: sales/includes/ui/sales_order_ui.inc:628
-#: sales/includes/ui/sales_order_ui.inc:632
+#: ../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.orig:636
 msgid "Address:"
 msgstr ""
 
-#: admin/company_preferences.php:161
+#: ../admin/company_preferences.php:161
 msgid "Domicile:"
 msgstr ""
 
-#: admin/company_preferences.php:163 admin/shipping_companies.php:138
-#: purchasing/manage/suppliers.php:129 sales/manage/customer_branches.php:260
+#: ../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 ""
 
-#: admin/company_preferences.php:164 includes/ui/contacts_view.inc:104
-#: purchasing/manage/suppliers.php:159 sales/manage/customer_branches.php:262
-#: sales/manage/customers.php:254 sales/manage/customers.php.orig:251
+#: ../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 ""
 
-#: admin/company_preferences.php:165 admin/users.php:202
+#: ../admin/company_preferences.php:165
+#: ../admin/users.php:202
 msgid "Email Address:"
 msgstr ""
 
-#: admin/company_preferences.php:167
+#: ../admin/company_preferences.php:167
 msgid "Official Company Number:"
 msgstr ""
 
-#: admin/company_preferences.php:168 purchasing/manage/suppliers.php:94
-#: sales/manage/customers.php:233 sales/manage/customers.php.orig:230
+#: ../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 ""
 
-#: admin/company_preferences.php:170
+#: ../admin/company_preferences.php:170
 msgid "Home Currency:"
 msgstr ""
 
-#: admin/company_preferences.php:171 gl/gl_budget.php:63
+#: ../admin/company_preferences.php:171
+#: ../gl/gl_budget.php:63
 msgid "Fiscal Year:"
 msgstr ""
 
-#: admin/company_preferences.php:172
+#: ../admin/company_preferences.php:172
 msgid "Tax Periods:"
 msgstr ""
 
-#: admin/company_preferences.php:172
+#: ../admin/company_preferences.php:172
 msgid "Months."
 msgstr ""
 
-#: admin/company_preferences.php:173
+#: ../admin/company_preferences.php:173
 msgid "Tax Last Period:"
 msgstr ""
 
-#: admin/company_preferences.php:173
+#: ../admin/company_preferences.php:173
 msgid "Months back."
 msgstr ""
 
-#: admin/company_preferences.php:177
+#: ../admin/company_preferences.php:177
 msgid "Company Logo:"
 msgstr ""
 
-#: admin/company_preferences.php:178
+#: ../admin/company_preferences.php:178
 msgid "New Company Logo (.jpg)"
 msgstr ""
 
-#: admin/company_preferences.php:179
+#: ../admin/company_preferences.php:179
 msgid "Delete Company Logo:"
 msgstr ""
 
-#: admin/company_preferences.php:181
+#: ../admin/company_preferences.php:181
 msgid "Use Dimensions:"
 msgstr ""
 
-#: admin/company_preferences.php:182
+#: ../admin/company_preferences.php:182
 msgid "Base for auto price calculations:"
 msgstr ""
 
-#: admin/company_preferences.php:183
+#: ../admin/company_preferences.php:183
 msgid "No base price list"
 msgstr ""
 
-#: admin/company_preferences.php:184
+#: ../admin/company_preferences.php:184
 msgid "Add Price from Std Cost:"
 msgstr ""
 
-#: admin/company_preferences.php:186
+#: ../admin/company_preferences.php:186
 msgid "Round to nearest:"
 msgstr ""
 
-#: admin/company_preferences.php:189
+#: ../admin/company_preferences.php:189
 msgid "Search Item List"
 msgstr ""
 
-#: admin/company_preferences.php:190
+#: ../admin/company_preferences.php:190
 msgid "Search Customer List"
 msgstr ""
 
-#: admin/company_preferences.php:191
+#: ../admin/company_preferences.php:191
 msgid "Search Supplier List"
 msgstr ""
 
-#: admin/company_preferences.php:193
+#: ../admin/company_preferences.php:193
 msgid "Automatic Revaluation Currency Accounts"
 msgstr ""
 
-#: admin/company_preferences.php:194
+#: ../admin/company_preferences.php:194
 msgid "Time Zone on Reports"
 msgstr ""
 
-#: admin/company_preferences.php:195
+#: ../admin/company_preferences.php:195
 msgid "Login Timeout:"
 msgstr ""
 
-#: admin/company_preferences.php:195
+#: ../admin/company_preferences.php:195
 msgid "seconds"
 msgstr ""
 
-#: admin/company_preferences.php:196
+#: ../admin/company_preferences.php:196
 msgid "Version Id"
 msgstr ""
 
-#: admin/company_preferences.php:201 admin/display_prefs.php:142
-#: admin/forms_setup.php:61 admin/gl_setup.php:221 admin/inst_chart.php:74
-#: admin/inst_lang.php:103 admin/inst_lang.php.orig: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:401 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:257 gl/includes/ui/gl_journal_ui.inc:221
-#: includes/ui/db_pager_view.inc:174 includes/ui/radio.ui_input.inc:206
-#: includes/ui/radio.ui_input.inc:901 includes/ui/simple_crud_class.inc:56
-#: includes/ui/simple_crud_class.inc:227 includes/ui/ui_input.inc:206
-#: includes/ui/ui_input.inc:900 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:299 purchasing/includes/ui/po_ui.inc:442
-#: purchasing/po_receive_items.php:333 sales/credit_note_entry.php:282
-#: sales/customer_credit_invoice.php:382 sales/customer_delivery.php:523
-#: sales/customer_invoice.php:580 sales/inquiry/sales_orders_view.php:323
-#: sales/inquiry/sales_orders_view.php.orig:321
-#: 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/credit_note_entry.php:284
-#: sales/customer_credit_invoice.php:380 sales/customer_invoice.php:582
-#: sales/includes/ui/sales_order_ui.inc:241
-#: sales/includes/ui/sales_order_ui.inc:559 gl/gl_bank.php:403
-#: includes/ui/ui_input.inc:207 includes/ui/ui_input.inc:904
+#: ../admin/company_preferences.php:201
+#: ../admin/display_prefs.php:144
+#: ../admin/forms_setup.php:61
+#: ../admin/gl_setup.php.orig:235
+#: ../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:406
+#: ../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:208
+#: ../includes/ui/ui_input.inc:905
+#: ../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.orig:306
+#: ../purchasing/includes/ui/po_ui.inc.orig:457
+#: ../purchasing/po_receive_items.php:331
+#: ../sales/credit_note_entry.php:284
+#: ../sales/customer_credit_invoice.php:380
+#: ../sales/customer_delivery.php.orig:536
+#: ../sales/customer_invoice.php:684
+#: ../sales/inquiry/sales_orders_view.php:349
+#: ../sales/includes/ui/sales_credit_ui.inc:293
+#: ../sales/includes/ui/sales_order_ui.inc.orig:237
+#: ../sales/includes/ui/sales_order_ui.inc.orig:555
 msgid "Update"
 msgstr ""
 
-#: admin/create_coy.php:21
+#: ../admin/create_coy.php:21
 msgid "Create/Update Company"
 msgstr ""
 
-#: admin/create_coy.php:46 admin/create_coy.php:52
+#: ../admin/create_coy.php:46
+#: ../admin/create_coy.php:52
 msgid "Database settings are not specified."
 msgstr ""
 
-#: admin/create_coy.php:62
+#: ../admin/create_coy.php:62
 msgid "This database settings are already used by another company."
 msgstr ""
 
-#: admin/create_coy.php:67
+#: ../admin/create_coy.php:67
 msgid ""
 "You cannot have table set without prefix together with prefixed sets in the "
 "same database."
 msgstr ""
 
-#: admin/create_coy.php:127
+#: ../admin/create_coy.php:127
 msgid "Error creating Database: "
 msgstr ""
 
-#: admin/create_coy.php:127
+#: ../admin/create_coy.php:127
 msgid ", Please create it manually"
 msgstr ""
 
-#: admin/create_coy.php:131
+#: ../admin/create_coy.php:131
 msgid "Cannot create new company due to bugs in sql file."
 msgstr ""
 
-#: admin/create_coy.php:145 admin/create_coy.php:212 admin/create_coy.php:149
-#: admin/create_coy.php:216
+#: ../admin/create_coy.php:149
+#: ../admin/create_coy.php:216
 msgid "Cannot open the configuration file - "
 msgstr ""
 
-#: admin/create_coy.php:147 admin/create_coy.php:214 admin/create_coy.php:151
-#: admin/create_coy.php:218
+#: ../admin/create_coy.php:151
+#: ../admin/create_coy.php:218
 msgid "Cannot write to the configuration file - "
 msgstr ""
 
-#: admin/create_coy.php:149 admin/create_coy.php:185 admin/create_coy.php:216
-#: admin/create_coy.php:153 admin/create_coy.php:189 admin/create_coy.php:220
+#: ../admin/create_coy.php:153
+#: ../admin/create_coy.php:189
+#: ../admin/create_coy.php:220
 msgid "The configuration file "
 msgstr ""
 
-#: admin/create_coy.php:149 admin/create_coy.php:185 admin/create_coy.php:216
-#: admin/db/maintenance_db.inc:250 admin/db/maintenance_db.inc.orig:248
-#: admin/create_coy.php:153 admin/create_coy.php:189 admin/create_coy.php:220
+#: ../admin/create_coy.php:153
+#: ../admin/create_coy.php:189
+#: ../admin/create_coy.php:220
+#: ../admin/db/maintenance_db.inc:250
 msgid ""
 " is not writable. Change its permissions so it is, then re-run the operation."
 msgstr ""
 
-#: admin/create_coy.php:161 admin/create_coy.php:165
+#: ../admin/create_coy.php:165
 msgid "New company has been created."
 msgstr ""
 
-#: admin/create_coy.php:161 admin/create_coy.php:165
+#: ../admin/create_coy.php:165
 msgid "Company has been updated."
 msgstr ""
 
-#: admin/create_coy.php:178 admin/create_coy.php:182
+#: ../admin/create_coy.php:182
 msgid ""
 "Broken company subdirectories system. You have to remove this company "
 "manually."
 msgstr ""
 
-#: admin/create_coy.php:194 admin/create_coy.php:198
+#: ../admin/create_coy.php:198
 msgid "Cannot rename subdirectory to temporary name."
 msgstr ""
 
-#: admin/create_coy.php:200 admin/create_coy.php:204
+#: ../admin/create_coy.php:204
 msgid "Cannot rename company subdirectory"
 msgstr ""
 
-#: admin/create_coy.php:206 admin/create_coy.php:210
+#: ../admin/create_coy.php:210
 msgid "Error removing Database: "
 msgstr ""
 
-#: admin/create_coy.php:206 admin/create_coy.php:210
+#: ../admin/create_coy.php:210
 msgid ", please remove it manually"
 msgstr ""
 
-#: admin/create_coy.php:225 admin/create_coy.php:229
+#: ../admin/create_coy.php:229
 msgid "Cannot remove temporary renamed company data directory "
 msgstr ""
 
-#: admin/create_coy.php:228 admin/create_coy.php:232
+#: ../admin/create_coy.php:232
 msgid "Selected company has been deleted"
 msgstr ""
 
-#: admin/create_coy.php:242 admin/create_coy.php:246
+#: ../admin/create_coy.php:246
 msgid "Are you sure you want to delete company no. "
 msgstr ""
 
-#: admin/create_coy.php:249 admin/create_coy.php:253
+#: ../admin/create_coy.php:253
 msgid "Database Host"
 msgstr ""
 
-#: admin/create_coy.php:249 admin/create_coy.php:336 admin/create_coy.php:342
-#: admin/create_coy.php:253 admin/create_coy.php:341 admin/create_coy.php:347
+#: ../admin/create_coy.php:253
+#: ../admin/create_coy.php:341
+#: ../admin/create_coy.php:347
 msgid "Database User"
 msgstr ""
 
-#: admin/create_coy.php:250 admin/create_coy.php:338 admin/create_coy.php:343
-#: admin/create_coy.php:254 admin/create_coy.php:348
+#: ../admin/create_coy.php:254
+#: ../admin/create_coy.php:343
+#: ../admin/create_coy.php:348
 msgid "Database Name"
 msgstr ""
 
-#: admin/create_coy.php:250 admin/create_coy.php:339 admin/create_coy.php:344
-#: admin/create_coy.php:254 admin/create_coy.php:349
+#: ../admin/create_coy.php:254
+#: ../admin/create_coy.php:344
+#: ../admin/create_coy.php:349
 msgid "Table Pref"
 msgstr ""
 
-#: admin/create_coy.php:250 admin/create_coy.php:346 admin/inst_lang.php:36
-#: admin/inst_lang.php.orig:36 admin/print_profiles.php:162
-#: admin/create_coy.php:254 admin/create_coy.php:351
+#: ../admin/create_coy.php:254
+#: ../admin/create_coy.php:351
+#: ../admin/inst_lang.php:36
+#: ../admin/print_profiles.php:162
 msgid "Default"
 msgstr ""
 
-#: admin/create_coy.php:259 admin/fiscalyears.php:159 admin/inst_lang.php:85
-#: admin/inst_lang.php:97 admin/inst_lang.php.orig:85
-#: admin/inst_lang.php.orig:97 dimensions/inquiry/search_dimensions.php:107
-#: gl/manage/bank_accounts.php:125 gl/manage/bank_accounts.php.orig:125
-#: 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/sav.ui_lists.inc:1650 includes/ui/ui_lists.inc:1671
-#: purchasing/manage/suppliers.php:120 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
-#: taxes/tax_groups.php:137 admin/create_coy.php:263
+#: ../admin/create_coy.php:263
+#: ../admin/fiscalyears.php:159
+#: ../admin/inst_lang.php:85
+#: ../admin/inst_lang.php:97
+#: ../dimensions/inquiry/search_dimensions.php:107
+#: ../gl/manage/bank_accounts.php: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
+#: ../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 ""
 
-#: admin/create_coy.php:288 admin/create_coy.php:292
+#: ../admin/create_coy.php:292
 msgid "The marked company is the current company which cannot be deleted."
 msgstr ""
 
-#: admin/create_coy.php:335 admin/create_coy.php:341 admin/printers.php:84
-#: admin/create_coy.php:340 admin/create_coy.php:346
+#: ../admin/create_coy.php:293
+msgid ""
+"If no Admin Password is entered, the new Admin Password will be "
+"'<b>password</b>' by default "
+msgstr ""
+
+#: ../admin/create_coy.php:340
+#: ../admin/create_coy.php:346
+#: ../admin/printers.php:84
 msgid "Host"
 msgstr ""
 
-#: admin/create_coy.php:337 admin/create_coy.php:342
+#: ../admin/create_coy.php:342
 msgid "Database Password"
 msgstr ""
 
-#: admin/create_coy.php:339 admin/inst_chart.php:68 admin/inst_chart.php:70
-#: admin/inst_lang.php:87 admin/inst_lang.php:90 admin/inst_lang.php.orig:87
-#: admin/inst_lang.php.orig: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:286
-#: admin/create_coy.php:344
+#: ../admin/create_coy.php:344
+#: ../admin/inst_chart.php:68
+#: ../admin/inst_chart.php:70
+#: ../admin/inst_lang.php:87
+#: ../admin/inst_lang.php:90
+#: ../admin/inst_module.php:127
+#: ../admin/inst_theme.php:91
+#: ../admin/inst_theme.php:93
+#: ../admin/inst_upgrade.php:153
+#: ../gl/manage/gl_account_types.php:190
+#: ../includes/ui/allocation_cart.inc:288
 msgid "None"
 msgstr ""
 
-#: admin/create_coy.php:350 admin/create_coy.php:355
+#: ../admin/create_coy.php:355
 msgid "Database Script"
 msgstr ""
 
-#: admin/create_coy.php:351 admin/create_coy.php:356
+#: ../admin/create_coy.php:356
 msgid "New script Admin Password"
 msgstr ""
 
-#: admin/create_coy.php:355 gl/gl_budget.php:136 admin/create_coy.php:360
+#: ../admin/create_coy.php:360
+#: ../gl/gl_budget.php:136
 msgid "Save"
 msgstr ""
 
-#: admin/create_coy.php:377 admin/create_coy.php:382
+#: ../admin/create_coy.php:382
 msgid "Create a new company"
 msgstr ""
 
-#: admin/crm_categories.php:17
+#: ../admin/crm_categories.php:17
 msgid "Contact Categories"
 msgstr ""
 
-#: admin/crm_categories.php:31
+#: ../admin/crm_categories.php:31
 msgid "Category description cannot be empty."
 msgstr ""
 
-#: admin/crm_categories.php:41
+#: ../admin/crm_categories.php:41
 msgid "Selected contact category has been updated"
 msgstr ""
 
-#: admin/crm_categories.php:47
+#: ../admin/crm_categories.php:47
 msgid "New contact category has been added"
 msgstr ""
 
-#: admin/crm_categories.php:62
+#: ../admin/crm_categories.php:62
 msgid "Cannot delete this category because there are contacts related to it."
 msgstr ""
 
-#: admin/crm_categories.php:68
+#: ../admin/crm_categories.php:68
 msgid "Category has been deleted"
 msgstr ""
 
-#: admin/crm_categories.php:88
+#: ../admin/crm_categories.php:88
 msgid "Type id"
 msgstr ""
 
-#: admin/crm_categories.php:88
+#: ../admin/crm_categories.php:88
 msgid "Action id"
 msgstr ""
 
-#: admin/crm_categories.php:88 sales/manage/customer_branches.php:293
+#: ../admin/crm_categories.php:88
+#: ../sales/manage/customer_branches.php:295
 msgid "Short Name"
 msgstr ""
 
-#: admin/crm_categories.php:135 admin/crm_categories.php:139
+#: ../admin/crm_categories.php:135
+#: ../admin/crm_categories.php:139
 msgid "Contact Category Type:"
 msgstr ""
 
-#: admin/crm_categories.php:136 admin/crm_categories.php:140
+#: ../admin/crm_categories.php:136
+#: ../admin/crm_categories.php:140
 msgid "Contact Category Subtype:"
 msgstr ""
 
-#: admin/crm_categories.php:143
+#: ../admin/crm_categories.php:143
 msgid "Category Short Name:"
 msgstr ""
 
-#: admin/crm_categories.php:144
+#: ../admin/crm_categories.php:144
 msgid "Category Description:"
 msgstr ""
 
-#: admin/display_prefs.php:16
+#: ../admin/display_prefs.php:16
 msgid "Display Setup"
 msgstr ""
 
-#: admin/display_prefs.php:30
+#: ../admin/display_prefs.php:30
 msgid "Query size must be integer and greater than zero."
 msgstr ""
 
-#: admin/display_prefs.php:59
+#: ../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 ""
 
-#: admin/display_prefs.php:61
+#: ../admin/display_prefs.php:61
 msgid "Display settings have been updated."
 msgstr ""
 
-#: admin/display_prefs.php:70
+#: ../admin/display_prefs.php:70
 msgid "Decimal Places"
 msgstr ""
 
-#: admin/display_prefs.php:72
+#: ../admin/display_prefs.php:72
 msgid "Prices/Amounts:"
 msgstr ""
 
-#: admin/display_prefs.php:73
+#: ../admin/display_prefs.php:73
 msgid "Quantities:"
 msgstr ""
 
-#: admin/display_prefs.php:74
+#: ../admin/display_prefs.php:74
 msgid "Exchange Rates:"
 msgstr ""
 
-#: admin/display_prefs.php:75
+#: ../admin/display_prefs.php:75
 msgid "Percentages:"
 msgstr ""
 
-#: admin/display_prefs.php:77
+#: ../admin/display_prefs.php:77
 msgid "Dateformat and Separators"
 msgstr ""
 
-#: admin/display_prefs.php:79
+#: ../admin/display_prefs.php:79
 msgid "Dateformat:"
 msgstr ""
 
-#: admin/display_prefs.php:81
+#: ../admin/display_prefs.php:81
 msgid "Date Separator:"
 msgstr ""
 
-#: admin/display_prefs.php:86
+#: ../admin/display_prefs.php:86
 msgid "Thousand Separator:"
 msgstr ""
 
-#: admin/display_prefs.php:91
+#: ../admin/display_prefs.php:91
 msgid "Decimal Separator:"
 msgstr ""
 
-#: admin/display_prefs.php:98 admin/inst_lang.php:35
-#: admin/inst_lang.php.orig:35
+#: ../admin/display_prefs.php:98
+#: ../admin/inst_lang.php:35
 msgid "Language"
 msgstr ""
 
-#: admin/display_prefs.php:100 admin/users.php:206
+#: ../admin/display_prefs.php:100
+#: ../admin/users.php:206
 msgid "Language:"
 msgstr ""
 
-#: admin/display_prefs.php:103 applications/setup.php:42
-#: applications/setup.php.orig:42 includes/sysnames.inc:94
+#: ../admin/display_prefs.php:103
+#: ../applications/setup.php:42
+#: ../includes/sysnames.inc:94
 msgid "Miscellaneous"
 msgstr ""
 
-#: admin/display_prefs.php:105
+#: ../admin/display_prefs.php:105
 msgid "Show hints for new users:"
 msgstr ""
 
-#: admin/display_prefs.php:107
+#: ../admin/display_prefs.php:107
 msgid "Show GL Information:"
 msgstr ""
 
-#: admin/display_prefs.php:109
+#: ../admin/display_prefs.php:109
 msgid "Show Item Codes:"
 msgstr ""
 
-#: admin/display_prefs.php:116
+#: ../admin/display_prefs.php:116
 msgid "Page Size:"
 msgstr ""
 
-#: admin/display_prefs.php:118
+#: ../admin/display_prefs.php:118
 msgid "Start-up Tab"
 msgstr ""
 
-#: admin/display_prefs.php:126 admin/users.php:210
+#: ../admin/display_prefs.php:126
+#: ../admin/users.php:210
 msgid "Printing profile"
 msgstr ""
 
-#: admin/display_prefs.php:127 admin/users.php:211
+#: ../admin/display_prefs.php:127
+#: ../admin/users.php:211
 msgid "Browser printing support"
 msgstr ""
 
-#: admin/display_prefs.php:129
+#: ../admin/display_prefs.php:129
 msgid "Use popup window to display reports:"
 msgstr ""
 
-#: admin/display_prefs.php:130 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 ""
 
-#: admin/display_prefs.php:132
+#: ../admin/display_prefs.php:132
 msgid "Use icons instead of text links:"
 msgstr ""
 
-#: admin/display_prefs.php:133
+#: ../admin/display_prefs.php:133
 msgid "Set this option to on for using icons instead of text links"
 msgstr ""
 
-#: admin/display_prefs.php:135
+#: ../admin/display_prefs.php:135
 msgid "Query page size:"
 msgstr ""
 
-#: admin/display_prefs.php:137
+#: ../admin/display_prefs.php:137
 msgid "Remember last document date:"
 msgstr ""
 
-#: admin/display_prefs.php:138
+#: ../admin/display_prefs.php:138
 msgid ""
 "If set document date is remembered on subsequent documents, otherwise "
 "default is current date"
 msgstr ""
 
-#: admin/fiscalyears.php:25
+#: ../admin/display_prefs.php:140
+msgid "Transaction days:"
+msgstr ""
+
+#: ../admin/fiscalyears.php:25
 msgid "Fiscal Years"
 msgstr ""
 
-#: admin/fiscalyears.php:34
+#: ../admin/fiscalyears.php:34
 msgid "Invalid BEGIN date in fiscal year."
 msgstr ""
 
-#: admin/fiscalyears.php:40
+#: ../admin/fiscalyears.php:40
 msgid "Invalid END date in fiscal year."
 msgstr ""
 
-#: admin/fiscalyears.php:46
+#: ../admin/fiscalyears.php:46
 msgid "Invalid BEGIN or END date in fiscal year."
 msgstr ""
 
-#: admin/fiscalyears.php:52
+#: ../admin/fiscalyears.php:52
 msgid "BEGIN date bigger than END date."
 msgstr ""
 
-#: admin/fiscalyears.php:70
+#: ../admin/fiscalyears.php:70
 msgid "Cannot CLOSE this year because there are open fiscal years before"
 msgstr ""
 
-#: admin/fiscalyears.php:81
+#: ../admin/fiscalyears.php:81
 msgid "Selected fiscal year has been updated"
 msgstr ""
 
-#: admin/fiscalyears.php:89
+#: ../admin/fiscalyears.php:89
 msgid "New fiscal year has been added"
 msgstr ""
 
-#: admin/fiscalyears.php:102
+#: ../admin/fiscalyears.php:102
 msgid "Cannot delete this fiscal year because thera are fiscal years before."
 msgstr ""
 
-#: admin/fiscalyears.php:107
+#: ../admin/fiscalyears.php:107
 msgid "Cannot delete this fiscal year because the fiscal year is not closed."
 msgstr ""
 
-#: admin/fiscalyears.php:120
+#: ../admin/fiscalyears.php:120
 msgid "Selected fiscal year has been deleted"
 msgstr ""
 
-#: admin/fiscalyears.php:133
+#: ../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 ""
 
-#: admin/fiscalyears.php:138
+#: ../admin/fiscalyears.php:138
 msgid "Fiscal Year Begin"
 msgstr ""
 
-#: admin/fiscalyears.php:138
+#: ../admin/fiscalyears.php:138
 msgid "Fiscal Year End"
 msgstr ""
 
-#: admin/fiscalyears.php:138 dimensions/inquiry/search_dimensions.php:133
-#: dimensions/inquiry/search_dimensions.php:139
-#: includes/ui/sav.ui_lists.inc:659 includes/ui/ui_lists.inc:676
-#: manufacturing/search_work_orders.php:108 reporting/rep501.php:85
-#: reporting/rep710.php:109 reporting/includes/excel_report.inc:234
-#: reporting/includes/pdf_report.inc:266
+#: ../admin/fiscalyears.php:138
+#: ../dimensions/inquiry/search_dimensions.php:133
+#: ../dimensions/inquiry/search_dimensions.php:139
+#: ../includes/ui/ui_input.inc:958
+#: ../includes/ui/ui_lists.inc: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 ""
 
-#: admin/fiscalyears.php:168
+#: ../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 ""
 
-#: admin/fiscalyears.php:176
+#: ../admin/fiscalyears.php:176
 msgid ""
 "The marked fiscal year is the current fiscal year which cannot be deleted."
 msgstr ""
 
-#: admin/fiscalyears.php:200 admin/fiscalyears.php:211
+#: ../admin/fiscalyears.php:200
+#: ../admin/fiscalyears.php:211
 msgid "Fiscal Year Begin:"
 msgstr ""
 
-#: admin/fiscalyears.php:201 admin/fiscalyears.php:212
+#: ../admin/fiscalyears.php:201
+#: ../admin/fiscalyears.php:212
 msgid "Fiscal Year End:"
 msgstr ""
 
-#: admin/fiscalyears.php:216
+#: ../admin/fiscalyears.php:216
 msgid "Is Closed:"
 msgstr ""
 
-#: admin/forms_setup.php:16
+#: ../admin/forms_setup.php:16
 msgid "Forms Setup"
 msgstr ""
 
-#: admin/forms_setup.php:36
+#: ../admin/forms_setup.php:36
 msgid "Forms settings have been updated."
 msgstr ""
 
-#: admin/forms_setup.php:46
+#: ../admin/forms_setup.php:46
 msgid "Form"
 msgstr ""
 
-#: admin/forms_setup.php:46
+#: ../admin/forms_setup.php:46
 msgid "Next Reference"
 msgstr ""
 
-#: admin/gl_setup.php:16
+#: ../admin/gl_setup.php:16
+#: ../admin/gl_setup.php.orig:16
 msgid "System and General GL Setup"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: admin/gl_setup.php:52
+#: ../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:75
+#: ../admin/gl_setup.php.orig:75
 msgid "The general GL setup has been updated."
 msgstr ""
 
-#: admin/gl_setup.php:132
+#: ../admin/gl_setup.php.orig:138
 msgid "General GL"
 msgstr ""
 
-#: admin/gl_setup.php:134
+#: ../admin/gl_setup.php.orig:140
 msgid "Past Due Days Interval:"
 msgstr ""
 
-#: admin/gl_setup.php:134 admin/gl_setup.php:169 admin/gl_setup.php:177
-#: admin/gl_setup.php:214 admin/payment_terms.php:140
+#: ../admin/gl_setup.php.orig:140
+#: ../admin/gl_setup.php.orig:180
+#: ../admin/gl_setup.php.orig:188
+#: ../admin/gl_setup.php.orig:206
+#: ../admin/gl_setup.php.orig:228
+#: ../admin/payment_terms.php:140
 msgid "days"
 msgstr ""
 
-#: admin/gl_setup.php:136
+#: ../admin/gl_setup.php.orig:142
 msgid "Retained Earnings:"
 msgstr ""
 
-#: admin/gl_setup.php:138
+#: ../admin/gl_setup.php.orig:144
 msgid "Profit/Loss Year:"
 msgstr ""
 
-#: admin/gl_setup.php:140
+#: ../admin/gl_setup.php.orig:146
 msgid "Exchange Variances Account:"
 msgstr ""
 
-#: admin/gl_setup.php:142
+#: ../admin/gl_setup.php.orig:148
+#: ../gl/manage/bank_accounts.php:193
 msgid "Bank Charges Account:"
 msgstr ""
 
-#: admin/gl_setup.php:146
+#: ../admin/gl_setup.php.orig:150
+msgid "Tax Algorithm:"
+msgstr ""
+
+#: ../admin/gl_setup.php.orig:154
 msgid "Customers and Sales"
 msgstr ""
 
-#: admin/gl_setup.php:148
+#: ../admin/gl_setup.php.orig:156
 msgid "Default Credit Limit:"
 msgstr ""
 
-#: admin/gl_setup.php:150
+#: ../admin/gl_setup.php.orig:158
 msgid "Accumulate batch shipping:"
 msgstr ""
 
-#: admin/gl_setup.php:152
+#: ../admin/gl_setup.php.orig:160
 msgid "Legal Text on Invoice:"
 msgstr ""
 
-#: admin/gl_setup.php:154
+#: ../admin/gl_setup.php.orig:162
 msgid "Shipping Charged Account:"
 msgstr ""
 
-#: admin/gl_setup.php:158
+#: ../admin/gl_setup.php.orig:164
+msgid "Deferred Income Account:"
+msgstr ""
+
+#: ../admin/gl_setup.php.orig:165
+msgid "Not used"
+msgstr ""
+
+#: ../admin/gl_setup.php.orig:169
 msgid "Customers and Sales Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:160
+#: ../admin/gl_setup.php.orig:171
 msgid "Receivable Account:"
 msgstr ""
 
-#: admin/gl_setup.php:162 admin/gl_setup.php:200
-#: inventory/manage/item_categories.php:192 inventory/manage/items.php:354
-#: sales/manage/customer_branches.php:250
+#: ../admin/gl_setup.php.orig:173
+#: ../admin/gl_setup.php.orig:214
+#: ../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 ""
 
-#: admin/gl_setup.php:165 sales/manage/customer_branches.php:251
+#: ../admin/gl_setup.php.orig:176
+#: ../sales/manage/customer_branches.php:252
 msgid "Sales Discount Account:"
 msgstr ""
 
-#: admin/gl_setup.php:167 sales/manage/customer_branches.php:253
+#: ../admin/gl_setup.php.orig:178
+#: ../sales/manage/customer_branches.php:254
 msgid "Prompt Payment Discount Account:"
 msgstr ""
 
-#: admin/gl_setup.php:169
+#: ../admin/gl_setup.php.orig:180
 msgid "Delivery Required By:"
 msgstr ""
 
-#: admin/gl_setup.php:175
+#: ../admin/gl_setup.php.orig:186
 msgid "Dimension Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:177
+#: ../admin/gl_setup.php.orig:188
 msgid "Dimension Required By After:"
 msgstr ""
 
-#: admin/gl_setup.php:180
+#: ../admin/gl_setup.php.orig:192
 msgid "Suppliers and Purchasing"
 msgstr ""
 
-#: admin/gl_setup.php:182
+#: ../admin/gl_setup.php.orig:194
 msgid "Delivery Over-Receive Allowance:"
 msgstr ""
 
-#: admin/gl_setup.php:184
+#: ../admin/gl_setup.php.orig:196
 msgid "Invoice Over-Charge Allowance:"
 msgstr ""
 
-#: admin/gl_setup.php:186
+#: ../admin/gl_setup.php.orig:198
 msgid "Suppliers and Purchasing Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:188
+#: ../admin/gl_setup.php.orig:200
 msgid "Payable Account:"
 msgstr ""
 
-#: admin/gl_setup.php:190 purchasing/manage/suppliers.php:126
+#: ../admin/gl_setup.php.orig:202
+#: ../purchasing/manage/suppliers.php:132
+#: ../purchasing/manage/suppliers.php.orig:142
 msgid "Purchase Discount Account:"
 msgstr ""
 
-#: admin/gl_setup.php:192
+#: ../admin/gl_setup.php.orig:204
 msgid "GRN Clearing Account:"
 msgstr ""
 
-#: admin/gl_setup.php:192
+#: ../admin/gl_setup.php.orig:204
 msgid "No postings on GRN"
 msgstr ""
 
-#: admin/gl_setup.php:194 reporting/reports_main.php:175
+#: ../admin/gl_setup.php.orig:206
+msgid "Receival Required By:"
+msgstr ""
+
+#: ../admin/gl_setup.php.orig:208
+#: ../reporting/reports_main.php:175
 msgid "Inventory"
 msgstr ""
 
-#: admin/gl_setup.php:196
+#: ../admin/gl_setup.php.orig:210
 msgid "Allow Negative Inventory:"
 msgstr ""
 
-#: admin/gl_setup.php:197
+#: ../admin/gl_setup.php.orig:211
 msgid "Warning:  This may cause a delay in GL postings"
 msgstr ""
 
-#: admin/gl_setup.php:199
+#: ../admin/gl_setup.php.orig:213
 msgid "Items Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:202 inventory/manage/item_categories.php:202
-#: inventory/manage/items.php:358
+#: ../admin/gl_setup.php.orig:216
+#: ../inventory/manage/item_categories.php:202
+#: ../inventory/manage/items.php:365
+#: ../inventory/manage/items.php.orig:358
 msgid "Inventory Account:"
 msgstr ""
 
-#: admin/gl_setup.php:204 inventory/manage/item_categories.php:196
-#: inventory/manage/item_categories.php:204 inventory/manage/items.php:359
-#: inventory/manage/items.php:364
+#: ../admin/gl_setup.php.orig:218
+#: ../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 ""
 
-#: admin/gl_setup.php:206 inventory/manage/item_categories.php:205
-#: inventory/manage/items.php:360
+#: ../admin/gl_setup.php.orig:220
+#: ../inventory/manage/item_categories.php:205
+#: ../inventory/manage/items.php:367
+#: ../inventory/manage/items.php.orig:360
 msgid "Inventory Adjustments Account:"
 msgstr ""
 
-#: admin/gl_setup.php:208 inventory/manage/item_categories.php:209
-#: inventory/manage/items.php:371
+#: ../admin/gl_setup.php.orig:222
+#: ../inventory/manage/item_categories.php:209
+#: ../inventory/manage/items.php:378
+#: ../inventory/manage/items.php.orig:371
 msgid "Item Assembly Costs Account:"
 msgstr ""
 
-#: admin/gl_setup.php:212
+#: ../admin/gl_setup.php.orig:226
 msgid "Manufacturing Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:214
+#: ../admin/gl_setup.php.orig:228
 msgid "Work Order Required By After:"
 msgstr ""
 
-#: admin/inst_chart.php:20
+#: ../admin/inst_chart.php:20
 msgid "Install Charts of Accounts"
 msgstr ""
 
-#: admin/inst_chart.php:35
+#: ../admin/inst_chart.php:35
 msgid "Selected chart has been successfully deleted"
 msgstr ""
 
-#: admin/inst_chart.php:50
+#: ../admin/inst_chart.php:50
 msgid "Chart"
 msgstr ""
 
-#: admin/inst_chart.php:50 admin/inst_lang.php:36 admin/inst_lang.php.orig:36
-#: admin/inst_module.php:105 admin/inst_theme.php:74
-#: admin/inst_upgrade.php:155
+#: ../admin/inst_chart.php:50
+#: ../admin/inst_lang.php:36
+#: ../admin/inst_module.php:105
+#: ../admin/inst_theme.php:74
+#: ../admin/inst_upgrade.php:159
 msgid "Installed"
 msgstr ""
 
-#: admin/inst_chart.php:50 admin/inst_lang.php:36 admin/inst_lang.php.orig:36
-#: admin/inst_module.php:105 admin/inst_theme.php:74
-#: inventory/inquiry/stock_status.php:77 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 ""
 
-#: admin/inst_chart.php:50 admin/inst_lang.php:35 admin/inst_lang.php:218
-#: admin/inst_lang.php.orig:35 admin/inst_lang.php.orig:218
+#: ../admin/inst_chart.php:50
+#: ../admin/inst_lang.php:35
+#: ../admin/inst_lang.php:218
 msgid "Encoding"
 msgstr ""
 
-#: admin/inst_chart.php:69 admin/inst_chart.php:71 admin/inst_lang.php:88
-#: admin/inst_lang.php.orig:88 admin/inst_module.php:128
-#: admin/inst_module.php:129 admin/inst_theme.php:92
+#: ../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 ""
 
-#: admin/inst_chart.php:74 admin/inst_lang.php:103
-#: admin/inst_lang.php.orig:103 admin/inst_module.php:133
-#: admin/inst_module.php:138 admin/inst_theme.php:96
-#: admin/inst_upgrade.php:137
+#: ../admin/inst_chart.php: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:141
 msgid "Install"
 msgstr ""
 
-#: admin/inst_chart.php:75 admin/inst_module.php:139 admin/inst_theme.php:97
+#: ../admin/inst_chart.php:75
+#: ../admin/inst_module.php:139
+#: ../admin/inst_theme.php:97
 msgid "Upload and install latest extension package"
 msgstr ""
 
-#: admin/inst_chart.php:82 admin/inst_module.php:146 admin/inst_theme.php:104
+#: ../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 ""
 
-#: admin/inst_lang.php:23 admin/inst_lang.php.orig:23
+#: ../admin/inst_lang.php:23
 msgid "Install/Update Languages"
 msgstr ""
 
-#: admin/inst_lang.php:35 admin/inst_lang.php.orig: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:245
-#: purchasing/includes/ui/invoice_ui.inc:247
-#: purchasing/includes/ui/invoice_ui.inc:249 reporting/rep501.php:85
-#: reporting/rep709.php:109 reporting/rep709.php:110
-#: sales/manage/customer_branches.php:294 sales/manage/sales_people.php:99
-#: taxes/item_tax_types.php:117
+#: ../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 ""
 
-#: admin/inst_lang.php:35 admin/inst_lang.php:220 admin/inst_lang.php.orig:35
-#: admin/inst_lang.php.orig:220
+#: ../admin/inst_lang.php:35
+#: ../admin/inst_lang.php:220
 msgid "Right To Left"
 msgstr ""
 
-#: admin/inst_lang.php:47 admin/inst_lang.php.orig:47
+#: ../admin/inst_lang.php:47
 msgid "Supported"
 msgstr ""
 
-#: admin/inst_lang.php:49 admin/inst_lang.php.orig:49
+#: ../admin/inst_lang.php:49
 msgid "Display also languages not supported by server locales"
 msgstr ""
 
-#: admin/inst_lang.php:100 admin/inst_lang.php.orig:100
+#: ../admin/inst_lang.php:100
 msgid "Edit non standard language configuration"
 msgstr ""
 
-#: admin/inst_lang.php:104 admin/inst_lang.php.orig:104
+#: ../admin/inst_lang.php:104
 msgid "Upload and install latest language package"
 msgstr ""
 
-#: admin/inst_lang.php:111 admin/inst_lang.php.orig:111
+#: ../admin/inst_lang.php:111
 #, php-format
 msgid ""
 "You are about to remove language \\'%s\\'.\n"
 "Do you want to continue ?"
 msgstr ""
 
-#: admin/inst_lang.php:118 admin/inst_lang.php.orig:118
+#: ../admin/inst_lang.php:118
 msgid "The marked language is the current language which cannot be deleted."
 msgstr ""
 
-#: admin/inst_lang.php:120 admin/inst_lang.php.orig:120
+#: ../admin/inst_lang.php:120
 msgid "Update default"
 msgstr ""
 
-#: admin/inst_lang.php:122 admin/inst_lang.php.orig:122
+#: ../admin/inst_lang.php:122
 msgid "Add new language manually"
 msgstr ""
 
-#: admin/inst_lang.php:135 admin/inst_lang.php.orig:135
+#: ../admin/inst_lang.php:135
 msgid "Language name, code nor encoding cannot be empty"
 msgstr ""
 
-#: admin/inst_lang.php:140 admin/inst_lang.php.orig: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 ""
 
-#: admin/inst_lang.php:216 admin/inst_lang.php.orig:216
+#: ../admin/inst_lang.php:216
 msgid "Language Code"
 msgstr ""
 
-#: admin/inst_lang.php:217 admin/inst_lang.php.orig:217
+#: ../admin/inst_lang.php:217
 msgid "Language Name"
 msgstr ""
 
-#: admin/inst_lang.php:221 admin/inst_lang.php.orig:221
+#: ../admin/inst_lang.php:221
 msgid "Default Language"
 msgstr ""
 
-#: admin/inst_lang.php:223 admin/inst_lang.php:224
-#: admin/inst_lang.php.orig:223 admin/inst_lang.php.orig:224
+#: ../admin/inst_lang.php:223
+#: ../admin/inst_lang.php:224
 msgid "Language File"
 msgstr ""
 
-#: admin/inst_lang.php:227 admin/inst_lang.php.orig:227
+#: ../admin/inst_lang.php:227
 msgid "Select your language files from your local harddisk."
 msgstr ""
 
-#: admin/inst_module.php:20
+#: ../admin/inst_module.php:20
 msgid "Install/Activate extensions"
 msgstr ""
 
-#: admin/inst_module.php:78
+#: ../admin/inst_module.php:78
 msgid "Selected extension has been successfully deleted"
 msgstr ""
 
-#: admin/inst_module.php:104 admin/inst_module.php:169
+#: ../admin/inst_module.php:104
+#: ../admin/inst_module.php:169
 msgid "Extension"
 msgstr ""
 
-#: admin/inst_module.php:104 admin/inst_module.php:169
+#: ../admin/inst_module.php:104
+#: ../admin/inst_module.php:169
 msgid "Modules provided"
 msgstr ""
 
-#: admin/inst_module.php:104 admin/inst_module.php:169
+#: ../admin/inst_module.php:104
+#: ../admin/inst_module.php:169
 msgid "Options provided"
 msgstr ""
 
-#: admin/inst_module.php:133
+#: ../admin/inst_module.php:133
 msgid "Install third-party extension."
 msgstr ""
 
-#: admin/inst_module.php:169 includes/ui/sav.ui_lists.inc:659
-#: includes/ui/sav.ui_lists.inc:2131 includes/ui/ui_lists.inc:676
-#: includes/ui/ui_lists.inc:2152 reporting/includes/excel_report.inc:232
-#: reporting/includes/pdf_report.inc:264
+#: ../admin/inst_module.php:169
+#: ../includes/ui/ui_lists.inc:675
+#: ../includes/ui/ui_lists.inc:2156
+#: ../reporting/includes/excel_report.inc:232
+#: ../reporting/includes/pdf_report.inc:264
 msgid "Active"
 msgstr ""
 
-#: admin/inst_module.php:232
+#: ../admin/inst_module.php:232
 msgid "Status change for some extensions failed."
 msgstr ""
 
-#: admin/inst_module.php:235
+#: ../admin/inst_module.php:235
 msgid "Current active extensions set has been saved."
 msgstr ""
 
-#: admin/inst_module.php:257
+#: ../admin/inst_module.php:257
 msgid "Extensions:"
 msgstr ""
 
-#: admin/inst_theme.php:20
+#: ../admin/inst_theme.php:20
 msgid "Install Themes"
 msgstr ""
 
-#: admin/inst_theme.php:59
+#: ../admin/inst_theme.php:59
 msgid "Selected theme has been successfully deleted"
 msgstr ""
 
-#: admin/inst_theme.php:74
+#: ../admin/inst_theme.php:74
 msgid "Theme"
 msgstr ""
 
-#: admin/inst_upgrade.php:16
+#: ../admin/inst_upgrade.php:16
 msgid "Software Upgrade"
 msgstr ""
 
-#: admin/inst_upgrade.php:72
+#: ../admin/inst_upgrade.php:72
 #, php-format
 msgid "Database upgrade for company '%s' (%s:%s*) started..."
 msgstr ""
 
-#: admin/inst_upgrade.php:80
+#: ../admin/inst_upgrade.php:83
 msgid "Database upgrade finished."
 msgstr ""
 
-#: admin/inst_upgrade.php:84
+#: ../admin/inst_upgrade.php:86
 msgid ""
 "Upgrade cannot be done because database has been already partially upgraded. "
 "Please downgrade database to clean previous version or try forced upgrade."
 msgstr ""
 
-#: admin/inst_upgrade.php:102
+#: ../admin/inst_upgrade.php:104
 msgid "Cannot connect to database for company"
 msgstr ""
 
-#: admin/inst_upgrade.php:114
+#: ../admin/inst_upgrade.php:117
 #, php-format
 msgid "Database upgrade to version %s failed for company '%s'."
 msgstr ""
 
-#: admin/inst_upgrade.php:117
+#: ../admin/inst_upgrade.php:120
 msgid "You should restore company database from latest backup file"
 msgstr ""
 
-#: admin/inst_upgrade.php:129
+#: ../admin/inst_upgrade.php:133
 msgid "All companies data has been successfully updated"
 msgstr ""
 
-#: admin/inst_upgrade.php:137
+#: ../admin/inst_upgrade.php:141
 msgid "Sql file"
 msgstr ""
 
-#: admin/inst_upgrade.php:138
+#: ../admin/inst_upgrade.php:142
 msgid "Force upgrade"
 msgstr ""
 
-#: admin/inst_upgrade.php:161
+#: ../admin/inst_upgrade.php:165
 #, php-format
 msgid "Partially installed (%s)"
 msgstr ""
 
-#: admin/inst_upgrade.php:170
+#: ../admin/inst_upgrade.php:174
 msgid ""
 "Database upgrades marked as partially installed cannot be installed "
 "automatically.\n"
@@ -1560,8036 +1843,9134 @@ msgid ""
 "upgrade."
 msgstr ""
 
-#: admin/inst_upgrade.php:174
+#: ../admin/inst_upgrade.php:178
 msgid "Upgrade system"
 msgstr ""
 
-#: admin/inst_upgrade.php:174
+#: ../admin/inst_upgrade.php:178
 msgid "Save database and perform upgrade"
 msgstr ""
 
-#: admin/payment_terms.php:16 reporting/includes/doctext.inc:242
-#: sales/view/view_invoice.php:74 sales/view/view_sales_order.php:78
+#: ../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 ""
 
-#: 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 ""
 
-#: admin/payment_terms.php:57
+#: ../admin/payment_terms.php:57
 msgid "The Terms description must be entered."
 msgstr ""
 
-#: admin/payment_terms.php:77
+#: ../admin/payment_terms.php:77
 msgid "Selected payment terms have been updated"
 msgstr ""
 
-#: admin/payment_terms.php:82
+#: ../admin/payment_terms.php:82
 msgid "New payment terms have been added"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: admin/payment_terms.php:107
+#: ../admin/payment_terms.php:107
 msgid "Selected payment terms have been deleted"
 msgstr ""
 
-#: admin/payment_terms.php:127 dimensions/dimension_entry.php:275
-#: dimensions/inquiry/search_dimensions.php:75
-#: dimensions/inquiry/search_dimensions.php:130
-#: dimensions/view/view_dimension.php:54 gl/bank_account_reconcile.php:233
-#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126
-#: gl/inquiry/journal_inquiry.php:129 gl/inquiry/tax_inquiry.php:82
-#: gl/manage/bank_accounts.php:106 gl/manage/bank_accounts.php.orig:106
-#: 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:80
-#: includes/ui/ui_view.inc:488 inventory/inquiry/stock_movements.php:81
-#: inventory/manage/item_categories.php:98
-#: manufacturing/search_work_orders.php:161
-#: manufacturing/includes/manufacturing_ui.inc:236
-#: manufacturing/includes/manufacturing_ui.inc:276
-#: manufacturing/includes/manufacturing_ui.inc:280
-#: manufacturing/includes/manufacturing_ui.inc:331
-#: purchasing/inquiry/supplier_allocation_inquiry.php:126
-#: purchasing/inquiry/supplier_inquiry.php:168
-#: purchasing/inquiry/supplier_inquiry.php.orig:162 reporting/rep102.php:132
-#: reporting/rep202.php:137 reporting/rep501.php:85 reporting/rep601.php:76
-#: 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:140
-#: reporting/includes/doctext.inc:181 reporting/includes/doctext.inc:200
-#: sales/inquiry/customer_allocation_inquiry.php:144
-#: sales/inquiry/customer_inquiry.php:224
-#: sales/inquiry/customer_inquiry.php.orig:224
+#: ../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
+#: ../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_inquiry.php:200
 msgid "Type"
 msgstr ""
 
-#: admin/payment_terms.php:127
+#: ../admin/payment_terms.php:127
 msgid "Due After/Days"
 msgstr ""
 
-#: admin/payment_terms.php:140
+#: ../admin/payment_terms.php:140
+#: ../admin/void_transaction.php:125
 msgid "N/A"
 msgstr ""
 
-#: admin/payment_terms.php:174
+#: ../admin/payment_terms.php:174
 msgid "Terms Description:"
 msgstr ""
 
-#: admin/payment_terms.php:176
+#: ../admin/payment_terms.php:176
 msgid "Payment type:"
 msgstr ""
 
-#: admin/payment_terms.php:179
+#: ../admin/payment_terms.php:179
 msgid "Days (Or Day In Following Month):"
 msgstr ""
 
-#: admin/printers.php:16
+#: ../admin/printers.php:16
 msgid "Printer Locations"
 msgstr ""
 
-#: admin/printers.php:31
+#: ../admin/printers.php:31
 msgid "Printer name cannot be empty."
 msgstr ""
 
-#: admin/printers.php:36
+#: ../admin/printers.php:36
 msgid "You have selected printing to server at user IP."
 msgstr ""
 
-#: admin/printers.php:41
+#: ../admin/printers.php:41
 msgid "Timeout cannot be less than zero nor longer than 60 (sec)."
 msgstr ""
 
-#: admin/printers.php:52
+#: ../admin/printers.php:52
 msgid "New printer definition has been created"
 msgstr ""
 
-#: admin/printers.php:53
+#: ../admin/printers.php:53
 msgid "Selected printer definition has been updated"
 msgstr ""
 
-#: admin/printers.php:64
+#: ../admin/printers.php:64
 msgid ""
 "Cannot delete this printer definition, because print profile have been "
 "created using it."
 msgstr ""
 
-#: admin/printers.php:69
+#: ../admin/printers.php:69
 msgid "Selected printer definition has been deleted"
 msgstr ""
 
-#: admin/printers.php:84 admin/printers.php:136
+#: ../admin/printers.php:84
+#: ../admin/printers.php:136
 msgid "Printer Queue"
 msgstr ""
 
-#: admin/printers.php:132
+#: ../admin/printers.php:132
 msgid "Printer Name"
 msgstr ""
 
-#: admin/printers.php:133
+#: ../admin/printers.php:133
 msgid "Printer Description"
 msgstr ""
 
-#: admin/printers.php:134
+#: ../admin/printers.php:134
 msgid "Host name or IP"
 msgstr ""
 
-#: admin/printers.php:135
+#: ../admin/printers.php:135
 msgid "Port"
 msgstr ""
 
-#: admin/printers.php:137
+#: ../admin/printers.php:137
 msgid "Timeout"
 msgstr ""
 
-#: admin/print_profiles.php:18
+#: ../admin/print_profiles.php:18
 msgid "Printing Profiles"
 msgstr ""
 
-#: admin/print_profiles.php:33
+#: ../admin/print_profiles.php:33
 msgid "Default printing destination"
 msgstr ""
 
-#: admin/print_profiles.php:91
+#: ../admin/print_profiles.php:91
 msgid "Printing profile name cannot be empty."
 msgstr ""
 
-#: admin/print_profiles.php:107
+#: ../admin/print_profiles.php:107
 msgid "New printing profile has been created"
 msgstr ""
 
-#: admin/print_profiles.php:110
+#: ../admin/print_profiles.php:110
 msgid "Printing profile has been updated"
 msgstr ""
 
-#: admin/print_profiles.php:119
+#: ../admin/print_profiles.php:119
 msgid "Selected printing profile has been deleted"
 msgstr ""
 
-#: admin/print_profiles.php:130
+#: ../admin/print_profiles.php:130
 msgid "Select printing profile"
 msgstr ""
 
-#: admin/print_profiles.php:131
+#: ../admin/print_profiles.php:131
 msgid "New printing profile"
 msgstr ""
 
-#: admin/print_profiles.php:136 admin/print_profiles.php:138
+#: ../admin/print_profiles.php:136
+#: ../admin/print_profiles.php:138
 msgid "Printing Profile Name"
 msgstr ""
 
-#: admin/print_profiles.php:148
+#: ../admin/print_profiles.php:148
 msgid "Report Id"
 msgstr ""
 
-#: admin/print_profiles.php:148
+#: ../admin/print_profiles.php:148
 msgid "Printer"
 msgstr ""
 
-#: admin/print_profiles.php:162
+#: ../admin/print_profiles.php:162
 msgid "Browser support"
 msgstr ""
 
-#: admin/print_profiles.php:169
+#: ../admin/print_profiles.php:169
 msgid "no title was found in this report definition file."
 msgstr ""
 
-#: admin/print_profiles.php:175
+#: ../admin/print_profiles.php:175
 msgid "Add New Profile"
 msgstr ""
 
-#: admin/print_profiles.php:177
+#: ../admin/print_profiles.php:177
 msgid "Update Profile"
 msgstr ""
 
-#: admin/print_profiles.php:178
+#: ../admin/print_profiles.php:178
 msgid "Update printer profile"
 msgstr ""
 
-#: admin/print_profiles.php:179
+#: ../admin/print_profiles.php:179
 msgid "Delete Profile"
 msgstr ""
 
-#: admin/print_profiles.php:180
+#: ../admin/print_profiles.php:180
 msgid "Delete printer profile (only if not used by any user)"
 msgstr ""
 
-#: admin/security_roles.php:18
+#: ../admin/security_roles.php:18
 msgid "Access setup"
 msgstr ""
 
-#: admin/security_roles.php:63
+#: ../admin/security_roles.php:63
 msgid "Role description cannot be empty."
 msgstr ""
 
-#: admin/security_roles.php:69
+#: ../admin/security_roles.php:69
 msgid "Role name cannot be empty."
 msgstr ""
 
-#: 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 ""
 
-#: admin/security_roles.php:105
+#: ../admin/security_roles.php:105
 msgid "New security role has been added."
 msgstr ""
 
-#: admin/security_roles.php:113
+#: ../admin/security_roles.php:113
 msgid "Security role has been updated."
 msgstr ""
 
-#: admin/security_roles.php:126
+#: ../admin/security_roles.php:126
 msgid "This role is currently assigned to some users and cannot be deleted"
 msgstr ""
 
-#: admin/security_roles.php:129
+#: ../admin/security_roles.php:129
 msgid "Security role has been sucessfully deleted."
 msgstr ""
 
-#: admin/security_roles.php:178
+#: ../admin/security_roles.php:178
 msgid "Role:"
 msgstr ""
 
-#: admin/security_roles.php:180 gl/manage/gl_accounts.php:198
-#: gl/manage/gl_accounts.php.orig:198 inventory/manage/items.php:433
-#: purchasing/manage/suppliers.php:289 sales/manage/customers.php:324
-#: sales/manage/customers.php.orig:321 sales/manage/customers.php:326
-#: gl/manage/gl_accounts.php:199
+#: ../admin/security_roles.php:180
+#: ../gl/manage/gl_accounts.php:198
+#: ../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:326
+#: ../sales/manage/sav.customers.php:324
 msgid "Show inactive:"
 msgstr ""
 
-#: admin/security_roles.php:195
+#: ../admin/security_roles.php:195
 msgid "Role name:"
 msgstr ""
 
-#: admin/security_roles.php:196
+#: ../admin/security_roles.php:196
 msgid "Role description:"
 msgstr ""
 
-#: admin/security_roles.php:197
+#: ../admin/security_roles.php:197
 msgid "Current status:"
 msgstr ""
 
-#: admin/security_roles.php:221
+#: ../admin/security_roles.php:221
 msgid "On/off set of features"
 msgstr ""
 
-#: admin/security_roles.php:240 admin/security_roles.php:246
+#: ../admin/security_roles.php:240
+#: ../admin/security_roles.php:246
 msgid "Update view"
 msgstr ""
 
-#: admin/security_roles.php:241
+#: ../admin/security_roles.php:241
 msgid "Insert New Role"
 msgstr ""
 
-#: admin/security_roles.php:245
+#: ../admin/security_roles.php:245
 msgid "Save Role"
 msgstr ""
 
-#: admin/security_roles.php:247
+#: ../admin/security_roles.php:247
 msgid "Clone This Role"
 msgstr ""
 
-#: admin/security_roles.php:248
+#: ../admin/security_roles.php:248
 msgid "Delete This Role"
 msgstr ""
 
-#: 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:259 gl/includes/ui/gl_journal_ui.inc:223
-#: includes/ui/radio.ui_input.inc:209 includes/ui/simple_crud_class.inc:58
-#: includes/ui/simple_crud_class.inc:231 includes/ui/ui_controls.inc:587
-#: includes/ui/ui_input.inc:209 inventory/includes/item_adjustments_ui.inc:159
-#: inventory/includes/stock_transfers_ui.inc:139
-#: inventory/manage/items.php:416
-#: manufacturing/includes/work_order_issue_ui.inc:133
-#: purchasing/includes/ui/po_ui.inc:444
-#: sales/includes/ui/sales_credit_ui.inc:295
-#: sales/includes/ui/sales_order_ui.inc:557
-#: sales/includes/ui/sales_order_ui.inc:561 includes/ui/ui_input.inc:210
+#: ../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:211
+#: ../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.orig:459
+#: ../sales/includes/ui/sales_credit_ui.inc:295
+#: ../sales/includes/ui/sales_order_ui.inc.orig:557
 msgid "Cancel"
 msgstr ""
 
-#: admin/security_roles.php:249 inventory/manage/items.php:416
+#: ../admin/security_roles.php:249
+#: ../inventory/manage/items.php:423
+#: ../inventory/manage/items.php.orig:416
 msgid "Cancel Edition"
 msgstr ""
 
-#: admin/shipping_companies.php:15 sales/customer_credit_invoice.php:256
-#: sales/customer_delivery.php:368 sales/customer_invoice.php:420
-#: sales/view/view_credit.php:74 sales/view/view_dispatch.php:92
-#: sales/view/view_invoice.php:91 sales/customer_credit_invoice.php:254
-#: sales/customer_invoice.php:422
+#: ../admin/shipping_companies.php:15
+#: ../sales/customer_credit_invoice.php:254
+#: ../sales/customer_delivery.php.orig:381
+#: ../sales/customer_invoice.php:488
+#: ../sales/view/view_credit.php:74
+#: ../sales/view/view_dispatch.php:92
+#: ../sales/view/view_invoice.php:92
 msgid "Shipping Company"
 msgstr ""
 
-#: admin/shipping_companies.php:26
+#: ../admin/shipping_companies.php:26
 msgid "The shipping company name cannot be empty."
 msgstr ""
 
-#: admin/shipping_companies.php:37
+#: ../admin/shipping_companies.php:37
 msgid "New shipping company has been added"
 msgstr ""
 
-#: admin/shipping_companies.php:46
+#: ../admin/shipping_companies.php:46
 msgid "Selected shipping company has been updated"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: admin/shipping_companies.php:72
+#: ../admin/shipping_companies.php:72
 msgid "Selected shipping company has been deleted"
 msgstr ""
 
-#: admin/shipping_companies.php:91
+#: ../admin/shipping_companies.php:91
 msgid "Contact Person"
 msgstr ""
 
-#: admin/shipping_companies.php:91
+#: ../admin/shipping_companies.php:91
 msgid "Phone Number"
 msgstr ""
 
-#: admin/shipping_companies.php:91 inventory/manage/locations.php:146
+#: ../admin/shipping_companies.php:91
+#: ../inventory/manage/locations.php:146
 msgid "Secondary Phone"
 msgstr ""
 
-#: admin/shipping_companies.php:91 inventory/manage/locations.php:146
+#: ../admin/shipping_companies.php:91
+#: ../inventory/manage/locations.php:146
 msgid "Address"
 msgstr ""
 
-#: 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:55
-#: inventory/manage/items.php:299 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 ""
 
-#: admin/shipping_companies.php:136 purchasing/manage/suppliers.php:158
-#: sales/manage/customer_branches.php:259
+#: ../admin/shipping_companies.php:136
+#: ../purchasing/manage/suppliers.php.orig:113
+#: ../sales/manage/customer_branches.php:261
 msgid "Contact Person:"
 msgstr ""
 
-#: admin/shipping_companies.php:140 includes/ui/contacts_view.inc:103
-#: inventory/manage/locations.php:205 purchasing/manage/suppliers.php:130
-#: sales/manage/customer_branches.php:261 sales/manage/customers.php:253
-#: sales/manage/customers.php.orig:250
+#: ../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 ""
 
-#: admin/system_diagnostics.php:17
+#: ../admin/system_diagnostics.php:17
 msgid "System Diagnostics"
 msgstr ""
 
-#: admin/tags.php:33
+#: ../admin/tags.php:33
 msgid "Unspecified tag type"
 msgstr ""
 
-#: 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
+#: ../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 ""
 
-#: admin/tags.php:44
+#: ../admin/tags.php:44
 msgid "Dimension Tags"
 msgstr ""
 
-#: admin/tags.php:57
+#: ../admin/tags.php:57
 msgid "The tag name cannot be empty."
 msgstr ""
 
-#: admin/tags.php:73
+#: ../admin/tags.php:73
 msgid "Selected tag settings have been updated"
 msgstr ""
 
-#: admin/tags.php:78
+#: ../admin/tags.php:78
 msgid "New tag has been added"
 msgstr ""
 
-#: admin/tags.php:94
+#: ../admin/tags.php:94
 msgid ""
 "Cannot delete this tag because records have been created referring to it."
 msgstr ""
 
-#: admin/tags.php:109
+#: ../admin/tags.php:109
 msgid "Selected tag has been deleted"
 msgstr ""
 
-#: admin/tags.php:128
+#: ../admin/tags.php:128
 msgid "Tag Name"
 msgstr ""
 
-#: admin/tags.php:128
+#: ../admin/tags.php:128
 msgid "Tag Description"
 msgstr ""
 
-#: admin/tags.php:165
+#: ../admin/tags.php:165
 msgid "Tag Name:"
 msgstr ""
 
-#: admin/tags.php:166
+#: ../admin/tags.php:166
 msgid "Tag Description:"
 msgstr ""
 
-#: admin/users.php:16
+#: ../admin/users.php:16
 msgid "Users"
 msgstr ""
 
-#: admin/users.php:31
+#: ../admin/users.php:31
 msgid "The user login entered must be at least 4 characters long."
 msgstr ""
 
-#: admin/users.php:72
+#: ../admin/users.php:72
 msgid "The selected user has been updated."
 msgstr ""
 
-#: admin/users.php:86
+#: ../admin/users.php:86
 msgid "A new user has been added."
 msgstr ""
 
-#: admin/users.php:97
+#: ../admin/users.php:97
 msgid "User has been deleted."
 msgstr ""
 
-#: admin/users.php:114
+#: ../admin/users.php:114
 msgid "User login"
 msgstr ""
 
-#: admin/users.php:114 admin/users.php:198 includes/ui/contacts_view.inc:41
+#: ../admin/users.php:114
+#: ../admin/users.php:198
+#: ../includes/ui/contacts_view.inc:41
 msgid "Full Name"
 msgstr ""
 
-#: admin/users.php:114 includes/ui/contacts_view.inc:41
-#: inventory/manage/locations.php:146 reporting/rep106.php:86
-#: reporting/includes/header2.inc:98 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 ""
 
-#: admin/users.php:115 sales/manage/customer_branches.php:300
-#: sales/view/view_sales_order.php:83
+#: ../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 ""
 
-#: admin/users.php:115
+#: ../admin/users.php:115
 msgid "Last Visit"
 msgstr ""
 
-#: admin/users.php:115
+#: ../admin/users.php:115
 msgid "Access Level"
 msgstr ""
 
-#: admin/users.php:184
+#: ../admin/users.php:184
 msgid "User Login:"
 msgstr ""
 
-#: admin/users.php:195
+#: ../admin/users.php:195
 msgid "Enter a new password to change, leave empty to keep current."
 msgstr ""
 
-#: admin/users.php:200
+#: ../admin/users.php:200
 msgid "Telephone No.:"
 msgstr ""
 
-#: admin/users.php:204
+#: ../admin/users.php:204
 msgid "Access Level:"
 msgstr ""
 
-#: admin/users.php:208
+#: ../admin/users.php:208
 msgid "User's POS"
 msgstr ""
 
-#: admin/users.php:213
+#: ../admin/users.php:213
 msgid "Use popup window for reports:"
 msgstr ""
 
-#: admin/view_print_transaction.php:27
+#: ../admin/view_print_transaction.php:27
 msgid "View or Print Transactions"
 msgstr ""
 
-#: admin/view_print_transaction.php:43 admin/view_print_transaction.php:45
-#: admin/view_print_transaction.php:129 includes/ui/ui_controls.inc:188
-#: purchasing/inquiry/po_search_completed.php:113
-#: purchasing/inquiry/po_search.php:93 sales/inquiry/customer_inquiry.php:209
-#: sales/inquiry/customer_inquiry.php.orig:209
-#: sales/inquiry/sales_deliveries_view.php:160
-#: sales/inquiry/sales_orders_view.php:119
-#: sales/inquiry/sales_orders_view.php.orig:117
+#: ../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/sales_deliveries_view.php:160
+#: ../sales/inquiry/sales_orders_view.php:125
 msgid "Print"
 msgstr ""
 
-#: admin/view_print_transaction.php:67
+#: ../admin/view_print_transaction.php:67
 msgid "Only documents can be printed."
 msgstr ""
 
-#: admin/view_print_transaction.php:79 admin/void_transaction.php:166
+#: ../admin/view_print_transaction.php:79
+#: ../admin/void_transaction.php:166
 msgid "from #:"
 msgstr ""
 
-#: admin/view_print_transaction.php:81 admin/void_transaction.php:168
+#: ../admin/view_print_transaction.php:81
+#: ../admin/void_transaction.php:168
 msgid "to #:"
 msgstr ""
 
-#: admin/view_print_transaction.php:83 admin/void_transaction.php:170
-#: dimensions/inquiry/search_dimensions.php:88
-#: gl/inquiry/journal_inquiry.php:53 manufacturing/search_work_orders.php:78
-#: purchasing/includes/ui/invoice_ui.inc:453
-#: purchasing/inquiry/po_search_completed.php:77
-#: purchasing/inquiry/po_search.php:76
-#: purchasing/inquiry/supplier_allocation_inquiry.php:57
-#: purchasing/inquiry/supplier_inquiry.php:58
-#: purchasing/inquiry/supplier_inquiry.php.orig:54
-#: sales/inquiry/customer_allocation_inquiry.php:51
-#: sales/inquiry/customer_inquiry.php:58
-#: sales/inquiry/customer_inquiry.php.orig:58
-#: sales/inquiry/sales_deliveries_view.php:116
-#: sales/inquiry/sales_orders_view.php:247
-#: sales/inquiry/sales_orders_view.php.orig:245
+#: ../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_inquiry.php:54
+#: ../sales/inquiry/sales_deliveries_view.php:116
+#: ../sales/inquiry/sales_orders_view.php:269
 msgid "Search"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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:235
-#: 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:81
-#: inventory/view/view_adjustment.php:44 inventory/view/view_transfer.php:44
-#: manufacturing/search_work_orders.php:160
-#: manufacturing/view/wo_issue_view.php:43
-#: manufacturing/view/wo_production_view.php:44
-#: manufacturing/includes/manufacturing_ui.inc:157
-#: manufacturing/includes/manufacturing_ui.inc:200
-#: manufacturing/includes/manufacturing_ui.inc:276
-#: manufacturing/includes/manufacturing_ui.inc:280
-#: manufacturing/includes/manufacturing_ui.inc:331
-#: purchasing/includes/ui/grn_ui.inc:36 purchasing/includes/ui/grn_ui.inc:53
-#: purchasing/includes/ui/po_ui.inc:314 purchasing/view/view_po.php:115
-#: purchasing/view/view_supp_credit.php:43
-#: purchasing/view/view_supp_invoice.php:46
-#: purchasing/view/view_supp_payment.php:73
-#: purchasing/inquiry/po_search_completed.php:122
-#: purchasing/inquiry/po_search.php:131
-#: purchasing/inquiry/supplier_allocation_inquiry.php:128
-#: purchasing/inquiry/supplier_inquiry.php:170
-#: purchasing/inquiry/supplier_inquiry.php.orig:164
-#: purchasing/allocations/supplier_allocation_main.php:96
-#: reporting/rep501.php:85 reporting/rep601.php:76 reporting/rep702.php:51
-#: reporting/includes/doctext.inc:199 sales/customer_credit_invoice.php:247
-#: sales/customer_credit_invoice.php:249 sales/customer_delivery.php:348
-#: sales/customer_delivery.php:350 sales/customer_invoice.php:392
-#: sales/customer_invoice.php:394
-#: sales/allocations/customer_allocation_main.php:95
-#: sales/view/view_dispatch.php:85 sales/view/view_invoice.php:84
-#: sales/view/view_receipt.php:50 sales/view/view_sales_order.php:81
-#: sales/inquiry/customer_allocation_inquiry.php:146
-#: sales/inquiry/customer_inquiry.php:227
-#: sales/inquiry/customer_inquiry.php.orig:227
-#: sales/inquiry/sales_deliveries_view.php:184
-#: sales/includes/ui/sales_credit_ui.inc:85
-#: sales/includes/ui/sales_credit_ui.inc:87
-#: sales/includes/ui/sales_order_ui.inc:373
-#: sales/customer_credit_invoice.php:245 sales/customer_invoice.php:396
-#: sales/includes/ui/sales_order_ui.inc:377
+#: ../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/includes/ui/po_ui.inc.orig: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:245
+#: ../sales/customer_credit_invoice.php:247
+#: ../sales/customer_delivery.php.orig:361
+#: ../sales/customer_delivery.php.orig:363
+#: ../sales/customer_invoice.php:460
+#: ../sales/customer_invoice.php:462
+#: ../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_inquiry.php:203
+#: ../sales/inquiry/sales_deliveries_view.php:184
+#: ../sales/includes/ui/sales_credit_ui.inc:85
+#: ../sales/includes/ui/sales_credit_ui.inc:87
+#: ../sales/includes/ui/sales_order_ui.inc.orig:373
 msgid "Reference"
 msgstr ""
 
-#: 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:90
-#: gl/accruals.php:195 gl/bank_account_reconcile.php:236
-#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126
-#: gl/inquiry/journal_inquiry.php:128 gl/view/accrual_trans.php:52
-#: gl/view/bank_transfer_view.php:83 gl/view/gl_deposit_view.php:68
-#: gl/view/gl_payment_view.php:66 gl/view/gl_trans_view.php:36
-#: includes/ui/allocation_cart.inc:263 includes/ui/ui_view.inc:488
-#: inventory/inquiry/stock_movements.php:81
-#: inventory/view/view_adjustment.php:45 inventory/view/view_transfer.php:47
-#: manufacturing/search_work_orders.php:166
-#: manufacturing/work_order_entry.php:419
-#: manufacturing/work_order_entry.php:425
-#: manufacturing/view/wo_production_view.php:45
-#: manufacturing/includes/manufacturing_ui.inc:157
-#: manufacturing/includes/manufacturing_ui.inc:200
-#: manufacturing/includes/manufacturing_ui.inc:236
-#: manufacturing/includes/manufacturing_ui.inc:277
-#: manufacturing/includes/manufacturing_ui.inc:281
-#: manufacturing/includes/manufacturing_ui.inc:332
-#: purchasing/includes/ui/invoice_ui.inc:103
-#: purchasing/includes/ui/po_ui.inc:328 purchasing/view/view_po.php:140
-#: purchasing/inquiry/supplier_allocation_inquiry.php:131
-#: purchasing/inquiry/supplier_inquiry.php:173
-#: purchasing/inquiry/supplier_inquiry.php.orig:167
-#: purchasing/allocations/supplier_allocation_main.php:97
-#: reporting/rep101.php:130 reporting/rep201.php:118 reporting/rep501.php:85
-#: reporting/rep601.php:76 reporting/rep704.php:79 reporting/rep704.php:82
-#: reporting/rep704.php:85 reporting/rep709.php:109 reporting/rep710.php:75
-#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186
-#: reporting/includes/doctext.inc:224 reporting/includes/header2.inc:135
-#: sales/customer_delivery.php:378 sales/customer_invoice.php:430
-#: sales/allocations/customer_allocation_main.php:96
-#: sales/view/view_credit.php:69 sales/view/view_sales_order.php:96
-#: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161
-#: sales/inquiry/customer_allocation_inquiry.php:148
-#: sales/inquiry/customer_inquiry.php:228
-#: sales/inquiry/customer_inquiry.php.orig:228 sales/customer_invoice.php:432
+#: ../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
+#: ../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/includes/ui/po_ui.inc.orig: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.orig:391
+#: ../sales/customer_invoice.php:503
+#: ../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_inquiry.php:204
 msgid "Date"
 msgstr ""
 
-#: admin/view_print_transaction.php:130 admin/void_transaction.php:184
-#: includes/ui/ui_view.inc:51
+#: ../admin/view_print_transaction.php:130
+#: ../admin/void_transaction.php:184
+#: ../includes/ui/ui_view.inc:51
 msgid "GL"
 msgstr ""
 
-#: admin/void_transaction.php:29
+#: ../admin/void_transaction.php:29
 msgid "Void a Transaction"
 msgstr ""
 
-#: admin/void_transaction.php:126 admin/void_transaction.php:185
-#: includes/ui/radio.ui_input.inc:136 includes/ui/radio.ui_input.inc:280
-#: includes/ui/sav.ui_lists.inc:20 includes/ui/ui_input.inc:136
-#: includes/ui/ui_input.inc:280 includes/ui/ui_lists.inc:20
-#: includes/ui/ui_input.inc:137 includes/ui/ui_input.inc:281
+#: ../admin/void_transaction.php:126
+#: ../admin/void_transaction.php:185
+#: ../includes/ui/ui_input.inc:138
+#: ../includes/ui/ui_input.inc:282
+#: ../includes/ui/ui_lists.inc:20
 msgid "Select"
 msgstr ""
 
-#: admin/void_transaction.php:204
+#: ../admin/void_transaction.php:157
+msgid "Transaction Type:"
+msgstr ""
+
+#: ../admin/void_transaction.php:204
 msgid "Transaction #:"
 msgstr ""
 
-#: admin/void_transaction.php:206
+#: ../admin/void_transaction.php:206
 msgid "Voiding Date:"
 msgstr ""
 
-#: 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
-#: manufacturing/work_order_add_finished.php:210
-#: manufacturing/work_order_entry.php:451
-#: manufacturing/work_order_release.php:100
-#: purchasing/includes/ui/invoice_ui.inc:161 purchasing/po_entry_items.php:518
-#: purchasing/supplier_payment.php:313 sales/customer_payments.php:411
-#: gl/bank_transfer.php:98 purchasing/po_entry_items.php:522
-#: purchasing/supplier_payment.php:316 sales/customer_payments.php:414
-#: sales/customer_payments.php.orig:413
+#: ../admin/void_transaction.php:208
+#: ../dimensions/dimension_entry.php:283
+#: ../gl/bank_transfer.php:98
+#: ../gl/inquiry/journal_inquiry.php:56
+#: ../gl/manage/revaluate_currencies.php:106
+#: ../includes/ui/ui_view.inc:308
+#: ../manufacturing/work_order_add_finished.php:210
+#: ../manufacturing/work_order_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.orig:492
+#: ../purchasing/po_entry_items.php.orig:558
+#: ../purchasing/supplier_payment.php:316
+#: ../sales/customer_invoice.php:680
+#: ../sales/customer_payments.php:413
 msgid "Memo:"
 msgstr ""
 
-#: admin/void_transaction.php:213 admin/void_transaction.php:222
+#: ../admin/void_transaction.php:213
+#: ../admin/void_transaction.php:222
 msgid "Void Transaction"
 msgstr ""
 
-#: admin/void_transaction.php:218 admin/void_transaction.php:297
+#: ../admin/void_transaction.php:218
+#: ../admin/void_transaction.php:297
 msgid "The entered transaction does not exist or cannot be voided."
 msgstr ""
 
-#: admin/void_transaction.php:226
+#: ../admin/void_transaction.php:226
 msgid ""
 "Are you sure you want to void this transaction ? This action cannot be "
 "undone."
 msgstr ""
 
-#: admin/void_transaction.php:228 includes/ui/ui_controls.inc:586
+#: ../admin/void_transaction.php:228
+#: ../includes/ui/ui_controls.inc:593
 msgid "Proceed"
 msgstr ""
 
-#: admin/void_transaction.php:242
+#: ../admin/void_transaction.php:242
 msgid "The selected transaction was closed for edition and cannot be voided."
 msgstr ""
 
-#: admin/void_transaction.php:248 gl/accruals.php:32 gl/bank_transfer.php:110
-#: gl/gl_journal.php:156 gl/manage/exchange_rates.php:33
-#: gl/manage/revaluate_currencies.php:53
-#: manufacturing/work_order_add_finished.php:98
-#: manufacturing/work_order_costs.php:83 purchasing/po_receive_items.php:174
-#: purchasing/supplier_payment.php:179 sales/customer_credit_invoice.php:91
-#: sales/sales_order_entry.php:340 sales/manage/recurrent_invoices.php:41
-#: sales/manage/recurrent_invoices.php:46
-#: sales/manage/recurrent_invoices.php:51 gl/bank_transfer.php:115
-#: purchasing/supplier_payment.php:174 sales/sales_order_entry.php:349
-#: sales/sales_order_entry.php.orig:348
+#: ../admin/void_transaction.php:248
+#: ../gl/accruals.php:32
+#: ../gl/bank_transfer.php:115
+#: ../gl/gl_journal.php:161
+#: ../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:174
+#: ../sales/customer_credit_invoice.php:91
+#: ../sales/sales_order_entry.php:359
+#: ../sales/manage/recurrent_invoices.php:41
+#: ../sales/manage/recurrent_invoices.php:46
+#: ../sales/manage/recurrent_invoices.php:51
 msgid "The entered date is invalid."
 msgstr ""
 
-#: admin/void_transaction.php:254 gl/accruals.php:38 gl/bank_transfer.php:116
-#: gl/gl_bank.php:267 gl/gl_journal.php:162
-#: gl/manage/revaluate_currencies.php:59 inventory/adjustments.php:116
-#: inventory/transfers.php:111 manufacturing/work_order_add_finished.php:104
-#: manufacturing/work_order_costs.php:89
-#: manufacturing/work_order_entry.php:160
-#: manufacturing/work_order_issue.php:85 purchasing/supplier_credit.php:176
-#: purchasing/supplier_invoice.php:174 purchasing/supplier_payment.php:185
-#: sales/create_recurrent_invoices.php:108 sales/credit_note_entry.php:161
-#: sales/customer_credit_invoice.php:95 sales/customer_payments.php:145
-#: sales/create_recurrent_invoices.php:119 sales/credit_note_entry.php:157
-#: gl/bank_transfer.php:121 purchasing/supplier_payment.php:180
-#: sales/customer_payments.php.orig:145
+#: ../admin/void_transaction.php:254
 msgid "The entered date is not in fiscal year."
 msgstr ""
 
-#: admin/void_transaction.php:261
+#: ../admin/void_transaction.php:261
 msgid "The transaction number is expected to be numeric and greater than zero."
 msgstr ""
 
-#: admin/void_transaction.php:278
+#: ../admin/void_transaction.php:278
 msgid "The selected transaction has already been voided."
 msgstr ""
 
-#: admin/void_transaction.php:291
+#: ../admin/void_transaction.php:291
 msgid "Selected transaction has been voided."
 msgstr ""
 
-#: admin/db/current_user.inc:96 includes/current_user.inc:87
-#: includes/ldap.current_user.inc:96 includes/current_user.inc:89
-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 ""
-
-#: admin/db/current_user.inc:97 includes/current_user.inc:88
-#: includes/ldap.current_user.inc:97 includes/ui/ui_controls.inc:190
-#: includes/ui/ui_view.inc:843 includes/ui/ui_view.inc:844
-#: includes/current_user.inc:90
-msgid "Back"
-msgstr ""
-
-#: admin/db/current_user.inc:107 includes/current_user.inc:98
-#: includes/ldap.current_user.inc:107 includes/current_user.inc:100
-msgid "System is available for site admin only until full database upgrade"
-msgstr ""
-
-#: admin/db/current_user.inc:445 includes/current_user.inc:450
-#: includes/ldap.current_user.inc:544 includes/current_user.inc:452
-msgid "Requesting data..."
-msgstr ""
-
-#: admin/db/fiscalyears_db.inc:136
+#: ../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 ""
 
-#: 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
+#: ../admin/db/fiscalyears_db.inc:166
+#: ../admin/db/fiscalyears_db.inc:168
 msgid "Closing Year"
 msgstr ""
 
-#: admin/db/fiscalyears_db.inc:214 reporting/rep101.php:175
-#: reporting/rep201.php:167 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 ""
 
-#: admin/db/maintenance_db.inc:152 admin/db/maintenance_db.inc.orig:150
+#: ../admin/db/maintenance_db.inc:152
 #, php-format
 msgid "Cannot open the extension setup file '%s' for writing."
 msgstr ""
 
-#: admin/db/maintenance_db.inc:160 admin/db/maintenance_db.inc.orig:158
+#: ../admin/db/maintenance_db.inc:160
 #, php-format
 msgid "Cannot write to the extensions setup file '%s'."
 msgstr ""
 
-#: admin/db/maintenance_db.inc:178 admin/db/maintenance_db.inc.orig:176
+#: ../admin/db/maintenance_db.inc:178
 msgid "Cannot update system extensions list."
 msgstr ""
 
-#: admin/db/maintenance_db.inc:196 admin/db/maintenance_db.inc.orig:194
+#: ../admin/db/maintenance_db.inc:196
 #, php-format
 msgid "Cannot update extensions list for company '%s'."
 msgstr ""
 
-#: admin/db/maintenance_db.inc:233 admin/db/maintenance_db.inc.orig:231
+#: ../admin/db/maintenance_db.inc:233
 msgid "Cannot open the languages file - "
 msgstr ""
 
-#: admin/db/maintenance_db.inc:240 admin/db/maintenance_db.inc.orig:238
+#: ../admin/db/maintenance_db.inc:240
 msgid "Cannot write to the language file - "
 msgstr ""
 
-#: admin/db/maintenance_db.inc:250 admin/db/maintenance_db.inc.orig:248
+#: ../admin/db/maintenance_db.inc:250
 msgid "The language files folder "
 msgstr ""
 
-#: admin/db/maintenance_db.inc:389 admin/db/maintenance_db.inc.orig:387
-#: admin/db/connect_db2.inc:156
-#, php-format
-msgid "SQL script execution failed in line %d: %s"
-msgstr ""
-
-#: admin/db/session.inc:133 includes/session.inc:133
-#: includes/session.inc.ldap.inc:39
-msgid "Incorrect Password"
-msgstr ""
-
-#: admin/db/session.inc:134 includes/session.inc:134
-#: includes/session.inc.ldap.inc:40
-msgid "The user and password combination is not valid for the system."
-msgstr ""
-
-#: admin/db/session.inc:136 includes/session.inc:136
-#: includes/session.inc.ldap.inc:42
-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 ""
-
-#: admin/db/session.inc:137 includes/session.inc:137
-#: includes/session.inc.ldap.inc:43
-msgid "Try again"
-msgstr ""
-
-#: admin/db/session.inc:156 includes/session.inc:156
-#: includes/session.inc.ldap.inc:62 includes/session.inc:216
-msgid "Security settings have not been defined for your user account."
-msgstr ""
-
-#: admin/db/session.inc:157 includes/session.inc:157
-#: includes/session.inc.ldap.inc:63 includes/session.inc:217
-msgid "Please contact your system administrator."
-msgstr ""
-
-#: admin/db/session.inc:158 includes/session.inc:158
-#: includes/session.inc.ldap.inc:64 includes/session.inc:218
+#: ../admin/db/maintenance_db.inc:389
 msgid ""
-"Please remove $security_groups and $security_headings arrays from config.php "
-"file!"
+"This is new format backup file which cannot be restored on database not "
+"migrated to utf8."
 msgstr ""
 
-#: admin/db/session.inc:160 includes/session.inc:160
-#: includes/session.inc.ldap.inc:66 includes/session.inc:220
-msgid ""
-"Access to application has been blocked until database upgrade is completed "
-"by system administrator."
-msgstr ""
-
-#: admin/db/session.inc:174 includes/session.inc:174
-#: includes/session.inc.ldap.inc:80 includes/session.inc:234
-msgid ""
-"The security settings on your account do not permit you to access this "
-"function"
-msgstr ""
-
-#: admin/db/session.inc:183 includes/session.inc:183
-#: includes/session.inc.ldap.inc:89 includes/session.inc:243
-msgid ""
-"System is blocked after source upgrade until database is updated on System/"
-"Software Upgrade page"
+#: ../admin/db/maintenance_db.inc:471
+#, php-format
+msgid "SQL script execution failed in line %d: %s"
 msgstr ""
 
-#: admin/db/users_db.inc:210 admin/db/users_db.inc.orig:210
+#: ../admin/db/users_db.inc:210
 msgid "user online"
 msgstr ""
 
-#: admin/db/users_db.inc:210 admin/db/users_db.inc.orig:210
+#: ../admin/db/users_db.inc:210
 msgid "users online"
 msgstr ""
 
-#: admin/db/voiding_db.inc:114
-#: manufacturing/includes/db/work_orders_db.inc:446
-#: manufacturing/includes/db/work_orders_db.inc:462
-#: sales/includes/db/sales_invoice_db.inc:205
-#: sales/includes/db/sales_invoice_db.inc.orig:208
-#: sales/includes/db/sales_invoice_db.inc:206
+#: ../admin/db/voiding_db.inc:114
+#: ../sales/includes/db/sales_invoice_db.inc.orig:249
 msgid "Voided."
 msgstr ""
 
-#: applications/customers.php:16
+#: ../applications/customers.php:16
 msgid "&Sales"
 msgstr ""
 
-#: applications/customers.php:18 applications/dimensions.php:21
-#: applications/generalledger.php:18 applications/inventory.php:18
-#: applications/manufacturing.php:18 applications/suppliers.php:18
+#: ../applications/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 ""
 
-#: applications/customers.php:19
+#: ../applications/customers.php:19
 msgid "Sales &Quotation Entry"
 msgstr ""
 
-#: applications/customers.php:21
+#: ../applications/customers.php:21
 msgid "Sales &Order Entry"
 msgstr ""
 
-#: applications/customers.php:23
+#: ../applications/customers.php:23
 msgid "Direct &Delivery"
 msgstr ""
 
-#: applications/customers.php:25 applications/suppliers.php:25
+#: ../applications/customers.php:25
+#: ../applications/suppliers.php:25
 msgid "Direct &Invoice"
 msgstr ""
 
-#: applications/customers.php:28
+#: ../applications/customers.php:28
 msgid "&Delivery Against Sales Orders"
 msgstr ""
 
-#: applications/customers.php:30
+#: ../applications/customers.php:30
 msgid "&Invoice Against Sales Delivery"
 msgstr ""
 
-#: applications/customers.php:33
+#: ../applications/customers.php:33
 msgid "&Template Delivery"
 msgstr ""
 
-#: applications/customers.php:35
+#: ../applications/customers.php:35
 msgid "&Template Invoice"
 msgstr ""
 
-#: applications/customers.php:37
+#: ../applications/customers.php:37
 msgid "&Create and Print Recurrent Invoices"
 msgstr ""
 
-#: applications/customers.php:40
+#: ../applications/customers.php:40
 msgid "Customer &Payments"
 msgstr ""
 
-#: applications/customers.php:42
+#: ../applications/customers.php:42
+msgid "Invoice &Prepaid Orders"
+msgstr ""
+
+#: ../applications/customers.php:44
 msgid "Customer &Credit Notes"
 msgstr ""
 
-#: applications/customers.php:44
+#: ../applications/customers.php:46
 msgid "&Allocate Customer Payments or Credit Notes"
 msgstr ""
 
-#: applications/customers.php:47 applications/dimensions.php:27
-#: applications/generalledger.php:34 applications/inventory.php:24
-#: applications/manufacturing.php:24 applications/suppliers.php:38
+#: ../applications/customers.php:49
+#: ../applications/dimensions.php:27
+#: ../applications/generalledger.php:34
+#: ../applications/inventory.php:24
+#: ../applications/manufacturing.php:24
+#: ../applications/suppliers.php:38
 msgid "Inquiries and Reports"
 msgstr ""
 
-#: applications/customers.php:48
+#: ../applications/customers.php:50
 msgid "Sales Quotation I&nquiry"
 msgstr ""
 
-#: applications/customers.php:50
+#: ../applications/customers.php:52
 msgid "Sales Order &Inquiry"
 msgstr ""
 
-#: applications/customers.php:52
+#: ../applications/customers.php:54
 msgid "Customer Transaction &Inquiry"
 msgstr ""
 
-#: applications/customers.php:55
+#: ../applications/customers.php:56
 msgid "Customer Allocation &Inquiry"
 msgstr ""
 
-#: applications/customers.php:58
+#: ../applications/customers.php:59
 msgid "Customer and Sales &Reports"
 msgstr ""
 
-#: applications/customers.php:61 applications/dimensions.php:34
-#: applications/generalledger.php:55 applications/inventory.php:32
-#: applications/manufacturing.php:34 applications/setup.php:54
-#: applications/setup.php.orig:54 applications/suppliers.php:50
+#: ../applications/customers.php:62
+#: ../applications/dimensions.php:34
+#: ../applications/generalledger.php:55
+#: ../applications/inventory.php:32
+#: ../applications/manufacturing.php:34
+#: ../applications/setup.php:54
+#: ../applications/suppliers.php:49
 msgid "Maintenance"
 msgstr ""
 
-#: applications/customers.php:62
+#: ../applications/customers.php:63
 msgid "Add and Manage &Customers"
 msgstr ""
 
-#: applications/customers.php:64
+#: ../applications/customers.php:65
 msgid "Customer &Branches"
 msgstr ""
 
-#: applications/customers.php:66
+#: ../applications/customers.php:67
 msgid "Sales &Groups"
 msgstr ""
 
-#: applications/customers.php:68
+#: ../applications/customers.php:69
 msgid "Recurrent &Invoices"
 msgstr ""
 
-#: applications/customers.php:70
+#: ../applications/customers.php:71
 msgid "Sales T&ypes"
 msgstr ""
 
-#: applications/customers.php:72
+#: ../applications/customers.php:73
 msgid "Sales &Persons"
 msgstr ""
 
-#: applications/customers.php:74
+#: ../applications/customers.php:75
 msgid "Sales &Areas"
 msgstr ""
 
-#: applications/customers.php:76
+#: ../applications/customers.php:77
 msgid "Credit &Status Setup"
 msgstr ""
 
-#: applications/dimensions.php:17
+#: ../applications/dimensions.php:17
 msgid "&Dimensions"
 msgstr ""
 
-#: applications/dimensions.php:22
+#: ../applications/dimensions.php:22
 msgid "Dimension &Entry"
 msgstr ""
 
-#: applications/dimensions.php:24
+#: ../applications/dimensions.php:24
 msgid "&Outstanding Dimensions"
 msgstr ""
 
-#: applications/dimensions.php:28
+#: ../applications/dimensions.php:28
 msgid "Dimension &Inquiry"
 msgstr ""
 
-#: applications/dimensions.php:31
+#: ../applications/dimensions.php:31
 msgid "Dimension &Reports"
 msgstr ""
 
-#: applications/dimensions.php:35
+#: ../applications/dimensions.php:35
 msgid "Dimension &Tags"
 msgstr ""
 
-#: applications/generalledger.php:16
+#: ../applications/generalledger.php:16
 msgid "&Banking and General Ledger"
 msgstr ""
 
-#: applications/generalledger.php:19
+#: ../applications/generalledger.php:19
 msgid "&Payments"
 msgstr ""
 
-#: applications/generalledger.php:21
+#: ../applications/generalledger.php:21
 msgid "&Deposits"
 msgstr ""
 
-#: applications/generalledger.php:23
+#: ../applications/generalledger.php:23
 msgid "Bank Account &Transfers"
 msgstr ""
 
-#: applications/generalledger.php:25
+#: ../applications/generalledger.php:25
 msgid "&Journal Entry"
 msgstr ""
 
-#: applications/generalledger.php:27
+#: ../applications/generalledger.php:27
 msgid "&Budget Entry"
 msgstr ""
 
-#: applications/generalledger.php:29
+#: ../applications/generalledger.php:29
 msgid "&Reconcile Bank Account"
 msgstr ""
 
-#: applications/generalledger.php:31
+#: ../applications/generalledger.php:31
 msgid "Revenue / &Costs Accruals"
 msgstr ""
 
-#: applications/generalledger.php:35
+#: ../applications/generalledger.php:35
 msgid "&Journal Inquiry"
 msgstr ""
 
-#: applications/generalledger.php:37
+#: ../applications/generalledger.php:37
 msgid "GL &Inquiry"
 msgstr ""
 
-#: applications/generalledger.php:39
+#: ../applications/generalledger.php:39
 msgid "Bank Account &Inquiry"
 msgstr ""
 
-#: applications/generalledger.php:41
+#: ../applications/generalledger.php:41
 msgid "Ta&x Inquiry"
 msgstr ""
 
-#: applications/generalledger.php:44 reporting/reports_main.php:297
-#: reporting/reports_main.php:342 reporting/reports_main.php:382
+#: ../applications/generalledger.php:44
+#: ../reporting/reports_main.php:297
+#: ../reporting/reports_main.php:342
+#: ../reporting/reports_main.php:382
 msgid "Trial &Balance"
 msgstr ""
 
-#: applications/generalledger.php:46
+#: ../applications/generalledger.php:46
 msgid "Balance &Sheet Drilldown"
 msgstr ""
 
-#: applications/generalledger.php:48
+#: ../applications/generalledger.php:48
 msgid "&Profit and Loss Drilldown"
 msgstr ""
 
-#: applications/generalledger.php:50
+#: ../applications/generalledger.php:50
 msgid "Banking &Reports"
 msgstr ""
 
-#: applications/generalledger.php:52
+#: ../applications/generalledger.php:52
 msgid "General Ledger &Reports"
 msgstr ""
 
-#: applications/generalledger.php:56
+#: ../applications/generalledger.php:56
 msgid "Bank &Accounts"
 msgstr ""
 
-#: applications/generalledger.php:58
+#: ../applications/generalledger.php:58
 msgid "&Quick Entries"
 msgstr ""
 
-#: applications/generalledger.php:60
+#: ../applications/generalledger.php:60
 msgid "Account &Tags"
 msgstr ""
 
-#: applications/generalledger.php:63
+#: ../applications/generalledger.php:63
 msgid "&Currencies"
 msgstr ""
 
-#: applications/generalledger.php:65
+#: ../applications/generalledger.php:65
 msgid "&Exchange Rates"
 msgstr ""
 
-#: applications/generalledger.php:68
+#: ../applications/generalledger.php:68
 msgid "&GL Accounts"
 msgstr ""
 
-#: applications/generalledger.php:70
+#: ../applications/generalledger.php:70
 msgid "GL Account &Groups"
 msgstr ""
 
-#: applications/generalledger.php:72
+#: ../applications/generalledger.php:72
 msgid "GL Account &Classes"
 msgstr ""
 
-#: applications/generalledger.php:75
+#: ../applications/generalledger.php:74
+msgid "&Closing GL Transactions"
+msgstr ""
+
+#: ../applications/generalledger.php:76
 msgid "&Revaluation of Currency Accounts"
 msgstr ""
 
-#: applications/inventory.php:16
+#: ../applications/inventory.php:16
 msgid "&Items and Inventory"
 msgstr ""
 
-#: applications/inventory.php:19
+#: ../applications/inventory.php:19
 msgid "Inventory Location &Transfers"
 msgstr ""
 
-#: applications/inventory.php:21
+#: ../applications/inventory.php:21
 msgid "Inventory &Adjustments"
 msgstr ""
 
-#: applications/inventory.php:25
+#: ../applications/inventory.php:25
 msgid "Inventory Item &Movements"
 msgstr ""
 
-#: applications/inventory.php:27
+#: ../applications/inventory.php:27
 msgid "Inventory Item &Status"
 msgstr ""
 
-#: applications/inventory.php:29
+#: ../applications/inventory.php:29
 msgid "Inventory &Reports"
 msgstr ""
 
-#: applications/inventory.php:33
+#: ../applications/inventory.php:33
 msgid "&Items"
 msgstr ""
 
-#: applications/inventory.php:35
+#: ../applications/inventory.php:35
 msgid "&Foreign Item Codes"
 msgstr ""
 
-#: applications/inventory.php:37
+#: ../applications/inventory.php:37
 msgid "Sales &Kits"
 msgstr ""
 
-#: applications/inventory.php:39
+#: ../applications/inventory.php:39
 msgid "Item &Categories"
 msgstr ""
 
-#: applications/inventory.php:41
+#: ../applications/inventory.php:41
 msgid "Inventory &Locations"
 msgstr ""
 
-#: applications/inventory.php:43
+#: ../applications/inventory.php:43
 msgid "Inventory &Movement Types"
 msgstr ""
 
-#: applications/inventory.php:45
+#: ../applications/inventory.php:45
 msgid "&Units of Measure"
 msgstr ""
 
-#: applications/inventory.php:47
+#: ../applications/inventory.php:47
 msgid "&Reorder Levels"
 msgstr ""
 
-#: applications/inventory.php:50
+#: ../applications/inventory.php:50
 msgid "Pricing and Costs"
 msgstr ""
 
-#: applications/inventory.php:51
+#: ../applications/inventory.php:51
 msgid "Sales &Pricing"
 msgstr ""
 
-#: applications/inventory.php:53
+#: ../applications/inventory.php:53
 msgid "Purchasing &Pricing"
 msgstr ""
 
-#: applications/inventory.php:55
+#: ../applications/inventory.php:55
 msgid "Standard &Costs"
 msgstr ""
 
-#: applications/manufacturing.php:16
+#: ../applications/manufacturing.php:16
 msgid "&Manufacturing"
 msgstr ""
 
-#: applications/manufacturing.php:19 sales/sales_order_entry.php:112
-#: sales/sales_order_entry.php:120 sales/sales_order_entry.php.orig:120
+#: ../applications/manufacturing.php:19
+#: ../sales/sales_order_entry.php:126
 msgid "Work &Order Entry"
 msgstr ""
 
-#: applications/manufacturing.php:21
+#: ../applications/manufacturing.php:21
 msgid "&Outstanding Work Orders"
 msgstr ""
 
-#: applications/manufacturing.php:25
-#: 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 ""
 
-#: applications/manufacturing.php:27
+#: ../applications/manufacturing.php:27
 msgid "Inventory Item Where Used &Inquiry"
 msgstr ""
 
-#: applications/manufacturing.php:29
+#: ../applications/manufacturing.php:29
 msgid "Work Order &Inquiry"
 msgstr ""
 
-#: applications/manufacturing.php:31
+#: ../applications/manufacturing.php:31
 msgid "Manufacturing &Reports"
 msgstr ""
 
-#: applications/manufacturing.php:35
+#: ../applications/manufacturing.php:35
 msgid "&Bills Of Material"
 msgstr ""
 
-#: applications/manufacturing.php:37
+#: ../applications/manufacturing.php:37
 msgid "&Work Centres"
 msgstr ""
 
-#: applications/setup.php:16 applications/setup.php.orig:16
+#: ../applications/setup.php:16
 msgid "S&etup"
 msgstr ""
 
-#: applications/setup.php:19 applications/setup.php.orig:19
+#: ../applications/setup.php:19
 msgid "&Company Setup"
 msgstr ""
 
-#: applications/setup.php:21 applications/setup.php.orig:21
+#: ../applications/setup.php:21
 msgid "&User Accounts Setup"
 msgstr ""
 
-#: applications/setup.php:23 applications/setup.php.orig:23
+#: ../applications/setup.php:23
 msgid "&Access Setup"
 msgstr ""
 
-#: applications/setup.php:25 applications/setup.php.orig:25
+#: ../applications/setup.php:25
 msgid "&Display Setup"
 msgstr ""
 
-#: applications/setup.php:27 applications/setup.php.orig:27
+#: ../applications/setup.php:27
 msgid "&Forms Setup"
 msgstr ""
 
-#: applications/setup.php:29 applications/setup.php.orig:29
+#: ../applications/setup.php:29
 msgid "&Taxes"
 msgstr ""
 
-#: applications/setup.php:31 applications/setup.php.orig:31
+#: ../applications/setup.php:31
 msgid "Tax &Groups"
 msgstr ""
 
-#: applications/setup.php:33 applications/setup.php.orig:33
+#: ../applications/setup.php:33
 msgid "Item Ta&x Types"
 msgstr ""
 
-#: applications/setup.php:35 applications/setup.php.orig:35
+#: ../applications/setup.php:35
 msgid "System and &General GL Setup"
 msgstr ""
 
-#: applications/setup.php:37 applications/setup.php.orig:37
+#: ../applications/setup.php:37
 msgid "&Fiscal Years"
 msgstr ""
 
-#: applications/setup.php:39 applications/setup.php.orig:39
+#: ../applications/setup.php:39
 msgid "&Print Profiles"
 msgstr ""
 
-#: applications/setup.php:43 applications/setup.php.orig:43
+#: ../applications/setup.php:43
 msgid "Pa&yment Terms"
 msgstr ""
 
-#: applications/setup.php:45 applications/setup.php.orig:45
+#: ../applications/setup.php:45
 msgid "Shi&pping Company"
 msgstr ""
 
-#: applications/setup.php:47 applications/setup.php.orig:47
+#: ../applications/setup.php:47
 msgid "&Points of Sale"
 msgstr ""
 
-#: applications/setup.php:49 applications/setup.php.orig:49
+#: ../applications/setup.php:49
 msgid "&Printers"
 msgstr ""
 
-#: applications/setup.php:51 applications/setup.php.orig:51
+#: ../applications/setup.php:51
 msgid "Contact &Categories"
 msgstr ""
 
-#: applications/setup.php:55 applications/setup.php.orig:55
+#: ../applications/setup.php:55
 msgid "&Void a Transaction"
 msgstr ""
 
-#: applications/setup.php:57 applications/setup.php.orig:57
+#: ../applications/setup.php:57
 msgid "View or &Print Transactions"
 msgstr ""
 
-#: applications/setup.php:59 applications/setup.php.orig:59
+#: ../applications/setup.php:59
 msgid "&Attach Documents"
 msgstr ""
 
-#: applications/setup.php:61 applications/setup.php.orig:61
+#: ../applications/setup.php:61
 msgid "System &Diagnostics"
 msgstr ""
 
-#: applications/setup.php:64 applications/setup.php.orig:64
+#: ../applications/setup.php:64
 msgid "&Backup and Restore"
 msgstr ""
 
-#: applications/setup.php:66 applications/setup.php.orig:66
+#: ../applications/setup.php:66
 msgid "Create/Update &Companies"
 msgstr ""
 
-#: applications/setup.php:68 applications/setup.php.orig:68
+#: ../applications/setup.php:68
 msgid "Install/Update &Languages"
 msgstr ""
 
-#: applications/setup.php:70 applications/setup.php.orig:70
+#: ../applications/setup.php:70
 msgid "Install/Activate &Extensions"
 msgstr ""
 
-#: applications/setup.php:72 applications/setup.php.orig:72
+#: ../applications/setup.php:72
 msgid "Install/Activate &Themes"
 msgstr ""
 
-#: applications/setup.php:74 applications/setup.php.orig:74
+#: ../applications/setup.php:74
 msgid "Install/Activate &Chart of Accounts"
 msgstr ""
 
-#: applications/setup.php:76 applications/setup.php.orig:76
+#: ../applications/setup.php:76
 msgid "Software &Upgrade"
 msgstr ""
 
-#: applications/suppliers.php:16
+#: ../applications/suppliers.php:16
 msgid "&Purchases"
 msgstr ""
 
-#: applications/suppliers.php:19
+#: ../applications/suppliers.php:19
 msgid "Purchase &Order Entry"
 msgstr ""
 
-#: applications/suppliers.php:21
+#: ../applications/suppliers.php:21
 msgid "&Outstanding Purchase Orders Maintenance"
 msgstr ""
 
-#: applications/suppliers.php:23
+#: ../applications/suppliers.php:23
 msgid "Direct &GRN"
 msgstr ""
 
-#: applications/suppliers.php:28
+#: ../applications/suppliers.php:28
 msgid "&Payments to Suppliers"
 msgstr ""
 
-#: applications/suppliers.php:31
+#: ../applications/suppliers.php:31
 msgid "Supplier &Invoices"
 msgstr ""
 
-#: applications/suppliers.php:33
+#: ../applications/suppliers.php:33
 msgid "Supplier &Credit Notes"
 msgstr ""
 
-#: applications/suppliers.php:35
+#: ../applications/suppliers.php:35
 msgid "&Allocate Supplier Payments or Credit Notes"
 msgstr ""
 
-#: applications/suppliers.php:39
+#: ../applications/suppliers.php:39
 msgid "Purchase Orders &Inquiry"
 msgstr ""
 
-#: applications/suppliers.php:41
+#: ../applications/suppliers.php:41
 msgid "Supplier Transaction &Inquiry"
 msgstr ""
 
-#: applications/suppliers.php:44
+#: ../applications/suppliers.php:43
 msgid "Supplier Allocation &Inquiry"
 msgstr ""
 
-#: applications/suppliers.php:47
+#: ../applications/suppliers.php:46
 msgid "Supplier and Purchasing &Reports"
 msgstr ""
 
-#: applications/suppliers.php:51
+#: ../applications/suppliers.php:50
 msgid "&Suppliers"
 msgstr ""
 
-#: dimensions/dimension_entry.php:27
+#: ../dimensions/dimension_entry.php:27
 msgid "Dimension Entry"
 msgstr ""
 
-#: dimensions/dimension_entry.php:47
+#: ../dimensions/dimension_entry.php:47
 msgid "The dimension has been entered."
 msgstr ""
 
-#: dimensions/dimension_entry.php:58
+#: ../dimensions/dimension_entry.php:58
 msgid "The dimension has been updated."
 msgstr ""
 
-#: dimensions/dimension_entry.php:68
+#: ../dimensions/dimension_entry.php:68
 msgid "The dimension has been deleted."
 msgstr ""
 
-#: 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 ""
 
-#: dimensions/dimension_entry.php:88
+#: ../dimensions/dimension_entry.php:88
 msgid "The dimension has been re-opened. "
 msgstr ""
 
-#: dimensions/dimension_entry.php:98
+#: ../dimensions/dimension_entry.php:98
 msgid "Enter a &new dimension"
 msgstr ""
 
-#: dimensions/dimension_entry.php:100
+#: ../dimensions/dimension_entry.php:100
 msgid "&Select an existing dimension"
 msgstr ""
 
-#: dimensions/dimension_entry.php:116
+#: ../dimensions/dimension_entry.php:116
 msgid "The dimension reference must be entered."
 msgstr ""
 
-#: dimensions/dimension_entry.php:123 gl/bank_transfer.php:171
-#: gl/gl_bank.php:255 gl/gl_journal.php:176
-#: gl/manage/revaluate_currencies.php:72 inventory/adjustments.php:103
-#: inventory/transfers.php:99 manufacturing/work_order_add_finished.php:84
-#: manufacturing/work_order_entry.php:139
-#: manufacturing/work_order_issue.php:98 purchasing/po_entry_items.php:363
-#: purchasing/po_receive_items.php:195 purchasing/supplier_credit.php:156
-#: purchasing/supplier_invoice.php:154 purchasing/supplier_payment.php:208
-#: sales/credit_note_entry.php:151 sales/customer_credit_invoice.php:108
-#: sales/customer_delivery.php:172 sales/customer_invoice.php:286
-#: sales/customer_payments.php:158 sales/customer_payments.php:165
-#: sales/customer_payments.php:246 sales/sales_order_entry.php:409
-#: sales/create_recurrent_invoices.php:55 sales/credit_note_entry.php:181
-#: sales/customer_credit_invoice.php:205 sales/customer_delivery.php:312
-#: sales/customer_invoice.php:319 sales/sales_order_entry.php:430
-#: gl/bank_transfer.php:176 purchasing/po_entry_items.php:366
-#: purchasing/supplier_payment.php:203 sales/customer_payments.php:248
-#: sales/customer_payments.php.orig:158 sales/customer_payments.php.orig:165
-#: sales/customer_payments.php.orig:248 sales/sales_order_entry.php:441
-#: sales/sales_order_entry.php.orig:440
+#: ../dimensions/dimension_entry.php:123
+#: ../gl/bank_transfer.php:176
+#: ../gl/gl_bank.php:258
+#: ../gl/gl_journal.php:181
+#: ../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:368
+#: ../purchasing/po_entry_items.php.orig:365
+#: ../purchasing/po_receive_items.php:193
+#: ../purchasing/supplier_credit.php:173
+#: ../purchasing/supplier_invoice.php:179
+#: ../purchasing/supplier_payment.php:203
+#: ../sales/create_recurrent_invoices.php:55
+#: ../sales/credit_note_entry.php:181
+#: ../sales/customer_credit_invoice.php:205
+#: ../sales/customer_delivery.php.orig:184
+#: ../sales/customer_invoice.php:379
+#: ../sales/customer_payments.php:158
+#: ../sales/customer_payments.php:165
+#: ../sales/customer_payments.php:248
+#: ../sales/sales_order_entry.php:457
 msgid "The entered reference is already in use."
 msgstr ""
 
-#: dimensions/dimension_entry.php:131
+#: ../dimensions/dimension_entry.php:131
 msgid "The dimension name must be entered."
 msgstr ""
 
-#: dimensions/dimension_entry.php:138 manufacturing/work_order_entry.php:154
-#: manufacturing/work_order_entry.php:234 purchasing/po_entry_items.php:235
-#: purchasing/po_entry_items.php:238
+#: ../dimensions/dimension_entry.php:138
+#: ../manufacturing/work_order_entry.php:154
+#: ../manufacturing/work_order_entry.php:234
+#: ../purchasing/po_entry_items.php:241
+#: ../purchasing/po_entry_items.php.orig:238
 msgid "The date entered is in an invalid format."
 msgstr ""
 
-#: dimensions/dimension_entry.php:145
+#: ../dimensions/dimension_entry.php:145
 msgid "The required by date entered is in an invalid format."
 msgstr ""
 
-#: dimensions/dimension_entry.php:190
+#: ../dimensions/dimension_entry.php:190
 msgid "This dimension cannot be deleted because it has already been processed."
 msgstr ""
 
-#: dimensions/dimension_entry.php:234
+#: ../dimensions/dimension_entry.php:234
 msgid "The dimension sent is not valid."
 msgstr ""
 
-#: dimensions/dimension_entry.php:261 dimensions/dimension_entry.php:268
+#: ../dimensions/dimension_entry.php:261
+#: ../dimensions/dimension_entry.php:268
 msgid "Dimension Reference:"
 msgstr ""
 
-#: dimensions/dimension_entry.php:277 reporting/reports_main.php:34
-#: reporting/reports_main.php:60 reporting/reports_main.php:74
-#: reporting/reports_main.php:82 reporting/reports_main.php:134
-#: reporting/reports_main.php: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
+#: ../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 ""
 
-#: dimensions/dimension_entry.php:279 manufacturing/work_order_entry.php:420
+#: ../dimensions/dimension_entry.php:279
+#: ../manufacturing/work_order_entry.php:420
 msgid "Date Required By"
 msgstr ""
 
-#: dimensions/dimension_entry.php:281
+#: ../dimensions/dimension_entry.php:281
 msgid "Tags:"
 msgstr ""
 
-#: dimensions/dimension_entry.php:288
+#: ../dimensions/dimension_entry.php:288
 msgid "This Dimension is closed."
 msgstr ""
 
-#: dimensions/dimension_entry.php:293
+#: ../dimensions/dimension_entry.php:293
 msgid "Save changes to dimension"
 msgstr ""
 
-#: dimensions/dimension_entry.php:295
+#: ../dimensions/dimension_entry.php:295
 msgid "Re-open This Dimension"
 msgstr ""
 
-#: dimensions/dimension_entry.php:295
+#: ../dimensions/dimension_entry.php:295
 msgid "Mark this dimension as re-opened"
 msgstr ""
 
-#: dimensions/dimension_entry.php:297
+#: ../dimensions/dimension_entry.php:297
 msgid "Close This Dimension"
 msgstr ""
 
-#: dimensions/dimension_entry.php:297
+#: ../dimensions/dimension_entry.php:297
 msgid "Mark this dimension as closed"
 msgstr ""
 
-#: dimensions/dimension_entry.php:298
+#: ../dimensions/dimension_entry.php:298
 msgid "Delete This Dimension"
 msgstr ""
 
-#: dimensions/dimension_entry.php:298
+#: ../dimensions/dimension_entry.php:298
 msgid "Delete unused dimension"
 msgstr ""
 
-#: dimensions/dimension_entry.php:302 includes/ui/simple_crud_class.inc:225
-#: purchasing/includes/ui/invoice_ui.inc:186
-#: purchasing/includes/ui/invoice_ui.inc:392
-#: purchasing/includes/ui/invoice_ui.inc:394
+#: ../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 ""
 
-#: 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 ""
 
-#: dimensions/includes/dimensions_ui.inc:28
+#: ../dimensions/includes/dimensions_ui.inc:28
 msgid "Balance for this Dimension"
 msgstr ""
 
-#: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:90
-#: gl/inquiry/gl_account_inquiry.php:129 gl/inquiry/gl_trial_balance.php:171
-#: gl/manage/gl_quick_entries.php:241 gl/manage/gl_quick_entries.php:333
-#: includes/sysnames.inc:164 purchasing/includes/ui/invoice_ui.inc:245
-#: purchasing/includes/ui/invoice_ui.inc:247
-#: purchasing/includes/ui/invoice_ui.inc:249 reporting/rep701.php:109
-#: reporting/rep705.php:234 reporting/rep706.php:181 reporting/rep707.php:206
-#: reporting/rep708.php:179
+#: ../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 ""
 
-#: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:98
-#: gl/bank_account_reconcile.php:237 gl/inquiry/bank_inquiry.php:71
-#: gl/inquiry/gl_account_inquiry.php: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:64 gl/view/gl_trans_view.php:67
-#: gl/view/gl_trans_view.php:70 gl/includes/ui/gl_journal_ui.inc:84
-#: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90
-#: purchasing/inquiry/supplier_allocation_inquiry.php:134
-#: purchasing/inquiry/supplier_inquiry.php:176
-#: purchasing/inquiry/supplier_inquiry.php.orig:170 reporting/rep601.php:77
-#: 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_inquiry.php:233
-#: sales/inquiry/customer_inquiry.php.orig:233
+#: ../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_inquiry.php:209
 msgid "Debit"
 msgstr ""
 
-#: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:98
-#: gl/bank_account_reconcile.php:238 gl/inquiry/bank_inquiry.php:71
-#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
-#: gl/inquiry/gl_trial_balance.php:178 gl/inquiry/gl_trial_balance.php:180
-#: gl/inquiry/gl_trial_balance.php:182 gl/view/accrual_trans.php:60
-#: gl/view/gl_trans_view.php:64 gl/view/gl_trans_view.php:67
-#: gl/view/gl_trans_view.php:70 gl/includes/ui/gl_journal_ui.inc:84
-#: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90
-#: includes/sysnames.inc:85
-#: purchasing/inquiry/supplier_allocation_inquiry.php:135
-#: purchasing/inquiry/supplier_inquiry.php:177
-#: purchasing/inquiry/supplier_inquiry.php.orig:171 reporting/rep601.php:77
-#: 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_inquiry.php:234
-#: sales/inquiry/customer_inquiry.php.orig:234
+#: ../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_inquiry.php:210
 msgid "Credit"
 msgstr ""
 
-#: dimensions/includes/dimensions_ui.inc:45
-#: dimensions/inquiry/search_dimensions.php:134 gl/inquiry/bank_inquiry.php:71
-#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_trial_balance.php:175
-#: purchasing/inquiry/supplier_allocation_inquiry.php:137
-#: reporting/rep203.php:92 reporting/rep204.php:82 reporting/rep601.php:77
-#: 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
+#: ../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
 msgid "Balance"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:29
+#: ../dimensions/inquiry/search_dimensions.php:29
 msgid "Search Outstanding Dimensions"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:34
+#: ../dimensions/inquiry/search_dimensions.php:34
 msgid "Search Dimensions"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:73 gl/bank_transfer.php:91
-#: gl/inquiry/journal_inquiry.php:45 gl/manage/revaluate_currencies.php:105
-#: gl/includes/ui/gl_bank_ui.inc:26 gl/includes/ui/gl_bank_ui.inc.orig:25
-#: gl/includes/ui/gl_journal_ui.inc:30 includes/ui/contacts_view.inc:94
-#: inventory/includes/item_adjustments_ui.inc:35
-#: inventory/includes/stock_transfers_ui.inc:40
-#: manufacturing/search_work_orders.php:67
-#: manufacturing/work_order_add_finished.php:198
-#: manufacturing/work_order_entry.php:378
-#: manufacturing/work_order_entry.php:385
-#: manufacturing/includes/work_order_issue_ui.inc:156
-#: purchasing/includes/ui/invoice_ui.inc:92
-#: purchasing/includes/ui/po_ui.inc:159 purchasing/includes/ui/po_ui.inc:164
-#: purchasing/supplier_payment.php:286 sales/customer_payments.php:380
-#: gl/bank_transfer.php:74 gl/bank_transfer.php:79
-#: purchasing/supplier_payment.php:289 sales/customer_payments.php:383
-#: sales/customer_payments.php.orig:382
+#: ../dimensions/inquiry/search_dimensions.php:73
+#: ../gl/bank_transfer.php:79
+#: ../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/includes/ui/po_ui.inc.orig:166
+#: ../purchasing/includes/ui/po_ui.inc.orig:171
+#: ../purchasing/supplier_payment.php:289
+#: ../sales/customer_payments.php:382
 msgid "Reference:"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:75
-#: includes/ui/allocation_cart.inc:284 includes/ui/sav.ui_lists.inc:1898
-#: includes/ui/ui_lists.inc:1919 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
+#: ../dimensions/inquiry/search_dimensions.php:75
+#: ../includes/ui/allocation_cart.inc:286
+#: ../includes/ui/ui_lists.inc:1923
+#: ../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 ""
 
-#: 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:50
-#: gl/includes/ui/gl_bank_ui.inc.orig:105
-#: inventory/inquiry/stock_movements.php:62
-#: purchasing/inquiry/supplier_allocation_inquiry.php:50
-#: purchasing/inquiry/supplier_inquiry.php:53
-#: purchasing/inquiry/supplier_inquiry.php.orig:49
-#: sales/inquiry/customer_inquiry.php:50
-#: sales/inquiry/customer_inquiry.php.orig:50
+#: ../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
 msgid "From:"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:77 gl/inquiry/bank_inquiry.php:50
-#: gl/inquiry/gl_trial_balance.php:50 gl/inquiry/journal_inquiry.php:49
-#: gl/inquiry/profit_loss.php:164 gl/includes/ui/gl_bank_ui.inc:117
-#: gl/includes/ui/gl_bank_ui.inc.orig:105
-#: inventory/inquiry/stock_movements.php:63
-#: purchasing/inquiry/supplier_allocation_inquiry.php:51
-#: purchasing/inquiry/supplier_inquiry.php:54
-#: purchasing/inquiry/supplier_inquiry.php.orig:50
-#: sales/inquiry/customer_inquiry.php:51
-#: sales/inquiry/customer_inquiry.php.orig:51
+#: ../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
 msgid "To:"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:79
-#: manufacturing/search_work_orders.php:71
+#: ../dimensions/inquiry/search_dimensions.php:79
+#: ../manufacturing/search_work_orders.php:71
 msgid "Only Overdue:"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:83
-#: manufacturing/search_work_orders.php:74
+#: ../dimensions/inquiry/search_dimensions.php:83
+#: ../manufacturing/search_work_orders.php:74
 msgid "Only Open:"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:132
-#: dimensions/view/view_dimension.php:54 includes/ui/allocation_cart.inc:263
-#: purchasing/includes/ui/invoice_ui.inc:112
-#: purchasing/view/view_supp_credit.php:48
-#: purchasing/view/view_supp_invoice.php:51
-#: purchasing/inquiry/supplier_allocation_inquiry.php:132
-#: purchasing/inquiry/supplier_inquiry.php:174
-#: purchasing/inquiry/supplier_inquiry.php.orig:168 reporting/rep101.php:130
-#: reporting/rep201.php:118 reporting/rep203.php:91 reporting/rep501.php:85
-#: reporting/includes/doctext.inc:100 reporting/includes/doctext.inc:122
-#: reporting/includes/doctext.inc:143 reporting/includes/doctext.inc:145
-#: reporting/includes/doctext.inc:166 reporting/includes/doctext.inc:184
-#: reporting/includes/doctext.inc:186 sales/customer_invoice.php:437
-#: sales/view/view_dispatch.php:97 sales/view/view_invoice.php:96
-#: sales/inquiry/customer_allocation_inquiry.php:149
-#: sales/inquiry/customer_inquiry.php:229
-#: sales/inquiry/customer_inquiry.php.orig:229
-#: sales/includes/ui/sales_order_ui.inc:596 sales/customer_invoice.php:439
-#: sales/includes/ui/sales_order_ui.inc:600
+#: ../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:510
+#: ../sales/view/view_dispatch.php:97
+#: ../sales/view/view_invoice.php:96
+#: ../sales/inquiry/customer_allocation_inquiry.php:149
+#: ../sales/inquiry/customer_inquiry.php:205
+#: ../sales/includes/ui/sales_order_ui.inc.orig:596
 msgid "Due Date"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:143
+#: ../dimensions/inquiry/search_dimensions.php:143
 msgid "Marked dimensions are overdue."
 msgstr ""
 
-#: dimensions/view/view_dimension.php:20
+#: ../dimensions/view/view_dimension.php:20
 msgid "View Dimension"
 msgstr ""
 
-#: dimensions/view/view_dimension.php:48
+#: ../dimensions/view/view_dimension.php:48
 msgid "The dimension number sent is not valid."
 msgstr ""
 
-#: dimensions/view/view_dimension.php:72
+#: ../dimensions/view/view_dimension.php:72
 msgid "This dimension is closed."
 msgstr ""
 
-#: 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:65
-#: purchasing/inquiry/po_search.php:64
-#: sales/inquiry/customer_allocation_inquiry.php:44
-#: sales/inquiry/sales_deliveries_view.php:104
-#: sales/inquiry/sales_orders_view.php:229
-#: sales/inquiry/sales_orders_view.php.orig:227
+#: ../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/sales_deliveries_view.php:104
+#: ../sales/inquiry/sales_orders_view.php:251
 msgid "from:"
 msgstr ""
 
-#: 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:66
-#: purchasing/inquiry/po_search.php:65
-#: sales/inquiry/customer_allocation_inquiry.php:45
-#: sales/inquiry/sales_deliveries_view.php:105
-#: sales/inquiry/sales_orders_view.php:230
-#: sales/inquiry/sales_orders_view.php.orig:228
+#: ../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/sales_deliveries_view.php:105
+#: ../sales/inquiry/sales_orders_view.php:252
 msgid "to:"
 msgstr ""
 
-#: dimensions/view/view_dimension.php:86 gl/inquiry/balance_sheet.php:131
-#: gl/inquiry/bank_inquiry.php:52 gl/inquiry/gl_account_inquiry.php:85
-#: gl/inquiry/gl_trial_balance.php:58 gl/inquiry/profit_loss.php:178
-#: 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 ""
 
-#: gl/accruals.php:20 includes/access_levels.inc:243
+#: ../gl/accruals.php:20
+#: ../includes/access_levels.inc:245
 msgid "Revenue / Cost Accruals"
 msgstr ""
 
-#: gl/accruals.php:44
+#: ../gl/accruals.php:38
+#: ../gl/bank_transfer.php:121
+#: ../gl/gl_bank.php:270
+#: ../gl/gl_journal.php:167
+#: ../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:345
+#: ../purchasing/po_entry_items.php.orig:342
+#: ../purchasing/po_receive_items.php:179
+#: ../purchasing/supplier_credit.php:193
+#: ../purchasing/supplier_invoice.php:199
+#: ../purchasing/supplier_payment.php:180
+#: ../sales/create_recurrent_invoices.php:119
+#: ../sales/credit_note_entry.php:157
+#: ../sales/customer_credit_invoice.php:95
+#: ../sales/customer_delivery.php:165
+#: ../sales/customer_delivery.php.orig:165
+#: ../sales/customer_invoice.php:318
+#: ../sales/customer_payments.php:145
+#: ../sales/sales_order_entry.php:364
+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 ""
 
-#: gl/accruals.php:50
+#: ../gl/accruals.php:50
 msgid "The periods must be greater than 0."
 msgstr ""
 
-#: gl/accruals.php:67
+#: ../gl/accruals.php:71
 msgid ""
-"Some of the period dates are outside the fiscal year. Create a new fiscal "
-"year first!"
+"Some of the period dates are outside the fiscal year or are closed for "
+"further data entry. Create a new fiscal year first!"
 msgstr ""
 
-#: gl/accruals.php:82
+#: ../gl/accruals.php:86
 #, php-format
 msgid "Accruals for %s"
 msgstr ""
 
-#: gl/accruals.php:92 gl/accruals.php:94 gl/accruals.php:203
-#: gl/accruals.php:205 gl/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:63
-#: gl/view/gl_trans_view.php:66 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:132
-#: gl/includes/ui/gl_bank_ui.inc.orig:133
-#: gl/includes/ui/gl_bank_ui.inc.orig:135 gl/includes/ui/gl_journal_ui.inc:83
-#: gl/includes/ui/gl_journal_ui.inc:84 gl/includes/ui/gl_journal_ui.inc:86
-#: includes/sysnames.inc:43 includes/sysnames.inc:165
-#: inventory/manage/item_categories.php:216
-#: inventory/manage/item_categories.php:218 inventory/manage/items.php:343
-#: inventory/manage/items.php:345 purchasing/includes/ui/invoice_ui.inc:245
-#: purchasing/includes/ui/invoice_ui.inc:247
-#: purchasing/manage/suppliers.php:137 purchasing/manage/suppliers.php:138
-#: purchasing/manage/suppliers.php:140 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:395
-#: sales/customer_delivery.php:403 sales/customer_invoice.php:407
-#: sales/customer_invoice.php:445 sales/manage/customers.php:269
-#: sales/manage/customers.php:271 sales/manage/customers.php.orig:266
-#: sales/manage/customers.php.orig:268
-#: 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/customer_invoice.php:409
-#: sales/customer_invoice.php:447 sales/manage/customers.php:270
-#: sales/manage/customers.php:272 sales/includes/ui/sales_order_ui.inc:455
-#: sales/includes/ui/sales_order_ui.inc:460
+#: ../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.orig:408
+#: ../sales/customer_delivery.php.orig:416
+#: ../sales/customer_invoice.php:475
+#: ../sales/customer_invoice.php:518
+#: ../sales/manage/customers.php:270
+#: ../sales/manage/customers.php:272
+#: ../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.orig:451
+#: ../sales/includes/ui/sales_order_ui.inc.orig:456
 msgid "Dimension"
 msgstr ""
 
-#: gl/accruals.php:98 gl/accruals.php:213
-#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
-#: gl/inquiry/journal_inquiry.php:133 gl/view/accrual_trans.php:60
-#: gl/view/gl_deposit_view.php:100 gl/view/gl_deposit_view.php:103
-#: gl/view/gl_deposit_view.php:106 gl/view/gl_payment_view.php:99
-#: gl/view/gl_payment_view.php:102 gl/view/gl_payment_view.php:105
-#: gl/view/gl_trans_view.php:64 gl/view/gl_trans_view.php:67
-#: gl/view/gl_trans_view.php:70 gl/includes/ui/gl_bank_ui.inc: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:133
-#: gl/includes/ui/gl_bank_ui.inc.orig:136
-#: gl/includes/ui/gl_bank_ui.inc.orig:139
-#: gl/includes/ui/gl_bank_ui.inc.orig:279 gl/includes/ui/gl_journal_ui.inc:84
-#: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90
-#: gl/includes/ui/gl_journal_ui.inc:240
-#: inventory/includes/item_adjustments_ui.inc:181
-#: inventory/includes/stock_transfers_ui.inc:161
-#: manufacturing/includes/work_order_issue_ui.inc:169
-#: purchasing/includes/ui/invoice_ui.inc:245
-#: purchasing/includes/ui/invoice_ui.inc:247
-#: purchasing/includes/ui/invoice_ui.inc:249
-#: sales/customer_credit_invoice.php:366 sales/customer_delivery.php:519
-#: sales/customer_invoice.php:576 sales/includes/ui/sales_credit_ui.inc:339
-#: sales/customer_credit_invoice.php:364 sales/customer_invoice.php:578
+#: ../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:364
+#: ../sales/customer_delivery.php.orig:532
+#: ../sales/includes/ui/sales_credit_ui.inc:339
 msgid "Memo"
 msgstr ""
 
-#: gl/accruals.php:162
+#: ../gl/accruals.php:166
 msgid "Revenue / Cost Accruals have been processed."
 msgstr ""
 
-#: gl/accruals.php:168
+#: ../gl/accruals.php:172
 msgid "Showing GL Transactions."
 msgstr ""
 
-#: gl/accruals.php:180
+#: ../gl/accruals.php:184
 msgid "Weekly"
 msgstr ""
 
-#: gl/accruals.php:181
+#: ../gl/accruals.php:185
 msgid "Bi-weekly"
 msgstr ""
 
-#: gl/accruals.php:182 gl/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
-#: sales/create_recurrent_invoices.php:132
+#: ../gl/accruals.php:186
+#: ../gl/manage/gl_quick_entries.php:240
+#: ../gl/includes/ui/gl_journal_ui.inc:57
+#: ../sales/create_recurrent_invoices.php:132
+#: ../sales/manage/recurrent_invoices.php:102
 msgid "Monthly"
 msgstr ""
 
-#: gl/accruals.php:183
+#: ../gl/accruals.php:187
 msgid "Quarterly"
 msgstr ""
 
-#: gl/accruals.php:195
+#: ../gl/accruals.php:199
 msgid "First date of Accruals"
 msgstr ""
 
-#: gl/accruals.php:197
+#: ../gl/accruals.php:201
 msgid "Accrued Balance Account"
 msgstr ""
 
-#: gl/accruals.php:200
+#: ../gl/accruals.php:204
 msgid "Revenue / Cost Account"
 msgstr ""
 
-#: gl/accruals.php:208 gl/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:133
-#: gl/includes/ui/gl_bank_ui.inc.orig:136
-#: gl/includes/ui/gl_bank_ui.inc.orig:139 includes/sysnames.inc:132
-#: includes/ui/allocation_cart.inc:263 includes/ui/sav.ui_lists.inc:1163
-#: includes/ui/ui_lists.inc:1184
-#: manufacturing/includes/manufacturing_ui.inc:236
-#: purchasing/includes/ui/invoice_ui.inc:245
-#: purchasing/includes/ui/invoice_ui.inc:247
-#: purchasing/includes/ui/invoice_ui.inc:249
-#: purchasing/view/view_supp_payment.php:60
-#: purchasing/view/view_supp_payment.php:72 reporting/rep102.php:241
-#: reporting/rep107.php:182 reporting/rep109.php:191 reporting/rep110.php:195
-#: reporting/rep111.php:178 reporting/rep113.php:181 reporting/rep202.php:249
-#: reporting/rep209.php:197 reporting/rep706.php:303 reporting/rep707.php:321
-#: reporting/rep710.php:76 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
+#: ../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 ""
 
-#: gl/accruals.php:208
+#: ../gl/accruals.php:212
 msgid "Search Amount"
 msgstr ""
 
-#: gl/accruals.php:210
+#: ../gl/accruals.php:214
 msgid "Frequency"
 msgstr ""
 
-#: gl/accruals.php:212
+#: ../gl/accruals.php:216
 msgid "Periods"
 msgstr ""
 
-#: gl/accruals.php:216
+#: ../gl/accruals.php:220
 msgid "Show GL Rows"
 msgstr ""
 
-#: gl/accruals.php:217
+#: ../gl/accruals.php:221
 msgid "Process Accruals"
 msgstr ""
 
-#: gl/accruals.php:218
+#: ../gl/accruals.php:222
 msgid "Are you sure you want to post accruals?"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:33
+#: ../gl/bank_account_reconcile.php:33
 msgid "Reconcile Bank Account"
 msgstr ""
 
-#: 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 sales/customer_payments.php.orig: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 ""
 
-#: gl/bank_account_reconcile.php:39
+#: ../gl/bank_account_reconcile.php:39
 msgid "Invalid reconcile date format"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:56
+#: ../gl/bank_account_reconcile.php:56
 msgid "Reconcile this transaction"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:166 gl/inquiry/bank_inquiry.php:47
-#: gl/inquiry/gl_account_inquiry.php:70
+#: ../gl/bank_account_reconcile.php:164
+#: ../gl/inquiry/bank_inquiry.php:47
+#: ../gl/inquiry/gl_account_inquiry.php:70
 msgid "Account:"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:168
+#: ../gl/bank_account_reconcile.php:166
 msgid "Bank Statement:"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:169
+#: ../gl/bank_account_reconcile.php:167
+#: ../inventory/purchasing_data.php.orig:235
 msgid "New"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:198
+#: ../gl/bank_account_reconcile.php:196
 msgid "Reconcile Date"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:198
+#: ../gl/bank_account_reconcile.php:196
 msgid "Beginning<br>Balance"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:199
+#: ../gl/bank_account_reconcile.php:197
 msgid "Ending<br>Balance"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:199
+#: ../gl/bank_account_reconcile.php:197
 msgid "Account<br>Total"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:199
+#: ../gl/bank_account_reconcile.php:197
 msgid "Reconciled<br>Amount"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:199
+#: ../gl/bank_account_reconcile.php:197
+#: ../reporting/rep602.php:205
 msgid "Difference"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:203
+#: ../gl/bank_account_reconcile.php:201
 msgid "Date of bank statement to reconcile"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:239 gl/inquiry/bank_inquiry.php:71
-#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
-#: gl/view/accrual_trans.php:60 gl/view/gl_trans_view.php:36
-#: reporting/rep601.php:76 reporting/rep704.php:80 reporting/rep704.php:82
-#: reporting/rep704.php:85
+#: ../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 ""
 
-#: gl/bank_account_reconcile.php:249
+#: ../gl/bank_account_reconcile.php:247
 msgid "Reconcile"
 msgstr ""
 
-#: gl/bank_transfer.php:28
+#: ../gl/bank_transfer.php:28
 msgid "Transfer between Bank Accounts"
 msgstr ""
 
-#: gl/bank_transfer.php:39 gl/manage/revaluate_currencies.php:35
+#: ../gl/bank_transfer.php:39
+#: ../gl/manage/revaluate_currencies.php:35
 msgid "Transfer has been entered"
 msgstr ""
 
-#: gl/bank_transfer.php:41 gl/manage/revaluate_currencies.php:37
+#: ../gl/bank_transfer.php:41
+#: ../gl/manage/revaluate_currencies.php:37
 msgid "&View the GL Journal Entries for this Transfer"
 msgstr ""
 
-#: gl/bank_transfer.php:43
+#: ../gl/bank_transfer.php:43
 msgid "Enter &Another Transfer"
 msgstr ""
 
-#: gl/bank_transfer.php:66
+#: ../gl/bank_transfer.php:66
 msgid "From Account:"
 msgstr ""
 
-#: gl/bank_transfer.php:70
+#: ../gl/bank_transfer.php:70
 msgid "To Account:"
 msgstr ""
 
-#: gl/bank_transfer.php:72 gl/bank_transfer.php:77
+#: ../gl/bank_transfer.php:77
 msgid "Transfer Date:"
 msgstr ""
 
-#: gl/bank_transfer.php:78 gl/bank_transfer.php:85
-#: sales/customer_payments.php:409 gl/bank_transfer.php:82
-#: gl/bank_transfer.php:89 gl/bank_transfer.php:87 gl/bank_transfer.php:94
-#: sales/customer_payments.php:412 sales/customer_payments.php.orig:411
+#: ../gl/bank_transfer.php:87
+#: ../gl/bank_transfer.php:94
+#: ../sales/customer_payments.php:411
 msgid "Amount:"
 msgstr ""
 
-#: gl/bank_transfer.php:79 gl/bank_transfer.php:86
-#: purchasing/supplier_payment.php:299 sales/customer_payments.php:394
-#: gl/bank_transfer.php:83 gl/bank_transfer.php:90 gl/bank_transfer.php:88
-#: gl/bank_transfer.php:95 purchasing/supplier_payment.php:302
-#: sales/customer_payments.php:397 sales/customer_payments.php.orig:396
+#: ../gl/bank_transfer.php:88
+#: ../gl/bank_transfer.php:95
+#: ../purchasing/supplier_payment.php:302
+#: ../sales/customer_payments.php:396
 msgid "Bank Charge:"
 msgstr ""
 
-#: gl/bank_transfer.php:97 gl/bank_transfer.php:102
+#: ../gl/bank_transfer.php:102
 msgid "Enter Transfer"
 msgstr ""
 
-#: gl/bank_transfer.php:123 gl/bank_transfer.php:153
-#: purchasing/supplier_payment.php:130 purchasing/supplier_payment.php:136
-#: gl/bank_transfer.php:128 gl/bank_transfer.php:158
-#: purchasing/supplier_payment.php:125 purchasing/supplier_payment.php:131
+#: ../gl/bank_transfer.php:128
+#: ../gl/bank_transfer.php:158
+#: ../purchasing/supplier_payment.php:125
+#: ../purchasing/supplier_payment.php:131
 msgid "The entered amount is invalid or less than zero."
 msgstr ""
 
-#: gl/bank_transfer.php:128 gl/gl_bank.php:225 gl/bank_transfer.php:133
+#: ../gl/bank_transfer.php:133
+#: ../gl/gl_bank.php:228
 msgid "The total bank amount cannot be 0."
 msgstr ""
 
-#: gl/bank_transfer.php:139 gl/bank_transfer.php:144
+#: ../gl/bank_transfer.php:144
 #, php-format
 msgid "The total bank amount exceeds allowed limit (%s) for source account."
 msgstr ""
 
-#: gl/bank_transfer.php:145 gl/gl_bank.php:242 gl/bank_transfer.php:150
+#: ../gl/bank_transfer.php:150
+#: ../gl/gl_bank.php:245
 #, 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 gl/bank_transfer.php:163
-#: purchasing/supplier_payment.php:139 sales/customer_payments.php.orig:184
+#: ../gl/bank_transfer.php:163
+#: ../purchasing/supplier_payment.php:139
+#: ../sales/customer_payments.php:184
 msgid ""
 "The Bank Charge Account has not been set in System and General GL Setup."
 msgstr ""
 
-#: gl/bank_transfer.php:164 gl/gl_bank.php:249 gl/gl_journal.php:168
-#: gl/manage/revaluate_currencies.php:65 inventory/adjustments.php:96
-#: inventory/transfers.php:93 manufacturing/work_order_add_finished.php:77
-#: manufacturing/work_order_entry.php:132
-#: manufacturing/work_order_issue.php:91 purchasing/po_receive_items.php:188
-#: purchasing/supplier_payment.php:201 sales/credit_note_entry.php:147
-#: sales/customer_credit_invoice.php:102 sales/customer_delivery.php:166
-#: sales/customer_invoice.php:280 sales/customer_payments.php:151
-#: sales/sales_order_entry.php:403 gl/bank_transfer.php:169
-#: purchasing/supplier_payment.php:196 sales/customer_payments.php.orig:151
-#: sales/sales_order_entry.php:412 sales/sales_order_entry.php.orig:411
+#: ../gl/bank_transfer.php:169
+#: ../gl/gl_bank.php:252
+#: ../gl/gl_journal.php:173
+#: ../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:196
+#: ../sales/credit_note_entry.php:147
+#: ../sales/customer_credit_invoice.php:102
+#: ../sales/customer_delivery.php:178
+#: ../sales/customer_delivery.php.orig:178
+#: ../sales/customer_invoice.php:332
+#: ../sales/customer_payments.php:151
+#: ../sales/sales_order_entry.php:428
 msgid "You must enter a reference."
 msgstr ""
 
-#: gl/bank_transfer.php:178 gl/bank_transfer.php:183
+#: ../gl/bank_transfer.php:183
 msgid "The source and destination bank accouts cannot be the same."
 msgstr ""
 
-#: gl/gl_bank.php:34
+#: ../gl/gl_bank.php:34
 msgid "Bank Account Payment Entry"
 msgstr ""
 
-#: gl/gl_bank.php:37
+#: ../gl/gl_bank.php:37
 msgid "Bank Account Deposit Entry"
 msgstr ""
 
-#: gl/gl_bank.php:40
+#: ../gl/gl_bank.php:40
 msgid "Modify Bank Account Entry"
 msgstr ""
 
-#: gl/gl_bank.php:43
+#: ../gl/gl_bank.php:43
 msgid "Modify Bank Deposit Entry"
 msgstr ""
 
-#: gl/gl_bank.php:73
+#: ../gl/gl_bank.php:76
 #, php-format
 msgid "Payment %d has been entered"
 msgstr ""
 
-#: gl/gl_bank.php:75 gl/gl_bank.php:93
+#: ../gl/gl_bank.php:78
+#: ../gl/gl_bank.php:96
 msgid "&View the GL Postings for this Payment"
 msgstr ""
 
-#: gl/gl_bank.php:77 gl/gl_bank.php:95
+#: ../gl/gl_bank.php:80
+#: ../gl/gl_bank.php:98
 msgid "Enter Another &Payment"
 msgstr ""
 
-#: gl/gl_bank.php:79 gl/gl_bank.php:97
+#: ../gl/gl_bank.php:82
+#: ../gl/gl_bank.php:100
 msgid "Enter A &Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:81 gl/gl_journal.php:61 inventory/adjustments.php:50
-#: manufacturing/work_order_entry.php:68 purchasing/po_entry_items.php:109
-#: purchasing/po_entry_items.php:133 purchasing/supplier_credit.php:49
-#: purchasing/supplier_invoice.php:52 sales/credit_note_entry.php:77
-#: sales/customer_credit_invoice.php:62 sales/customer_invoice.php:66
-#: sales/sales_order_entry.php:226 purchasing/po_entry_items.php:112
-#: purchasing/po_entry_items.php:136 sales/sales_order_entry.php:234
-#: sales/sales_order_entry.php.orig:234
+#: ../gl/gl_bank.php:84
+#: ../gl/gl_journal.php:63
+#: ../inventory/adjustments.php:50
+#: ../manufacturing/work_order_entry.php:68
+#: ../purchasing/po_entry_items.php:115
+#: ../purchasing/po_entry_items.php:139
+#: ../purchasing/po_entry_items.php.orig:112
+#: ../purchasing/po_entry_items.php.orig:136
+#: ../purchasing/supplier_credit.php:84
+#: ../purchasing/supplier_invoice.php:75
+#: ../sales/credit_note_entry.php:77
+#: ../sales/customer_credit_invoice.php:62
+#: ../sales/customer_invoice.php:69
+#: ../sales/sales_order_entry.php:240
 msgid "Add an Attachment"
 msgstr ""
 
-#: gl/gl_bank.php:107
+#: ../gl/gl_bank.php:110
 #, php-format
 msgid "Deposit %d has been entered"
 msgstr ""
 
-#: gl/gl_bank.php:109
+#: ../gl/gl_bank.php:112
 msgid "View the GL Postings for this Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:111
+#: ../gl/gl_bank.php:114
 msgid "Enter Another Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:113
+#: ../gl/gl_bank.php:116
 msgid "Enter A Payment"
 msgstr ""
 
-#: gl/gl_bank.php:124
+#: ../gl/gl_bank.php:125
+#, php-format
+msgid "Deposit %d has been modified"
+msgstr ""
+
+#: ../gl/gl_bank.php:127
 msgid "&View the GL Postings for this Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:126
+#: ../gl/gl_bank.php:129
 msgid "Enter Another &Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:128
+#: ../gl/gl_bank.php:131
 msgid "Enter A &Payment"
 msgstr ""
 
-#: gl/gl_bank.php:219
+#: ../gl/gl_bank.php:222
 msgid "You must enter at least one payment line."
 msgstr ""
 
-#: gl/gl_bank.php:236 purchasing/supplier_payment.php:194
-#: purchasing/supplier_payment.php:189
+#: ../gl/gl_bank.php:239
+#: ../purchasing/supplier_payment.php:189
 #, php-format
 msgid "The total bank amount exceeds allowed limit (%s)."
 msgstr ""
 
-#: gl/gl_bank.php:261
+#: ../gl/gl_bank.php:264
 msgid "The entered date for the payment is invalid."
 msgstr ""
 
-#: gl/gl_bank.php:273
+#: ../gl/gl_bank.php:276
 msgid "You have to select customer and customer branch."
 msgstr ""
 
-#: gl/gl_bank.php:277
+#: ../gl/gl_bank.php:280
 msgid "You have to select supplier."
 msgstr ""
 
-#: gl/gl_bank.php:323 gl/gl_bank.php:325
+#: ../gl/gl_bank.php:328
 msgid "The amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: gl/gl_bank.php:395 gl/gl_bank.php:397
+#: ../gl/gl_bank.php:400
 msgid "Payment Items"
 msgstr ""
 
-#: gl/gl_bank.php:395 gl/gl_bank.php:397
+#: ../gl/gl_bank.php:400
 msgid "Deposit Items"
 msgstr ""
 
-#: gl/gl_bank.php:403 gl/gl_bank.php:405
+#: ../gl/gl_bank.php:408
 msgid "Process Payment"
 msgstr ""
 
-#: gl/gl_bank.php:403 gl/gl_bank.php:405
+#: ../gl/gl_bank.php:408
 msgid "Process Deposit"
 msgstr ""
 
-#: gl/gl_budget.php:18
+#: ../gl/gl_budget.php:18
 msgid "Budget Entry"
 msgstr ""
 
-#: gl/gl_budget.php:26 gl/manage/gl_accounts.php:23
-#: gl/manage/gl_accounts.php.orig: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 ""
 
-#: gl/gl_budget.php:45
+#: ../gl/gl_budget.php:45
 msgid "The Budget has been saved."
 msgstr ""
 
-#: gl/gl_budget.php:47
+#: ../gl/gl_budget.php:47
 msgid "The Budget has been deleted."
 msgstr ""
 
-#: gl/gl_budget.php:64 gl/manage/gl_accounts.php:230
-#: gl/manage/gl_accounts.php:240 gl/manage/gl_accounts.php.orig:230
-#: gl/manage/gl_accounts.php.orig:240 gl/manage/gl_accounts.php:231
-#: gl/manage/gl_accounts.php:241
+#: ../gl/gl_budget.php:64
+#: ../gl/manage/gl_accounts.php:230
+#: ../gl/manage/gl_accounts.php:240
 msgid "Account Code:"
 msgstr ""
 
-#: gl/gl_budget.php:84 gl/manage/exchange_rates.php:142
+#: ../gl/gl_budget.php:84
+#: ../gl/manage/exchange_rates.php:142
 msgid "Get"
 msgstr ""
 
-#: gl/gl_budget.php:91 gl/gl_budget.php:93 gl/inquiry/profit_loss.php:231
-#: gl/manage/gl_quick_entries.php:240 reporting/rep101.php:136
-#: reporting/rep105.php:116 reporting/rep106.php:90 reporting/rep114.php:88
-#: reporting/rep201.php:124 reporting/rep304.php:119 reporting/rep305.php:100
-#: reporting/rep601.php:82 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
-#: reporting/rep305.php:103
+#: ../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:103
+#: ../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 ""
 
-#: gl/gl_budget.php:91
+#: ../gl/gl_budget.php:91
 msgid "Dim. incl."
 msgstr ""
 
-#: gl/gl_budget.php:91 gl/gl_budget.php:93
+#: ../gl/gl_budget.php:91
+#: ../gl/gl_budget.php:93
 msgid "Last Year"
 msgstr ""
 
-#: gl/gl_budget.php:127 gl/inquiry/balance_sheet.php:98
-#: gl/inquiry/balance_sheet.php:205 gl/inquiry/balance_sheet.php:236
-#: gl/inquiry/gl_trial_balance.php:210 gl/inquiry/profit_loss.php:115
-#: gl/inquiry/profit_loss.php:283 gl/view/gl_deposit_view.php:132
-#: gl/view/gl_payment_view.php:131 gl/view/gl_trans_view.php:106
-#: gl/includes/ui/gl_bank_ui.inc:200 gl/includes/ui/gl_bank_ui.inc.orig:182
-#: gl/includes/ui/gl_journal_ui.inc:141
-#: inventory/includes/item_adjustments_ui.inc:63
-#: inventory/includes/item_adjustments_ui.inc:102
-#: manufacturing/includes/manufacturing_ui.inc:178
-#: purchasing/includes/ui/invoice_ui.inc:309
-#: purchasing/includes/ui/invoice_ui.inc:474
-#: purchasing/includes/ui/invoice_ui.inc:544
-#: 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:170
-#: sales/customer_credit_invoice.php:283 sales/customer_delivery.php:433
-#: sales/customer_invoice.php:468
-#: sales/allocations/customer_allocation_main.php:99
-#: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113
-#: sales/view/view_invoice.php:114 sales/view/view_sales_order.php:96
-#: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161
-#: sales/view/view_sales_order.php:202
-#: sales/includes/ui/sales_credit_ui.inc:168
-#: sales/includes/ui/sales_order_ui.inc:142 reporting/rep305.php:98
-#: reporting/rep305.php:122 reporting/rep305.php:178
-#: sales/customer_credit_invoice.php:281 sales/customer_invoice.php:470
-#: sales/includes/ui/sales_order_ui.inc:146
+#: ../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:98
+#: ../reporting/rep305.php:122
+#: ../reporting/rep305.php:178
+#: ../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:281
+#: ../sales/customer_delivery.php.orig:446
+#: ../sales/customer_invoice.php:542
+#: ../sales/customer_invoice.php:545
+#: ../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.orig:142
 msgid "Total"
 msgstr ""
 
-#: gl/gl_journal.php:32
+#: ../gl/gl_journal.php:32
 #, php-format
 msgid "Modifying Journal Transaction # %d."
 msgstr ""
 
-#: gl/gl_journal.php:36 includes/sysnames.inc:22 includes/sysnames.inc:149
+#: ../gl/gl_journal.php:36
+#: ../includes/sysnames.inc:22
+#: ../includes/sysnames.inc:150
 msgid "Journal Entry"
 msgstr ""
 
-#: gl/gl_journal.php:54
+#: ../gl/gl_journal.php:56
 msgid "Journal entry has been entered"
 msgstr ""
 
-#: gl/gl_journal.php:56 gl/gl_journal.php:71
+#: ../gl/gl_journal.php:58
+#: ../gl/gl_journal.php:73
 msgid "&View this Journal Entry"
 msgstr ""
 
-#: gl/gl_journal.php:59
+#: ../gl/gl_journal.php:61
 msgid "Enter &New Journal Entry"
 msgstr ""
 
-#: gl/gl_journal.php:69
+#: ../gl/gl_journal.php:71
 msgid "Journal entry has been updated"
 msgstr ""
 
-#: gl/gl_journal.php:73
+#: ../gl/gl_journal.php:75
 msgid "Return to Journal &Inquiry"
 msgstr ""
 
-#: gl/gl_journal.php:86
+#: ../gl/gl_journal.php:90
 msgid ""
 "You can edit directly only journal entries created via Journal Entry page."
 msgstr ""
 
-#: gl/gl_journal.php:87
+#: ../gl/gl_journal.php:91
 msgid "Entry &New Journal Entry"
 msgstr ""
 
-#: gl/gl_journal.php:143
+#: ../gl/gl_journal.php:148
 msgid "You must enter at least one journal line."
 msgstr ""
 
-#: gl/gl_journal.php:149
+#: ../gl/gl_journal.php:154
+#: ../includes/ui/gl_cart.inc:128
 msgid ""
 "The journal must balance (debits equal to credits) before it can be "
 "processed."
 msgstr ""
 
-#: gl/gl_journal.php:211 gl/gl_journal.php:218
+#: ../gl/gl_journal.php:216
+#: ../gl/gl_journal.php:223
 msgid "Dimension is closed."
 msgstr ""
 
-#: gl/gl_journal.php:225
+#: ../gl/gl_journal.php:230
 msgid "You must enter either a debit amount or a credit amount."
 msgstr ""
 
-#: gl/gl_journal.php:232
+#: ../gl/gl_journal.php:237
 msgid "The debit amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: gl/gl_journal.php:237
+#: ../gl/gl_journal.php:242
 msgid "The credit amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: gl/gl_journal.php:243 includes/ui/ui_view.inc:672
-#: purchasing/supplier_credit.php:119 purchasing/supplier_invoice.php:119
-#: includes/ui/ui_view.inc:673
+#: ../gl/gl_journal.php:248
+#: ../includes/ui/ui_view.inc:674
+#: ../purchasing/supplier_credit.php:136
+#: ../purchasing/supplier_invoice.php:144
 msgid "Cannot post to GL account used by more than one tax type."
 msgstr ""
 
-#: gl/gl_journal.php:250
+#: ../gl/gl_journal.php:255
 msgid ""
 "You cannot make a journal entry for a bank account. Please use one of the "
 "banking functions for bank transactions."
 msgstr ""
 
-#: gl/gl_journal.php:329
+#: ../gl/gl_journal.php:334
 msgid "Rows"
 msgstr ""
 
-#: gl/gl_journal.php:335
+#: ../gl/gl_journal.php:340
 msgid "Process Journal Entry"
 msgstr ""
 
-#: gl/gl_journal.php:336
+#: ../gl/gl_journal.php:341
 msgid "Process journal entry only if debits equal to credits"
 msgstr ""
 
-#: gl/inquiry/balance_sheet.php:27
+#: ../gl/inquiry/balance_sheet.php:27
 msgid "Balance Sheet Drilldown"
 msgstr ""
 
-#: gl/inquiry/balance_sheet.php:126
+#: ../gl/inquiry/balance_sheet.php:126
 msgid "As at:"
 msgstr ""
 
-#: gl/inquiry/balance_sheet.php:228 gl/inquiry/profit_loss.php:294
-#: reporting/rep705.php:319 reporting/rep706.php:272 reporting/rep706.php:297
-#: reporting/rep707.php:303 reporting/rep707.php:309
+#: ../gl/inquiry/balance_sheet.php: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 ""
 
-#: gl/inquiry/balance_sheet.php:236 includes/sysnames.inc:120
-#: reporting/rep706.php:284
+#: ../gl/inquiry/balance_sheet.php:236
+#: ../includes/sysnames.inc:121
+#: ../reporting/rep706.php:284
 msgid "Liabilities"
 msgstr ""
 
-#: gl/inquiry/balance_sheet.php:236 reporting/rep706.php:284
+#: ../gl/inquiry/balance_sheet.php:236
+#: ../reporting/rep706.php:284
 msgid " and "
 msgstr ""
 
-#: gl/inquiry/balance_sheet.php:236 reporting/rep706.php:284
+#: ../gl/inquiry/balance_sheet.php:236
+#: ../reporting/rep706.php:284
 msgid "Equities"
 msgstr ""
 
-#: gl/inquiry/bank_inquiry.php:28 reporting/rep601.php:69
+#: ../gl/inquiry/bank_inquiry.php:28
+#: ../reporting/rep601.php:69
 msgid "Bank Statement"
 msgstr ""
 
-#: gl/inquiry/bank_inquiry.php:78 gl/inquiry/gl_account_inquiry.php:162
-#: reporting/rep601.php:99 reporting/rep704.php:138
+#: ../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 ""
 
-#: gl/inquiry/bank_inquiry.php:123 gl/inquiry/gl_account_inquiry.php:211
-#: gl/inquiry/gl_trial_balance.php:220 reporting/rep601.php:150
-#: reporting/rep704.php:186 reporting/rep708.php:244
+#: ../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 ""
 
-#: gl/inquiry/gl_account_inquiry.php:31
+#: ../gl/inquiry/gl_account_inquiry.php:31
 msgid "General Ledger Inquiry"
 msgstr ""
 
-#: gl/inquiry/gl_account_inquiry.php:70
+#: ../gl/inquiry/gl_account_inquiry.php:70
 msgid "All Accounts"
 msgstr ""
 
-#: gl/inquiry/gl_account_inquiry.php:83
+#: ../gl/inquiry/gl_account_inquiry.php:83
 msgid "Amount min:"
 msgstr ""
 
-#: gl/inquiry/gl_account_inquiry.php:84
+#: ../gl/inquiry/gl_account_inquiry.php:84
 msgid "Amount max:"
 msgstr ""
 
-#: gl/inquiry/gl_account_inquiry.php:220
+#: ../gl/inquiry/gl_account_inquiry.php:220
 msgid ""
 "No general ledger transactions have been created for the specified criteria."
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:28 reporting/rep708.php:206
+#: ../gl/inquiry/gl_trial_balance.php:28
+#: ../reporting/rep708.php:206
 msgid "Trial Balance"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:55
+#: ../gl/inquiry/gl_trial_balance.php:55
 msgid "No zero values"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:56 reporting/reports_main.php:301
-#: reporting/reports_main.php:346 reporting/reports_main.php:386
+#: ../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 ""
 
-#: gl/inquiry/gl_trial_balance.php:90 gl/inquiry/gl_trial_balance.php:142
-#: 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
-#: sales/create_recurrent_invoices.php:132
+#: ../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:132
+#: ../sales/manage/recurrent_invoices.php:102
 msgid "Group"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:159
+#: ../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:172 gl/manage/bank_accounts.php:106
-#: gl/manage/bank_accounts.php.orig:106 gl/view/gl_trans_view.php:63
-#: gl/view/gl_trans_view.php:66 gl/view/gl_trans_view.php:69
-#: reporting/rep701.php:109 reporting/rep702.php:51 reporting/rep705.php:234
-#: reporting/rep706.php:181 reporting/rep707.php:206 reporting/rep708.php:179
+#: ../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 ""
 
-#: gl/inquiry/gl_trial_balance.php:173 reporting/rep708.php:172
+#: ../gl/inquiry/gl_trial_balance.php:172
+#: ../reporting/rep708.php:172
 msgid "Brought Forward"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:174 reporting/rep708.php:172
+#: ../gl/inquiry/gl_trial_balance.php:173
+#: ../reporting/rep708.php:172
 msgid "This Period"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:193
+#: ../gl/inquiry/gl_trial_balance.php:192
 msgid "Class"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:228 reporting/rep708.php:265
+#: ../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
+#: ../gl/inquiry/journal_inquiry.php:27
 msgid "Journal Inquiry"
 msgstr ""
 
-#: gl/inquiry/journal_inquiry.php:45
+#: ../gl/inquiry/journal_inquiry.php:45
 msgid "Enter reference fragment or leave empty"
 msgstr ""
 
-#: gl/inquiry/journal_inquiry.php:51
+#: ../gl/inquiry/journal_inquiry.php:51
 msgid "Show closed:"
 msgstr ""
 
-#: gl/inquiry/journal_inquiry.php:56
+#: ../gl/inquiry/journal_inquiry.php:56
 msgid "Enter memo fragment or leave empty"
 msgstr ""
 
-#: gl/inquiry/journal_inquiry.php:130
+#: ../gl/inquiry/journal_inquiry.php:130
 msgid "Trans #"
 msgstr ""
 
-#: gl/inquiry/journal_inquiry.php:134 reporting/rep710.php:75
-#: reporting/rep710.php:85 reporting/reports_main.php:400
+#: ../gl/inquiry/journal_inquiry.php:134
+#: ../reporting/rep710.php:75
+#: ../reporting/rep710.php:85
+#: ../reporting/reports_main.php:400
 msgid "User"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:27
+#: ../gl/inquiry/profit_loss.php:27
 msgid "Profit & Loss Drilldown"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:168 reporting/rep707.php:206
-#: reporting/includes/reports_classes.inc:234
-#: reporting/includes/reports_classes.inc:238
+#: ../gl/inquiry/profit_loss.php:168
+#: ../reporting/rep707.php:206
+#: ../reporting/includes/reports_classes.inc:238
 msgid "Accumulated"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:168 reporting/rep707.php:251
-#: reporting/includes/reports_classes.inc:234
-#: reporting/includes/reports_classes.inc:238
+#: ../gl/inquiry/profit_loss.php:168
+#: ../reporting/rep707.php:251
+#: ../reporting/includes/reports_classes.inc:238
 msgid "Period Y-1"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:168 reporting/rep707.php:242
-#: reporting/includes/reports_classes.inc:234
-#: reporting/includes/reports_classes.inc:238
+#: ../gl/inquiry/profit_loss.php:168
+#: ../reporting/rep707.php:242
+#: ../reporting/includes/reports_classes.inc:238
 msgid "Budget"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:169 reporting/reports_main.php:289
-#: reporting/reports_main.php:335 reporting/reports_main.php:376
+#: ../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 ""
 
-#: gl/inquiry/profit_loss.php:230
+#: ../gl/inquiry/profit_loss.php:230
 msgid "Group/Account Name"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:233 reporting/rep707.php:206
+#: ../gl/inquiry/profit_loss.php:233
+#: ../reporting/rep707.php:206
 msgid "Achieved %"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:30
+#: ../gl/inquiry/tax_inquiry.php:30
 msgid "Tax Inquiry"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:82 reporting/rep709.php:172
-#: reporting/rep709.php:176
+#: ../gl/inquiry/tax_inquiry.php:82
+#: ../reporting/rep709.php:176
 msgid "Outputs"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:82 reporting/rep709.php:172
-#: reporting/rep709.php:176
+#: ../gl/inquiry/tax_inquiry.php:82
+#: ../reporting/rep709.php:176
 msgid "Inputs"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:100
+#: ../gl/inquiry/tax_inquiry.php:100
 msgid "Charged on sales"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:100 reporting/rep709.php:172
-#: reporting/rep709.php:176
+#: ../gl/inquiry/tax_inquiry.php:100
+#: ../reporting/rep709.php:176
 msgid "Output Tax"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:106
+#: ../gl/inquiry/tax_inquiry.php:106
 msgid "Paid on purchases"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:106 reporting/rep709.php:172
-#: reporting/rep709.php:176
+#: ../gl/inquiry/tax_inquiry.php:106
+#: ../reporting/rep709.php:176
 msgid "Input Tax"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:112
+#: ../gl/inquiry/tax_inquiry.php:112
 msgid "Net payable or collectible"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:119 reporting/rep709.php:203
-#: reporting/rep709.php:207
+#: ../gl/inquiry/tax_inquiry.php:119
+#: ../reporting/rep709.php:207
 msgid "Total payable or refund"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:16 gl/manage/bank_accounts.php.orig:16
-#: reporting/reports_main.php:238
+#: ../gl/manage/bank_accounts.php:16
+#: ../reporting/reports_main.php:238
 msgid "Bank Accounts"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:33 gl/manage/bank_accounts.php.orig:33
+#: ../gl/manage/bank_accounts.php:33
 msgid "The bank account name cannot be empty."
 msgstr ""
 
-#: gl/manage/bank_accounts.php:39 gl/manage/bank_accounts.php.orig:39
+#: ../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 gl/manage/bank_accounts.php.orig:52
+#: ../gl/manage/bank_accounts.php:52
 msgid "Bank account has been updated"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:61 gl/manage/bank_accounts.php.orig:61
+#: ../gl/manage/bank_accounts.php:61
 msgid "New bank account has been added"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:76 gl/manage/bank_accounts.php.orig:76
+#: ../gl/manage/bank_accounts.php:76
 msgid ""
 "Cannot delete this bank account because transactions have been created using "
 "this account."
 msgstr ""
 
-#: gl/manage/bank_accounts.php:82 gl/manage/bank_accounts.php.orig:82
+#: ../gl/manage/bank_accounts.php:82
 msgid ""
 "Cannot delete this bank account because POS definitions have been created "
 "using this account."
 msgstr ""
 
-#: gl/manage/bank_accounts.php:87 gl/manage/bank_accounts.php.orig:87
+#: ../gl/manage/bank_accounts.php:87
 msgid "Selected bank account has been deleted"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:106 gl/manage/bank_accounts.php.orig:106
-#: gl/view/bank_transfer_view.php:69 gl/view/bank_transfer_view.php:78
-#: gl/view/gl_deposit_view.php:66 gl/view/gl_payment_view.php:64
-#: inventory/prices.php:133 inventory/purchasing_data.php:129
-#: purchasing/view/view_supp_credit.php:49
-#: purchasing/view/view_supp_invoice.php:53
-#: purchasing/inquiry/po_search_completed.php:127
-#: purchasing/inquiry/po_search.php:136
-#: purchasing/inquiry/supplier_allocation_inquiry.php:133
-#: purchasing/inquiry/supplier_allocation_inquiry.php:143
-#: purchasing/inquiry/supplier_inquiry.php:76
-#: purchasing/inquiry/supplier_inquiry.php:175
-#: purchasing/inquiry/supplier_inquiry.php:186
-#: purchasing/inquiry/supplier_inquiry.php.orig:72
-#: purchasing/inquiry/supplier_inquiry.php.orig:169
-#: purchasing/inquiry/supplier_inquiry.php.orig:180
-#: 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:340 sales/customer_invoice.php:402
-#: sales/allocations/customer_allocation_main.php:98
-#: sales/allocations/customer_allocation_main.php:106
-#: sales/view/view_credit.php:70 sales/view/view_dispatch.php:86
-#: sales/view/view_invoice.php:85
-#: sales/inquiry/customer_allocation_inquiry.php:151
-#: sales/inquiry/customer_allocation_inquiry.php:161
-#: sales/inquiry/customer_inquiry.php:80
-#: sales/inquiry/customer_inquiry.php:232
-#: sales/inquiry/customer_inquiry.php:245
-#: sales/inquiry/customer_inquiry.php.orig:80
-#: sales/inquiry/customer_inquiry.php.orig:232
-#: sales/inquiry/customer_inquiry.php.orig:245
-#: sales/inquiry/sales_deliveries_view.php:189
-#: sales/inquiry/sales_orders_view.php:272
-#: sales/inquiry/sales_orders_view.php:286
-#: sales/inquiry/sales_orders_view.php.orig:270
-#: sales/inquiry/sales_orders_view.php.orig:284
-#: sales/customer_credit_invoice.php:237 sales/customer_invoice.php:404
+#: ../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:237
+#: ../sales/customer_delivery.php.orig:353
+#: ../sales/customer_invoice.php:470
+#: ../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_inquiry.php:76
+#: ../sales/inquiry/customer_inquiry.php:208
+#: ../sales/inquiry/customer_inquiry.php:221
+#: ../sales/inquiry/sales_deliveries_view.php:189
+#: ../sales/inquiry/sales_orders_view.php:294
+#: ../sales/inquiry/sales_orders_view.php:308
 msgid "Currency"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:106 gl/manage/bank_accounts.php.orig:106
+#: ../gl/manage/bank_accounts.php:109
 msgid "GL Account"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:107 gl/manage/bank_accounts.php.orig:107
-#: reporting/includes/doctext.inc:247
+#: ../gl/manage/bank_accounts.php:110
+#: ../reporting/includes/doctext.inc:260
 msgid "Bank"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:107 gl/manage/bank_accounts.php.orig:107
-#: includes/ui/ui_view.inc:488
+#: ../gl/manage/bank_accounts.php:110
+#: ../includes/ui/ui_view.inc:488
 msgid "Number"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:107 gl/manage/bank_accounts.php.orig:107
+#: ../gl/manage/bank_accounts.php:110
 msgid "Bank Address"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:107 gl/manage/bank_accounts.php.orig:107
+#: ../gl/manage/bank_accounts.php:110
 msgid "Dflt"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:163 gl/manage/bank_accounts.php.orig:163
+#: ../gl/manage/bank_accounts.php:167
 msgid "Bank Account Name:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:167 gl/manage/bank_accounts.php:171
-#: gl/manage/bank_accounts.php.orig:167 gl/manage/bank_accounts.php.orig:171
+#: ../gl/manage/bank_accounts.php:171
+#: ../gl/manage/bank_accounts.php:175
 msgid "Account Type:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:175 gl/manage/bank_accounts.php:179
-#: gl/manage/bank_accounts.php.orig:175 gl/manage/bank_accounts.php.orig:179
+#: ../gl/manage/bank_accounts.php:179
+#: ../gl/manage/bank_accounts.php:183
 msgid "Bank Account Currency:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:182 gl/manage/bank_accounts.php.orig:182
+#: ../gl/manage/bank_accounts.php:186
 msgid "Default currency account:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:185 gl/manage/bank_accounts.php:187
-#: gl/manage/bank_accounts.php.orig:185 gl/manage/bank_accounts.php.orig:187
+#: ../gl/manage/bank_accounts.php:189
+#: ../gl/manage/bank_accounts.php:191
 msgid "Bank Account GL Code:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:189 gl/manage/bank_accounts.php.orig:189
+#: ../gl/manage/bank_accounts.php:194
 msgid "Bank Name:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:190 gl/manage/bank_accounts.php.orig:190
+#: ../gl/manage/bank_accounts.php:195
+#: ../sales/manage/customer_branches.php:255
 msgid "Bank Account Number:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:191 gl/manage/bank_accounts.php.orig:191
+#: ../gl/manage/bank_accounts.php:196
 msgid "Bank Address:"
 msgstr ""
 
-#: gl/manage/currencies.php:16 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 ""
 
-#: gl/manage/currencies.php:29
+#: ../gl/manage/currencies.php:29
 msgid "The currency abbreviation must be entered."
 msgstr ""
 
-#: gl/manage/currencies.php:35
+#: ../gl/manage/currencies.php:35
 msgid "The currency name must be entered."
 msgstr ""
 
-#: gl/manage/currencies.php:41
+#: ../gl/manage/currencies.php:41
 msgid "The currency symbol must be entered."
 msgstr ""
 
-#: gl/manage/currencies.php:47
+#: ../gl/manage/currencies.php:47
 msgid "The hundredths name must be entered."
 msgstr ""
 
-#: gl/manage/currencies.php:69
+#: ../gl/manage/currencies.php:69
 msgid "Selected currency settings has been updated"
 msgstr ""
 
-#: gl/manage/currencies.php:76
+#: ../gl/manage/currencies.php:76
 msgid "New currency has been added"
 msgstr ""
 
-#: gl/manage/currencies.php:92
+#: ../gl/manage/currencies.php:92
 msgid ""
 "Cannot delete this currency, because customer accounts have been created "
 "referring to this currency."
 msgstr ""
 
-#: gl/manage/currencies.php:98
+#: ../gl/manage/currencies.php:98
 msgid ""
 "Cannot delete this currency, because supplier accounts have been created "
 "referring to this currency."
 msgstr ""
 
-#: gl/manage/currencies.php:104
+#: ../gl/manage/currencies.php:104
 msgid ""
 "Cannot delete this currency, because the company preferences uses this "
 "currency."
 msgstr ""
 
-#: gl/manage/currencies.php:111
+#: ../gl/manage/currencies.php:111
 msgid ""
 "Cannot delete this currency, because thre are bank accounts that use this "
 "currency."
 msgstr ""
 
-#: gl/manage/currencies.php:126
+#: ../gl/manage/currencies.php:126
 msgid "Selected currency has been deleted"
 msgstr ""
 
-#: gl/manage/currencies.php:139
+#: ../gl/manage/currencies.php:139
 msgid "Abbreviation"
 msgstr ""
 
-#: gl/manage/currencies.php:139
+#: ../gl/manage/currencies.php:139
 msgid "Symbol"
 msgstr ""
 
-#: gl/manage/currencies.php:139
+#: ../gl/manage/currencies.php:139
 msgid "Currency Name"
 msgstr ""
 
-#: gl/manage/currencies.php:140
+#: ../gl/manage/currencies.php:140
 msgid "Hundredths name"
 msgstr ""
 
-#: gl/manage/currencies.php:140
+#: ../gl/manage/currencies.php:140
 msgid "Country"
 msgstr ""
 
-#: gl/manage/currencies.php:140
+#: ../gl/manage/currencies.php:140
 msgid "Auto update"
 msgstr ""
 
-#: gl/manage/currencies.php:175
+#: ../gl/manage/currencies.php:175
 msgid "The marked currency is the home currency which cannot be deleted."
 msgstr ""
 
-#: gl/manage/currencies.php:201 gl/manage/currencies.php:206
+#: ../gl/manage/currencies.php:201
+#: ../gl/manage/currencies.php:206
 msgid "Currency Abbreviation:"
 msgstr ""
 
-#: gl/manage/currencies.php:209
+#: ../gl/manage/currencies.php:209
 msgid "Currency Symbol:"
 msgstr ""
 
-#: gl/manage/currencies.php:210
+#: ../gl/manage/currencies.php:210
 msgid "Currency Name:"
 msgstr ""
 
-#: gl/manage/currencies.php:211
+#: ../gl/manage/currencies.php:211
 msgid "Hundredths Name:"
 msgstr ""
 
-#: gl/manage/currencies.php:212
+#: ../gl/manage/currencies.php:212
 msgid "Country:"
 msgstr ""
 
-#: gl/manage/currencies.php:213
+#: ../gl/manage/currencies.php:213
 msgid "Automatic exchange rate update:"
 msgstr ""
 
-#: gl/manage/exchange_rates.php:24
+#: ../gl/manage/exchange_rates.php:24
 msgid "Exchange Rates"
 msgstr ""
 
-#: gl/manage/exchange_rates.php:39
+#: ../gl/manage/exchange_rates.php:39
 msgid "The exchange rate cannot be zero or a negative number."
 msgstr ""
 
-#: gl/manage/exchange_rates.php:45
+#: ../gl/manage/exchange_rates.php:45
 msgid "The exchange rate for the date is already there."
 msgstr ""
 
-#: gl/manage/exchange_rates.php:127 gl/manage/exchange_rates.php:133
+#: ../gl/manage/exchange_rates.php:127
+#: ../gl/manage/exchange_rates.php:133
 msgid "Date to Use From:"
 msgstr ""
 
-#: gl/manage/exchange_rates.php:141 includes/ui/ui_view.inc:288
-#: includes/ui/ui_view.inc:290
+#: ../gl/manage/exchange_rates.php:141
+#: ../includes/ui/ui_view.inc:288
+#: ../includes/ui/ui_view.inc:290
 msgid "Exchange Rate:"
 msgstr ""
 
-#: gl/manage/exchange_rates.php:142
+#: ../gl/manage/exchange_rates.php:142
 msgid "Get current ECB rate"
 msgstr ""
 
-#: gl/manage/exchange_rates.php:148
+#: ../gl/manage/exchange_rates.php:148
 msgid "Exchange rates are entered against the company currency."
 msgstr ""
 
-#: gl/manage/exchange_rates.php:179
+#: ../gl/manage/exchange_rates.php:179
 msgid "Select a currency :"
 msgstr ""
 
-#: gl/manage/exchange_rates.php:195
+#: ../gl/manage/exchange_rates.php:195
 msgid "Date to Use From"
 msgstr ""
 
-#: gl/manage/exchange_rates.php:196
+#: ../gl/manage/exchange_rates.php:196
 msgid "Exchange Rate"
 msgstr ""
 
-#: gl/manage/exchange_rates.php:205
+#: ../gl/manage/exchange_rates.php:205
 msgid "The selected currency is the company currency."
 msgstr ""
 
-#: 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 ""
 
-#: gl/manage/gl_account_classes.php:16
+#: ../gl/manage/gl_account_classes.php:16
 msgid "GL Account Classes"
 msgstr ""
 
-#: gl/manage/gl_account_classes.php:31
+#: ../gl/manage/gl_account_classes.php:31
 msgid "The account class ID cannot be empty."
 msgstr ""
 
-#: gl/manage/gl_account_classes.php:37
+#: ../gl/manage/gl_account_classes.php:37
 msgid "The account class name cannot be empty."
 msgstr ""
 
-#: gl/manage/gl_account_classes.php:57
+#: ../gl/manage/gl_account_classes.php:57
 msgid "Selected account class settings has been updated"
 msgstr ""
 
-#: gl/manage/gl_account_classes.php:62
+#: ../gl/manage/gl_account_classes.php:62
 msgid "New account class has been added"
 msgstr ""
 
-#: gl/manage/gl_account_classes.php:77
+#: ../gl/manage/gl_account_classes.php:77
 msgid ""
 "Cannot delete this account class because GL account types have been created "
 "referring to it."
 msgstr ""
 
-#: gl/manage/gl_account_classes.php:93
+#: ../gl/manage/gl_account_classes.php:93
 msgid "Selected account class has been deleted"
 msgstr ""
 
-#: gl/manage/gl_account_classes.php:110
+#: ../gl/manage/gl_account_classes.php:110
 msgid "Class ID"
 msgstr ""
 
-#: gl/manage/gl_account_classes.php:110
+#: ../gl/manage/gl_account_classes.php:110
 msgid "Class Name"
 msgstr ""
 
-#: gl/manage/gl_account_classes.php:110 gl/manage/gl_account_types.php:128
+#: ../gl/manage/gl_account_classes.php:110
+#: ../gl/manage/gl_account_types.php:128
 msgid "Class Type"
 msgstr ""
 
-#: gl/manage/gl_account_classes.php:112 gl/manage/gl_account_classes.php:169
-#: reporting/rep706.php:211
+#: ../gl/manage/gl_account_classes.php:112
+#: ../gl/manage/gl_account_classes.php:169
+#: ../reporting/rep706.php:211
 msgid "Balance Sheet"
 msgstr ""
 
-#: gl/manage/gl_account_classes.php:157 gl/manage/gl_account_classes.php:163
+#: ../gl/manage/gl_account_classes.php:157
+#: ../gl/manage/gl_account_classes.php:163
 msgid "Class ID:"
 msgstr ""
 
-#: gl/manage/gl_account_classes.php:166
+#: ../gl/manage/gl_account_classes.php:166
 msgid "Class Name:"
 msgstr ""
 
-#: gl/manage/gl_account_classes.php:171 gl/manage/gl_account_types.php:192
+#: ../gl/manage/gl_account_classes.php:171
+#: ../gl/manage/gl_account_types.php:192
 msgid "Class Type:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:16 gl/manage/gl_accounts.php.orig:16
-#: reporting/rep701.php:115
+#: ../gl/manage/gl_accounts.php:16
+#: ../reporting/rep701.php:115
 msgid "Chart of Accounts"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:53 gl/manage/gl_accounts.php.orig:53
+#: ../gl/manage/gl_accounts.php:53
 msgid "The account code must be entered."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:59 gl/manage/gl_accounts.php.orig:59
+#: ../gl/manage/gl_accounts.php:59
 msgid "The account name cannot be empty."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:65 gl/manage/gl_accounts.php.orig:65
+#: ../gl/manage/gl_accounts.php:65
 msgid "The account code must be numeric."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:81 gl/manage/gl_accounts.php.orig:81
-#: gl/manage/gl_accounts.php:80
+#: ../gl/manage/gl_accounts.php:80
 msgid "The account belongs to a bank account and cannot be inactivated."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:90 gl/manage/gl_accounts.php.orig:90
-#: gl/manage/gl_accounts.php:89
+#: ../gl/manage/gl_accounts.php:89
 msgid "Account data has been updated."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:99 gl/manage/gl_accounts.php.orig:99
-#: gl/manage/gl_accounts.php:98
+#: ../gl/manage/gl_accounts.php:98
 msgid "New account has been added."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:116 gl/manage/gl_accounts.php.orig:116
-#: gl/manage/gl_accounts.php:117
+#: ../gl/manage/gl_accounts.php:102
+msgid "Account not added, possible duplicate Account Code."
+msgstr ""
+
+#: ../gl/manage/gl_accounts.php:117
 msgid ""
 "Cannot delete this account because transactions have been created using this "
 "account."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:122 gl/manage/gl_accounts.php.orig:122
-#: gl/manage/gl_accounts.php:123
+#: ../gl/manage/gl_accounts.php:123
 msgid ""
 "Cannot delete this account because it is used as one of the company default "
 "GL accounts."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:128 gl/manage/gl_accounts.php.orig:128
-#: gl/manage/gl_accounts.php:129
+#: ../gl/manage/gl_accounts.php:129
 msgid "Cannot delete this account because it is used by a bank account."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:134 gl/manage/gl_accounts.php.orig:134
-#: gl/manage/gl_accounts.php:135
+#: ../gl/manage/gl_accounts.php:135
 msgid ""
 "Cannot delete this account because it is used by one or more Item Categories."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:140 gl/manage/gl_accounts.php.orig:140
-#: gl/manage/gl_accounts.php:141
+#: ../gl/manage/gl_accounts.php:141
 msgid "Cannot delete this account because it is used by one or more Items."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:146 gl/manage/gl_accounts.php.orig:146
-#: gl/manage/gl_accounts.php:147
+#: ../gl/manage/gl_accounts.php:147
 msgid "Cannot delete this account because it is used by one or more Taxes."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:152 gl/manage/gl_accounts.php.orig:152
-#: gl/manage/gl_accounts.php:153
+#: ../gl/manage/gl_accounts.php:153
 msgid ""
 "Cannot delete this account because it is used by one or more Customer "
 "Branches."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:158 gl/manage/gl_accounts.php.orig:158
-#: gl/manage/gl_accounts.php:159
+#: ../gl/manage/gl_accounts.php:158
 msgid "Cannot delete this account because it is used by one or more suppliers."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:164 gl/manage/gl_accounts.php.orig:164
-#: gl/manage/gl_accounts.php:165
+#: ../gl/manage/gl_accounts.php:164
 msgid ""
 "Cannot delete this account because it is used by one or more Quick Entry "
 "Lines."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:182 gl/manage/gl_accounts.php.orig:182
-#: gl/manage/gl_accounts.php:183
+#: ../gl/manage/gl_accounts.php:182
 msgid "Selected account has been deleted"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:197 gl/manage/gl_accounts.php.orig:197
-#: gl/manage/gl_accounts.php:198
+#: ../gl/manage/gl_accounts.php:197
 msgid "New account"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:243 gl/manage/gl_accounts.php.orig:243
-#: gl/manage/gl_accounts.php:244
+#: ../gl/manage/gl_accounts.php:243
 msgid "Account Code 2:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:245 gl/manage/gl_accounts.php.orig:245
-#: gl/manage/gl_accounts.php:246
+#: ../gl/manage/gl_accounts.php:245
 msgid "Account Name:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:247 gl/manage/gl_accounts.php.orig:247
-#: gl/manage/gl_accounts.php:248
+#: ../gl/manage/gl_accounts.php:247
 msgid "Account Group:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:249 gl/manage/gl_accounts.php.orig:249
-#: gl/manage/gl_accounts.php:250
+#: ../gl/manage/gl_accounts.php:249
 msgid "Account Tags:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:251 gl/manage/gl_accounts.php.orig:251
-#: gl/manage/gl_accounts.php:252
+#: ../gl/manage/gl_accounts.php:251
 msgid "Account status:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:256 gl/manage/gl_accounts.php.orig:256
-#: gl/manage/gl_accounts.php:257
+#: ../gl/manage/gl_accounts.php:256
 msgid "Add Account"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:260 gl/manage/gl_accounts.php.orig:260
-#: gl/manage/gl_accounts.php:261
+#: ../gl/manage/gl_accounts.php:260
 msgid "Update Account"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:261 gl/manage/gl_accounts.php.orig:261
-#: gl/manage/gl_accounts.php:262
+#: ../gl/manage/gl_accounts.php:261
 msgid "Delete account"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:16
+#: ../gl/manage/gl_account_types.php:16
 msgid "GL Account Groups"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:29
+#: ../gl/manage/gl_account_types.php:29
 msgid "The account group id cannot be empty."
 msgstr ""
 
-#: gl/manage/gl_account_types.php:35
+#: ../gl/manage/gl_account_types.php:35
 msgid "The account group name cannot be empty."
 msgstr ""
 
-#: gl/manage/gl_account_types.php:42
+#: ../gl/manage/gl_account_types.php:42
 msgid "This account group id is already in use."
 msgstr ""
 
-#: gl/manage/gl_account_types.php:50
+#: ../gl/manage/gl_account_types.php:50
 msgid "You cannot set an account group to be a subgroup of itself."
 msgstr ""
 
-#: gl/manage/gl_account_types.php:68
+#: ../gl/manage/gl_account_types.php:68
 msgid "Selected account type has been updated"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:73
+#: ../gl/manage/gl_account_types.php:73
 msgid "New account type has been added"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:89
+#: ../gl/manage/gl_account_types.php:89
 msgid ""
 "Cannot delete this account group because GL accounts have been created "
 "referring to it."
 msgstr ""
 
-#: gl/manage/gl_account_types.php:95
+#: ../gl/manage/gl_account_types.php:95
 msgid ""
 "Cannot delete this account group because GL account groups have been created "
 "referring to it."
 msgstr ""
 
-#: gl/manage/gl_account_types.php:111
+#: ../gl/manage/gl_account_types.php:111
 msgid "Selected account group has been deleted"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:128
+#: ../gl/manage/gl_account_types.php:128
 msgid "Group ID"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:128 sales/manage/sales_groups.php:85
+#: ../gl/manage/gl_account_types.php:128
+#: ../sales/manage/sales_groups.php:85
 msgid "Group Name"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:128
+#: ../gl/manage/gl_account_types.php:128
 msgid "Subgroup Of"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:187
+#: ../gl/manage/gl_account_types.php:187
 msgid "ID:"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:190
+#: ../gl/manage/gl_account_types.php:190
 msgid "Subgroup Of:"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:16
+#: ../gl/manage/gl_quick_entries.php:16
 msgid "Quick Entries"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:58 includes/ui/radio.ui_input.inc:204
-#: includes/ui/simple_crud_class.inc:221 includes/ui/ui_input.inc:204
-#: includes/ui/ui_input.inc:205
+#: ../gl/manage/gl_quick_entries.php:58
+#: ../includes/ui/simple_crud_class.inc:221
+#: ../includes/ui/ui_input.inc:206
 msgid "Add new"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:73
+#: ../gl/manage/gl_quick_entries.php:73
 msgid "The Quick Entry description cannot be empty."
 msgstr ""
 
-#: 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 ""
 
-#: gl/manage/gl_quick_entries.php:86
+#: ../gl/manage/gl_quick_entries.php:86
 msgid "The base amount description cannot be empty."
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:106
+#: ../gl/manage/gl_quick_entries.php:106
 msgid "Selected quick entry has been updated"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:112
+#: ../gl/manage/gl_quick_entries.php:112
 msgid "New quick entry has been added"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:124
+#: ../gl/manage/gl_quick_entries.php:124
 msgid "Selected quick entry line has been updated"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:130
+#: ../gl/manage/gl_quick_entries.php:130
 msgid "New quick entry line has been added"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:142
+#: ../gl/manage/gl_quick_entries.php:142
 msgid "Selected quick entry has been deleted"
 msgstr ""
 
-#: 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 ""
 
-#: gl/manage/gl_quick_entries.php:163
+#: ../gl/manage/gl_quick_entries.php:163
 msgid "Selected quick entry line has been deleted"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:171
+#: ../gl/manage/gl_quick_entries.php:171
 msgid "Base Amount"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:226
+#: ../gl/manage/gl_quick_entries.php:226
 msgid "Entry Type"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:230
+#: ../gl/manage/gl_quick_entries.php:230
 msgid "Balance Based"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:240 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 ""
 
-#: gl/manage/gl_quick_entries.php:245
+#: ../gl/manage/gl_quick_entries.php:245
 msgid "Base Amount Description"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:246
+#: ../gl/manage/gl_quick_entries.php:246
 msgid "Default Base Amount"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:255
+#: ../gl/manage/gl_quick_entries.php:255
 msgid "Quick Entry Lines"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:261 gl/manage/gl_quick_entries.php:263
-#: gl/manage/gl_quick_entries.php:265
+#: ../gl/manage/gl_quick_entries.php:261
+#: ../gl/manage/gl_quick_entries.php:263
+#: ../gl/manage/gl_quick_entries.php:265
 msgid "Post"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:261 gl/manage/gl_quick_entries.php:263
-#: gl/manage/gl_quick_entries.php:265
+#: ../gl/manage/gl_quick_entries.php:261
+#: ../gl/manage/gl_quick_entries.php:263
+#: ../gl/manage/gl_quick_entries.php:265
 msgid "Account/Tax Type"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:320
+#: ../gl/manage/gl_quick_entries.php:320
 msgid "Posted"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:329 sales/customer_delivery.php:433
-#: sales/customer_invoice.php:468 sales/customer_invoice.php:470
+#: ../gl/manage/gl_quick_entries.php:329
+#: ../sales/customer_delivery.php.orig:446
+#: ../sales/customer_invoice.php:542
+#: ../sales/customer_invoice.php:545
 msgid "Tax Type"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:337
+#: ../gl/manage/gl_quick_entries.php:337
 msgid "Part"
 msgstr ""
 
-#: gl/manage/revaluate_currencies.php:23
+#: ../gl/manage/revaluate_currencies.php:23
 msgid "Revaluation of Currency Accounts"
 msgstr ""
 
-#: gl/manage/revaluate_currencies.php:32
+#: ../gl/manage/revaluate_currencies.php:32
 msgid "No Revaluation was needed"
 msgstr ""
 
-#: gl/manage/revaluate_currencies.php:40
+#: ../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
+#: ../gl/manage/revaluate_currencies.php:104
 msgid "Date for Revaluation:"
 msgstr ""
 
-#: gl/manage/revaluate_currencies.php:109
+#: ../gl/manage/revaluate_currencies.php:109
 msgid "Revaluate Currencies"
 msgstr ""
 
-#: gl/view/accrual_trans.php:16
+#: ../gl/view/accrual_trans.php:16
 msgid "Search General Ledger Transactions for account: "
 msgstr ""
 
-#: gl/view/accrual_trans.php:41 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 ""
 
-#: gl/view/bank_transfer_view.php:17
+#: ../gl/view/bank_transfer_view.php:17
 msgid "View Bank Transfer"
 msgstr ""
 
-#: gl/view/bank_transfer_view.php:67 gl/view/gl_payment_view.php:62
-#: 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 ""
 
-#: gl/view/bank_transfer_view.php:76 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 ""
 
-#: gl/view/bank_transfer_view.php:84
+#: ../gl/view/bank_transfer_view.php:84
 msgid "Transfer Type"
 msgstr ""
 
-#: gl/view/bank_transfer_view.php:92 inventory/view/view_transfer.php:76
+#: ../gl/view/bank_transfer_view.php:92
+#: ../inventory/view/view_transfer.php:76
 msgid "This transfer has been voided."
 msgstr ""
 
-#: gl/view/gl_deposit_view.php:17
+#: ../gl/view/gl_deposit_view.php:17
 msgid "View Bank Deposit"
 msgstr ""
 
-#: gl/view/gl_deposit_view.php:48
+#: ../gl/view/gl_deposit_view.php:48
 msgid "GL Deposit"
 msgstr ""
 
-#: gl/view/gl_deposit_view.php:71 gl/includes/db/gl_db_banking.inc:212
-#: reporting/reports_main.php:88 reporting/reports_main.php:95
-#: reporting/reports_main.php:102 reporting/reports_main.php:114
-#: reporting/reports_main.php:121 reporting/reports_main.php:127
-#: reporting/reports_main.php:163 reporting/reports_main.php:169
-#: reporting/reports_main.php:219
+#: ../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 ""
 
-#: gl/view/gl_deposit_view.php:72
+#: ../gl/view/gl_deposit_view.php:72
 msgid "Deposit Type"
 msgstr ""
 
-#: gl/view/gl_deposit_view.php:81
+#: ../gl/view/gl_deposit_view.php:81
 msgid "This deposit has been voided."
 msgstr ""
 
-#: gl/view/gl_deposit_view.php:87
+#: ../gl/view/gl_deposit_view.php:87
 msgid "There are no items for this deposit."
 msgstr ""
 
-#: gl/view/gl_deposit_view.php:92
+#: ../gl/view/gl_deposit_view.php:92
 msgid "Items for this Deposit"
 msgstr ""
 
-#: gl/view/gl_deposit_view.php:94 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 ""
 
-#: gl/view/gl_deposit_view.php:99 gl/view/gl_deposit_view.php:102
-#: gl/view/gl_deposit_view.php:105 gl/view/gl_payment_view.php:98
-#: gl/view/gl_payment_view.php:101 gl/view/gl_payment_view.php:104
-#: gl/view/gl_trans_view.php:63 gl/view/gl_trans_view.php:66
-#: gl/view/gl_trans_view.php:69 gl/includes/ui/gl_bank_ui.inc: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:132
-#: gl/includes/ui/gl_bank_ui.inc.orig:135
-#: gl/includes/ui/gl_bank_ui.inc.orig:138 gl/includes/ui/gl_journal_ui.inc:83
-#: gl/includes/ui/gl_journal_ui.inc:86 gl/includes/ui/gl_journal_ui.inc:89
-#: reporting/rep701.php:109
+#: ../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 ""
 
-#: 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:132
-#: gl/includes/ui/gl_bank_ui.inc.orig:135
-#: gl/includes/ui/gl_bank_ui.inc.orig:138 gl/includes/ui/gl_journal_ui.inc:83
-#: gl/includes/ui/gl_journal_ui.inc:86 gl/includes/ui/gl_journal_ui.inc:89
+#: ../gl/view/gl_deposit_view.php: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 ""
 
-#: gl/view/gl_payment_view.php:17
+#: ../gl/view/gl_payment_view.php:17
 msgid "View Bank Payment"
 msgstr ""
 
-#: gl/view/gl_payment_view.php:46
+#: ../gl/view/gl_payment_view.php:46
 msgid "GL Payment"
 msgstr ""
 
-#: gl/view/gl_payment_view.php:69
+#: ../gl/view/gl_payment_view.php:69
 msgid "Pay To"
 msgstr ""
 
-#: 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
+#: ../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 ""
 
-#: gl/view/gl_payment_view.php:79 purchasing/view/view_supp_payment.php:85
+#: ../gl/view/gl_payment_view.php:79
+#: ../purchasing/view/view_supp_payment.php:85
 msgid "This payment has been voided."
 msgstr ""
 
-#: gl/view/gl_payment_view.php:85
+#: ../gl/view/gl_payment_view.php:85
 msgid "There are no items for this payment."
 msgstr ""
 
-#: gl/view/gl_payment_view.php:90
+#: ../gl/view/gl_payment_view.php:90
 msgid "Items for this Payment"
 msgstr ""
 
-#: gl/view/gl_trans_view.php:16 gl/view/gl_trans_view.php:35
+#: ../gl/view/gl_trans_view.php:16
+#: ../gl/view/gl_trans_view.php:35
 msgid "General Ledger Transaction Details"
 msgstr ""
 
-#: gl/view/gl_trans_view.php:54
+#: ../gl/view/gl_trans_view.php:39
+#: ../gl/includes/ui/gl_journal_ui.inc:97
+msgid "Counterparty"
+msgstr ""
+
+#: ../gl/view/gl_trans_view.php:59
 msgid "No general ledger transactions have been created for"
 msgstr ""
 
-#: gl/view/gl_trans_view.php:54
+#: ../gl/view/gl_trans_view.php:59
 msgid "number"
 msgstr ""
 
-#: gl/view/gl_trans_view.php:120
+#: ../gl/view/gl_trans_view.php:129
 msgid "This transaction has been voided."
 msgstr ""
 
-#: gl/includes/db/gl_db_banking.inc:44 gl/includes/db/gl_db_banking.inc:47
-#: gl/includes/db/gl_db_banking.inc:59 gl/includes/db/gl_db_banking.inc:62
+#: ../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 ""
 
-#: gl/includes/db/gl_db_banking.inc:212 reporting/reports_main.php:89
-#: reporting/reports_main.php:96 reporting/reports_main.php:103
-#: reporting/reports_main.php:115 reporting/reports_main.php:122
-#: reporting/reports_main.php:128 reporting/reports_main.php:164
-#: reporting/reports_main.php:170 reporting/reports_main.php:220
+#: ../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 ""
 
-#: gl/includes/db/gl_db_banking.inc:428
+#: ../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
+#: ../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:23
-#: gl/includes/ui/gl_journal_ui.inc:27
-#: inventory/includes/item_adjustments_ui.inc:39
-#: inventory/includes/stock_transfers_ui.inc:42
-#: manufacturing/work_order_add_finished.php:208
-#: manufacturing/work_order_costs.php:152
-#: purchasing/allocations/supplier_allocate.php:54
-#: sales/allocations/customer_allocate.php:53
-#: sales/includes/ui/sales_credit_ui.inc:121
+#: ../gl/includes/ui/gl_bank_ui.inc:24
+#: ../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 ""
 
-#: gl/includes/ui/gl_bank_ui.inc:51 gl/includes/ui/gl_bank_ui.inc.orig:50
+#: ../gl/includes/ui/gl_bank_ui.inc:51
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:53
 msgid "Pay To:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:56 gl/includes/ui/gl_bank_ui.inc.orig:55
+#: ../gl/includes/ui/gl_bank_ui.inc:56
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:58
 msgid "To the Order of:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:63 gl/includes/ui/gl_bank_ui.inc.orig:62
-#: inventory/purchasing_data.php:184 inventory/purchasing_data.php:188
-#: purchasing/includes/ui/invoice_ui.inc:73
-#: purchasing/includes/ui/invoice_ui.inc:80
-#: purchasing/includes/ui/po_ui.inc:120 purchasing/includes/ui/po_ui.inc:125
+#: ../gl/includes/ui/gl_bank_ui.inc: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
+#: ../purchasing/includes/ui/po_ui.inc.orig:125
+#: ../purchasing/includes/ui/po_ui.inc.orig:130
 msgid "Supplier:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:66 gl/includes/ui/gl_bank_ui.inc.orig:65
-#: 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:282
+#: ../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.orig:278
 msgid "Customer:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:70 gl/includes/ui/gl_bank_ui.inc.orig:69
-#: 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:289 sales/customer_payments.php:363
-#: sales/customer_payments.php.orig:362
+#: ../gl/includes/ui/gl_bank_ui.inc:70
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:72
+#: ../sales/customer_payments.php:363
+#: ../sales/manage/recurrent_invoices.php:172
+#: ../sales/includes/ui/sales_credit_ui.inc:37
+#: ../sales/includes/ui/sales_order_ui.inc.orig:285
 msgid "Branch:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:84 gl/includes/ui/gl_bank_ui.inc:87
-#: sales/customer_payments.php:369 sales/customer_payments.php:372
-#: sales/customer_payments.php.orig:371
+#: ../gl/includes/ui/gl_bank_ui.inc:84
+#: ../gl/includes/ui/gl_bank_ui.inc:87
+#: ../sales/customer_payments.php:372
 msgid "This customer account is on hold."
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:99 gl/includes/ui/gl_bank_ui.inc.orig:87
-#: gl/includes/ui/gl_journal_ui.inc:58 gl/includes/ui/gl_journal_ui.inc:62
-#: purchasing/includes/ui/invoice_ui.inc:231
+#: ../gl/includes/ui/gl_bank_ui.inc: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 ""
 
-#: gl/includes/ui/gl_bank_ui.inc:185 gl/includes/ui/gl_bank_ui.inc.orig:167
-#: 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:520
-#: purchasing/includes/ui/po_ui.inc:267
-#: sales/includes/ui/sales_credit_ui.inc:198
-#: sales/includes/ui/sales_order_ui.inc:203
-#: sales/includes/ui/sales_order_ui.inc:207
+#: ../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
+#: ../purchasing/includes/ui/po_ui.inc.orig:274
+#: ../sales/includes/ui/sales_credit_ui.inc:198
+#: ../sales/includes/ui/sales_order_ui.inc.orig:203
 msgid "Edit document line"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:187 gl/includes/ui/gl_bank_ui.inc.orig:169
-#: includes/ui/simple_crud_class.inc:54
-#: inventory/includes/item_adjustments_ui.inc:90
-#: inventory/includes/stock_transfers_ui.inc:82
-#: manufacturing/includes/work_order_issue_ui.inc:61
-#: purchasing/includes/ui/invoice_ui.inc:285
-#: purchasing/includes/ui/po_ui.inc:269
-#: sales/includes/ui/sales_credit_ui.inc:200
-#: sales/includes/ui/sales_order_ui.inc:205
-#: sales/includes/ui/sales_order_ui.inc:209
+#: ../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
+#: ../purchasing/includes/ui/po_ui.inc.orig:276
+#: ../sales/includes/ui/sales_credit_ui.inc:200
+#: ../sales/includes/ui/sales_order_ui.inc.orig:205
 msgid "Remove line from document"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:276 gl/includes/ui/gl_bank_ui.inc.orig:258
-#: gl/includes/ui/gl_journal_ui.inc:222 includes/ui/simple_crud_class.inc:56
-#: inventory/includes/item_adjustments_ui.inc:158
-#: inventory/includes/stock_transfers_ui.inc:138
-#: manufacturing/includes/work_order_issue_ui.inc:132
-#: purchasing/includes/ui/po_ui.inc:443
-#: sales/includes/ui/sales_credit_ui.inc:294
-#: sales/includes/ui/sales_order_ui.inc:556
-#: sales/includes/ui/sales_order_ui.inc:560
+#: ../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.orig:458
+#: ../sales/includes/ui/sales_credit_ui.inc:294
+#: ../sales/includes/ui/sales_order_ui.inc.orig:556
 msgid "Confirm changes"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:278 gl/includes/ui/gl_bank_ui.inc.orig:260
-#: gl/includes/ui/gl_journal_ui.inc:224 includes/ui/simple_crud_class.inc:58
-#: inventory/includes/item_adjustments_ui.inc:160
-#: inventory/includes/stock_transfers_ui.inc:140
-#: manufacturing/includes/work_order_issue_ui.inc:134
-#: purchasing/includes/ui/po_ui.inc:445
-#: sales/includes/ui/sales_credit_ui.inc:296
-#: sales/includes/ui/sales_order_ui.inc:558
-#: sales/includes/ui/sales_order_ui.inc:562
+#: ../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.orig:460
+#: ../sales/includes/ui/sales_credit_ui.inc:296
+#: ../sales/includes/ui/sales_order_ui.inc.orig:558
 msgid "Cancel changes"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:283 gl/includes/ui/gl_bank_ui.inc.orig:265
-#: gl/includes/ui/gl_journal_ui.inc:228
-#: inventory/includes/item_adjustments_ui.inc:166
-#: inventory/includes/stock_transfers_ui.inc:146
-#: manufacturing/includes/work_order_issue_ui.inc:140
-#: purchasing/includes/ui/po_ui.inc:451
-#: sales/includes/ui/sales_credit_ui.inc:302
-#: sales/includes/ui/sales_order_ui.inc:564
-#: sales/includes/ui/sales_order_ui.inc:568
+#: ../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.orig:466
+#: ../sales/includes/ui/sales_credit_ui.inc:302
+#: ../sales/includes/ui/sales_order_ui.inc.orig:564
 msgid "Add Item"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:284 gl/includes/ui/gl_bank_ui.inc.orig:266
-#: inventory/includes/item_adjustments_ui.inc:167
-#: inventory/includes/stock_transfers_ui.inc:147
-#: manufacturing/includes/work_order_issue_ui.inc:141
-#: purchasing/includes/ui/po_ui.inc:452
-#: sales/includes/ui/sales_credit_ui.inc:303
-#: sales/includes/ui/sales_order_ui.inc:565
-#: sales/includes/ui/sales_order_ui.inc:569
+#: ../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.orig:467
+#: ../sales/includes/ui/sales_credit_ui.inc:303
+#: ../sales/includes/ui/sales_order_ui.inc.orig:565
 msgid "Add new item to document"
 msgstr ""
 
-#: gl/includes/ui/gl_journal_ui.inc:38
+#: ../gl/includes/ui/gl_journal_ui.inc:38
 msgid "Reverse Transaction:"
 msgstr ""
 
-#: gl/includes/ui/gl_journal_ui.inc:46 includes/sysnames.inc:98
+#: ../gl/includes/ui/gl_journal_ui.inc:46
+#: ../includes/sysnames.inc:98
 msgid "Quick Entry"
 msgstr ""
 
-#: gl/includes/ui/gl_journal_ui.inc:57
+#: ../gl/includes/ui/gl_journal_ui.inc:57
 msgid "balance from account"
 msgstr ""
 
-#: gl/includes/ui/gl_journal_ui.inc:123
+#: ../gl/includes/ui/gl_journal_ui.inc:135
 msgid "Edit journal line"
 msgstr ""
 
-#: gl/includes/ui/gl_journal_ui.inc:125
+#: ../gl/includes/ui/gl_journal_ui.inc:137
 msgid "Remove line from journal"
 msgstr ""
 
-#: gl/includes/ui/gl_journal_ui.inc:229
+#: ../gl/includes/ui/gl_journal_ui.inc:200
+#: ../gl/includes/ui/gl_journal_ui.inc:232
+msgid "[Select account]"
+msgstr ""
+
+#: ../gl/includes/ui/gl_journal_ui.inc:265
 msgid "Add new line to journal"
 msgstr ""
 
-#: includes/access_levels.inc:56
+#: ../includes/access_levels.inc:56
 msgid "System administration"
 msgstr ""
 
-#: includes/access_levels.inc:57
+#: ../includes/access_levels.inc:57
 msgid "Company setup"
 msgstr ""
 
-#: includes/access_levels.inc:58
+#: ../includes/access_levels.inc:58
 msgid "Special maintenance"
 msgstr ""
 
-#: includes/access_levels.inc:59
+#: ../includes/access_levels.inc:59
 msgid "Sales configuration"
 msgstr ""
 
-#: includes/access_levels.inc:60
+#: ../includes/access_levels.inc:60
 msgid "Sales transactions"
 msgstr ""
 
-#: includes/access_levels.inc:61
+#: ../includes/access_levels.inc:61
 msgid "Sales related reports"
 msgstr ""
 
-#: includes/access_levels.inc:62
+#: ../includes/access_levels.inc:62
 msgid "Purchase configuration"
 msgstr ""
 
-#: includes/access_levels.inc:63
+#: ../includes/access_levels.inc:63
 msgid "Purchase transactions"
 msgstr ""
 
-#: includes/access_levels.inc:64
+#: ../includes/access_levels.inc:64
 msgid "Purchase analytics"
 msgstr ""
 
-#: includes/access_levels.inc:65
+#: ../includes/access_levels.inc:65
 msgid "Inventory configuration"
 msgstr ""
 
-#: includes/access_levels.inc:66
+#: ../includes/access_levels.inc:66
 msgid "Inventory operations"
 msgstr ""
 
-#: includes/access_levels.inc:67
+#: ../includes/access_levels.inc:67
 msgid "Inventory analytics"
 msgstr ""
 
-#: includes/access_levels.inc:68
+#: ../includes/access_levels.inc:68
 msgid "Manufacturing configuration"
 msgstr ""
 
-#: includes/access_levels.inc:69
+#: ../includes/access_levels.inc:69
 msgid "Manufacturing transactions"
 msgstr ""
 
-#: includes/access_levels.inc:70
+#: ../includes/access_levels.inc:70
 msgid "Manufacturing analytics"
 msgstr ""
 
-#: includes/access_levels.inc:71
+#: ../includes/access_levels.inc:71
 msgid "Dimensions configuration"
 msgstr ""
 
-#: includes/access_levels.inc:72 inventory/manage/items.php:341
-#: reporting/reports_main.php:223
+#: ../includes/access_levels.inc:72
+#: ../inventory/manage/items.php:348
+#: ../inventory/manage/items.php.orig:341
+#: ../reporting/reports_main.php:223
 msgid "Dimensions"
 msgstr ""
 
-#: includes/access_levels.inc:73
+#: ../includes/access_levels.inc:73
 msgid "Banking & GL configuration"
 msgstr ""
 
-#: includes/access_levels.inc:74
+#: ../includes/access_levels.inc:74
 msgid "Banking & GL transactions"
 msgstr ""
 
-#: includes/access_levels.inc:75
+#: ../includes/access_levels.inc:75
 msgid "Banking & GL analytics"
 msgstr ""
 
-#: includes/access_levels.inc:93
+#: ../includes/access_levels.inc:93
 msgid "Install/update companies"
 msgstr ""
 
-#: includes/access_levels.inc:94
+#: ../includes/access_levels.inc:94
 msgid "Install/update languages"
 msgstr ""
 
-#: includes/access_levels.inc:95
+#: ../includes/access_levels.inc:95
 msgid "Install/upgrade modules"
 msgstr ""
 
-#: includes/access_levels.inc:96
+#: ../includes/access_levels.inc:96
 msgid "Software upgrades"
 msgstr ""
 
-#: includes/access_levels.inc:100
+#: ../includes/access_levels.inc:100
 msgid "Company parameters"
 msgstr ""
 
-#: includes/access_levels.inc:101
+#: ../includes/access_levels.inc:101
 msgid "Access levels edition"
 msgstr ""
 
-#: includes/access_levels.inc:102
+#: ../includes/access_levels.inc:102
 msgid "Users setup"
 msgstr ""
 
-#: includes/access_levels.inc:103
+#: ../includes/access_levels.inc:103
 msgid "Point of sales definitions"
 msgstr ""
 
-#: includes/access_levels.inc:104
+#: ../includes/access_levels.inc:104
 msgid "Printers configuration"
 msgstr ""
 
-#: includes/access_levels.inc:105
+#: ../includes/access_levels.inc:105
 msgid "Print profiles"
 msgstr ""
 
-#: includes/access_levels.inc:106
+#: ../includes/access_levels.inc:106
 msgid "Payment terms"
 msgstr ""
 
-#: includes/access_levels.inc:107
+#: ../includes/access_levels.inc:107
 msgid "Shipping ways"
 msgstr ""
 
-#: includes/access_levels.inc:108
+#: ../includes/access_levels.inc:108
 msgid "Credit status definitions changes"
 msgstr ""
 
-#: includes/access_levels.inc:109
+#: ../includes/access_levels.inc:109
 msgid "Inventory locations changes"
 msgstr ""
 
-#: includes/access_levels.inc:110
+#: ../includes/access_levels.inc:110
 msgid "Inventory movement types"
 msgstr ""
 
-#: includes/access_levels.inc:111
+#: ../includes/access_levels.inc:111
 msgid "Manufacture work centres"
 msgstr ""
 
-#: includes/access_levels.inc:112
+#: ../includes/access_levels.inc:112
 msgid "Forms setup"
 msgstr ""
 
-#: includes/access_levels.inc:113
+#: ../includes/access_levels.inc:113
 msgid "Contact categories"
 msgstr ""
 
-#: includes/access_levels.inc:117
+#: ../includes/access_levels.inc:117
 msgid "Voiding transactions"
 msgstr ""
 
-#: includes/access_levels.inc:118
+#: ../includes/access_levels.inc:118
 msgid "Database backup/restore"
 msgstr ""
 
-#: includes/access_levels.inc:119
+#: ../includes/access_levels.inc:119
 msgid "Common view/print transactions interface"
 msgstr ""
 
-#: includes/access_levels.inc:120
+#: ../includes/access_levels.inc:120
 msgid "Attaching documents"
 msgstr ""
 
-#: includes/access_levels.inc:121
+#: ../includes/access_levels.inc:121
 msgid "Display preferences"
 msgstr ""
 
-#: includes/access_levels.inc:122
+#: ../includes/access_levels.inc:122
 msgid "Password changes"
 msgstr ""
 
-#: includes/access_levels.inc:127
+#: ../includes/access_levels.inc:123
+msgid "Edit other users transactions"
+msgstr ""
+
+#: ../includes/access_levels.inc:127
 msgid "Sales types"
 msgstr ""
 
-#: includes/access_levels.inc:128
+#: ../includes/access_levels.inc:128
 msgid "Sales prices edition"
 msgstr ""
 
-#: includes/access_levels.inc:129
+#: ../includes/access_levels.inc:129
 msgid "Sales staff maintenance"
 msgstr ""
 
-#: includes/access_levels.inc:130
+#: ../includes/access_levels.inc:130
 msgid "Sales areas maintenance"
 msgstr ""
 
-#: includes/access_levels.inc:131
+#: ../includes/access_levels.inc:131
 msgid "Sales groups changes"
 msgstr ""
 
-#: includes/access_levels.inc:132
+#: ../includes/access_levels.inc:132
 msgid "Sales templates"
 msgstr ""
 
-#: includes/access_levels.inc:133
+#: ../includes/access_levels.inc:133
 msgid "Recurrent invoices definitions"
 msgstr ""
 
-#: includes/access_levels.inc:135
+#: ../includes/access_levels.inc:135
 msgid "Sales transactions view"
 msgstr ""
 
-#: includes/access_levels.inc:136
+#: ../includes/access_levels.inc:136
 msgid "Sales customer and branches changes"
 msgstr ""
 
-#: includes/access_levels.inc:137
+#: ../includes/access_levels.inc:137
 msgid "Sales quotations"
 msgstr ""
 
-#: includes/access_levels.inc:138
+#: ../includes/access_levels.inc:138
 msgid "Sales orders edition"
 msgstr ""
 
-#: includes/access_levels.inc:139
+#: ../includes/access_levels.inc:139
 msgid "Sales deliveries edition"
 msgstr ""
 
-#: includes/access_levels.inc:140
+#: ../includes/access_levels.inc:140
 msgid "Sales invoices edition"
 msgstr ""
 
-#: includes/access_levels.inc:141
+#: ../includes/access_levels.inc:141
 msgid "Sales credit notes against invoice"
 msgstr ""
 
-#: includes/access_levels.inc:142
+#: ../includes/access_levels.inc:142
 msgid "Sales freehand credit notes"
 msgstr ""
 
-#: includes/access_levels.inc:143
+#: ../includes/access_levels.inc:143
 msgid "Customer payments entry"
 msgstr ""
 
-#: includes/access_levels.inc:144
+#: ../includes/access_levels.inc:144
 msgid "Customer payments allocation"
 msgstr ""
 
-#: includes/access_levels.inc:146
+#: ../includes/access_levels.inc:146
 msgid "Sales analytical reports"
 msgstr ""
 
-#: includes/access_levels.inc:147
+#: ../includes/access_levels.inc:147
 msgid "Sales document bulk reports"
 msgstr ""
 
-#: includes/access_levels.inc:148
+#: ../includes/access_levels.inc:148
 msgid "Sales prices listing"
 msgstr ""
 
-#: includes/access_levels.inc:149
+#: ../includes/access_levels.inc:149
 msgid "Sales staff listing"
 msgstr ""
 
-#: includes/access_levels.inc:150
+#: ../includes/access_levels.inc:150
 msgid "Customer bulk listing"
 msgstr ""
 
-#: includes/access_levels.inc:151
+#: ../includes/access_levels.inc:151
 msgid "Customer status report"
 msgstr ""
 
-#: includes/access_levels.inc:152
+#: ../includes/access_levels.inc:152
 msgid "Customer payments report"
 msgstr ""
 
-#: includes/access_levels.inc:157
+#: ../includes/access_levels.inc:157
 msgid "Purchase price changes"
 msgstr ""
 
-#: includes/access_levels.inc:159
+#: ../includes/access_levels.inc:159
 msgid "Supplier transactions view"
 msgstr ""
 
-#: includes/access_levels.inc:160
+#: ../includes/access_levels.inc:160
 msgid "Suppliers changes"
 msgstr ""
 
-#: includes/access_levels.inc:161
+#: ../includes/access_levels.inc:161
 msgid "Purchase order entry"
 msgstr ""
 
-#: includes/access_levels.inc:162
+#: ../includes/access_levels.inc:162
 msgid "Purchase receive"
 msgstr ""
 
-#: includes/access_levels.inc:163
+#: ../includes/access_levels.inc:163
 msgid "Supplier invoices"
 msgstr ""
 
-#: includes/access_levels.inc:164
+#: ../includes/access_levels.inc:164
 msgid "Deleting GRN items during invoice entry"
 msgstr ""
 
-#: includes/access_levels.inc:165
+#: ../includes/access_levels.inc:165
 msgid "Supplier credit notes"
 msgstr ""
 
-#: includes/access_levels.inc:166
+#: ../includes/access_levels.inc:166
 msgid "Supplier payments"
 msgstr ""
 
-#: includes/access_levels.inc:167
+#: ../includes/access_levels.inc:167
 msgid "Supplier payments allocations"
 msgstr ""
 
-#: includes/access_levels.inc:169
+#: ../includes/access_levels.inc:169
 msgid "Supplier analytical reports"
 msgstr ""
 
-#: includes/access_levels.inc:170
+#: ../includes/access_levels.inc:170
 msgid "Supplier document bulk reports"
 msgstr ""
 
-#: includes/access_levels.inc:171
+#: ../includes/access_levels.inc:171
 msgid "Supplier payments report"
 msgstr ""
 
-#: includes/access_levels.inc:175
+#: ../includes/access_levels.inc:175
 msgid "Stock items add/edit"
 msgstr ""
 
-#: includes/access_levels.inc:176
+#: ../includes/access_levels.inc:176
 msgid "Sales kits"
 msgstr ""
 
-#: includes/access_levels.inc:177
+#: ../includes/access_levels.inc:177
 msgid "Item categories"
 msgstr ""
 
-#: includes/access_levels.inc:178
+#: ../includes/access_levels.inc:178
 msgid "Units of measure"
 msgstr ""
 
-#: includes/access_levels.inc:180
+#: ../includes/access_levels.inc:180
 msgid "Stock status view"
 msgstr ""
 
-#: includes/access_levels.inc:181
+#: ../includes/access_levels.inc:181
 msgid "Stock transactions view"
 msgstr ""
 
-#: includes/access_levels.inc:182
+#: ../includes/access_levels.inc:182
 msgid "Foreign item codes entry"
 msgstr ""
 
-#: includes/access_levels.inc:183
+#: ../includes/access_levels.inc:183
 msgid "Inventory location transfers"
 msgstr ""
 
-#: includes/access_levels.inc:184
+#: ../includes/access_levels.inc:184
 msgid "Inventory adjustments"
 msgstr ""
 
-#: includes/access_levels.inc:186
+#: ../includes/access_levels.inc:186
 msgid "Reorder levels"
 msgstr ""
 
-#: includes/access_levels.inc:187
+#: ../includes/access_levels.inc:187
 msgid "Items analytical reports and inquiries"
 msgstr ""
 
-#: includes/access_levels.inc:188
+#: ../includes/access_levels.inc:188
 msgid "Inventory valuation report"
 msgstr ""
 
-#: includes/access_levels.inc:193
+#: ../includes/access_levels.inc:193
 msgid "Bill of Materials"
 msgstr ""
 
-#: includes/access_levels.inc:195
+#: ../includes/access_levels.inc:195
 msgid "Manufacturing operations view"
 msgstr ""
 
-#: includes/access_levels.inc:196
+#: ../includes/access_levels.inc:196
 msgid "Work order entry"
 msgstr ""
 
-#: includes/access_levels.inc:197
+#: ../includes/access_levels.inc:197
 msgid "Material issues entry"
 msgstr ""
 
-#: includes/access_levels.inc:198
+#: ../includes/access_levels.inc:198
 msgid "Final product receive"
 msgstr ""
 
-#: includes/access_levels.inc:199
+#: ../includes/access_levels.inc:199
 msgid "Work order releases"
 msgstr ""
 
-#: includes/access_levels.inc:201
+#: ../includes/access_levels.inc:201
 msgid "Work order analytical reports and inquiries"
 msgstr ""
 
-#: includes/access_levels.inc:202
+#: ../includes/access_levels.inc:202
 msgid "Manufacturing cost inquiry"
 msgstr ""
 
-#: includes/access_levels.inc:203
+#: ../includes/access_levels.inc:203
 msgid "Work order bulk reports"
 msgstr ""
 
-#: includes/access_levels.inc:204
+#: ../includes/access_levels.inc:204
 msgid "Bill of materials reports"
 msgstr ""
 
-#: includes/access_levels.inc:208
+#: ../includes/access_levels.inc:208
 msgid "Dimension tags"
 msgstr ""
 
-#: includes/access_levels.inc:210
+#: ../includes/access_levels.inc:210
 msgid "Dimension view"
 msgstr ""
 
-#: includes/access_levels.inc:212
+#: ../includes/access_levels.inc:212
 msgid "Dimension entry"
 msgstr ""
 
-#: includes/access_levels.inc:214
+#: ../includes/access_levels.inc:214
 msgid "Dimension reports"
 msgstr ""
 
-#: includes/access_levels.inc:218
+#: ../includes/access_levels.inc:218
 msgid "Item tax type definitions"
 msgstr ""
 
-#: includes/access_levels.inc:219
+#: ../includes/access_levels.inc:219
 msgid "GL accounts edition"
 msgstr ""
 
-#: includes/access_levels.inc:220
+#: ../includes/access_levels.inc:220
 msgid "GL account groups"
 msgstr ""
 
-#: includes/access_levels.inc:221
+#: ../includes/access_levels.inc:221
 msgid "GL account classes"
 msgstr ""
 
-#: includes/access_levels.inc:222
+#: ../includes/access_levels.inc:222
 msgid "Quick GL entry definitions"
 msgstr ""
 
-#: includes/access_levels.inc:224
+#: ../includes/access_levels.inc:224
 msgid "Bank accounts"
 msgstr ""
 
-#: includes/access_levels.inc:225
+#: ../includes/access_levels.inc:225
 msgid "Tax rates"
 msgstr ""
 
-#: includes/access_levels.inc:226
+#: ../includes/access_levels.inc:226
 msgid "Tax groups"
 msgstr ""
 
-#: includes/access_levels.inc:227
+#: ../includes/access_levels.inc:227
 msgid "Fiscal years maintenance"
 msgstr ""
 
-#: includes/access_levels.inc:228
+#: ../includes/access_levels.inc:228
 msgid "Company GL setup"
 msgstr ""
 
-#: includes/access_levels.inc:229
+#: ../includes/access_levels.inc:229
 msgid "GL Account tags"
 msgstr ""
 
-#: 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 ""
 
-#: includes/access_levels.inc:232
+#: ../includes/access_levels.inc:234
 msgid "Bank transactions view"
 msgstr ""
 
-#: includes/access_levels.inc:233
+#: ../includes/access_levels.inc:235
 msgid "GL postings view"
 msgstr ""
 
-#: includes/access_levels.inc:234
+#: ../includes/access_levels.inc:236
 msgid "Exchange rate table changes"
 msgstr ""
 
-#: includes/access_levels.inc:235
+#: ../includes/access_levels.inc:237
 msgid "Bank payments"
 msgstr ""
 
-#: includes/access_levels.inc:236
+#: ../includes/access_levels.inc:238
 msgid "Bank deposits"
 msgstr ""
 
-#: includes/access_levels.inc:237
+#: ../includes/access_levels.inc:239
 msgid "Bank account transfers"
 msgstr ""
 
-#: includes/access_levels.inc:238
+#: ../includes/access_levels.inc:240
 msgid "Bank reconciliation"
 msgstr ""
 
-#: includes/access_levels.inc:239
+#: ../includes/access_levels.inc:241
 msgid "Manual journal entries"
 msgstr ""
 
-#: includes/access_levels.inc:240
+#: ../includes/access_levels.inc:242
 msgid "Journal entries to bank related accounts"
 msgstr ""
 
-#: includes/access_levels.inc:241
+#: ../includes/access_levels.inc:243
 msgid "Budget edition"
 msgstr ""
 
-#: includes/access_levels.inc:242
+#: ../includes/access_levels.inc:244
 msgid "Item standard costs"
 msgstr ""
 
-#: includes/access_levels.inc:245
+#: ../includes/access_levels.inc:247
 msgid "GL analytical reports and inquiries"
 msgstr ""
 
-#: includes/access_levels.inc:246
+#: ../includes/access_levels.inc:248
 msgid "Tax reports and inquiries"
 msgstr ""
 
-#: includes/access_levels.inc:247
+#: ../includes/access_levels.inc:249
 msgid "Bank reports and inquiries"
 msgstr ""
 
-#: includes/access_levels.inc:248
+#: ../includes/access_levels.inc:250
 msgid "GL reports and inquiries"
 msgstr ""
 
-#: includes/banking.inc:100 includes/data_checks.inc:52
+#: ../includes/banking.inc:100
+#: ../includes/data_checks.inc:52
 #, php-format
 msgid ""
 "Cannot retrieve exchange rate for currency %s as of %s. Please add exchange "
 "rate manually on Exchange Rates page."
 msgstr ""
 
-#: includes/errors.inc:123
+#: ../includes/current_user.inc.orig:97
+msgid ""
+"Before software upgrade you have to include old $security_groups and "
+"$security_headings arrays from old config.php file to the new one."
+msgstr ""
+
+#: ../includes/current_user.inc.orig:98
+#: ../includes/ui/ui_controls.inc:197
+#: ../includes/ui/ui_view.inc:845
+msgid "Back"
+msgstr ""
+
+#: ../includes/current_user.inc.orig:108
+msgid "System is available for site admin only until full database upgrade"
+msgstr ""
+
+#: ../includes/current_user.inc.orig:471
+msgid "Requesting data..."
+msgstr ""
+
+#: ../includes/data_checks.inc:508
+#, php-format
+msgid "%s #%s is closed for further edition."
+msgstr ""
+
+#: ../includes/data_checks.inc:534
+msgid "You have no edit access to transactions created by other users."
+msgstr ""
+
+#: ../includes/errors.inc:123
 msgid "in file"
 msgstr ""
 
-#: includes/errors.inc:123
+#: ../includes/errors.inc:123
 msgid "at line "
 msgstr ""
 
-#: includes/errors.inc:177
+#: ../includes/errors.inc:177
 msgid "Debug mode database warning:"
 msgstr ""
 
-#: includes/errors.inc:179
+#: ../includes/errors.inc:179
 msgid "DATABASE ERROR :"
 msgstr ""
 
-#: includes/errors.inc:210
+#: ../includes/errors.inc:210
 msgid ""
 "The entered information is a duplicate. Please go back and enter different "
 "values."
 msgstr ""
 
-#: includes/main.inc:41
+#: ../includes/main.inc:44
 msgid "This page is usable only with javascript enabled browsers."
 msgstr ""
 
-#: includes/packages.inc:190
+#: ../includes/packages.inc:190
 #, php-format
 msgid "No key field '%s' in file '%s'"
 msgstr ""
 
-#: includes/packages.inc:295 includes/packages.inc:329
+#: ../includes/packages.inc:295
+#: ../includes/packages.inc:329
 #, php-format
 msgid "Cannot delete outdated '%s' file."
 msgstr ""
 
-#: includes/packages.inc:299
+#: ../includes/packages.inc:299
 msgid "Release file in repository is invalid, or public key is outdated."
 msgstr ""
 
-#: includes/packages.inc:316
+#: ../includes/packages.inc:316
 msgid "Repository version does not match application version."
 msgstr ""
 
-#: includes/packages.inc:333
+#: ../includes/packages.inc:333
 #, php-format
 msgid ""
 "Security alert: broken index file in repository '%s'. Please inform "
 "repository administrator about this issue."
 msgstr ""
 
-#: includes/packages.inc:366
+#: ../includes/packages.inc:366
 #, php-format
 msgid ""
 "Security alert: broken package '%s' in repository. Please inform repository "
 "administrator about this issue."
 msgstr ""
 
-#: includes/packages.inc:621 includes/packages.inc:672
+#: ../includes/packages.inc:621
+#: ../includes/packages.inc:672
 #, php-format
 msgid "Package '%s' not found."
 msgstr ""
 
-#: includes/sysnames.inc:23 includes/sysnames.inc:148
+#: ../includes/session.inc:133
+msgid "Incorrect Password"
+msgstr ""
+
+#: ../includes/session.inc:134
+msgid "The user and password combination is not valid for the system."
+msgstr ""
+
+#: ../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 ""
+
+#: ../includes/session.inc:137
+msgid "Try again"
+msgstr ""
+
+#: ../includes/session.inc:185
+#, php-format
+msgid ""
+"Brute force attack on account '%s' detected. Access for non-logged users "
+"temporarily blocked."
+msgstr ""
+
+#: ../includes/session.inc:216
+msgid "Security settings have not been defined for your user account."
+msgstr ""
+
+#: ../includes/session.inc:217
+msgid "Please contact your system administrator."
+msgstr ""
+
+#: ../includes/session.inc:218
+msgid ""
+"Please remove $security_groups and $security_headings arrays from config.php "
+"file!"
+msgstr ""
+
+#: ../includes/session.inc:220
+msgid ""
+"Access to application has been blocked until database upgrade is completed "
+"by system administrator."
+msgstr ""
+
+#: ../includes/session.inc:234
+msgid ""
+"The security settings on your account do not permit you to access this "
+"function"
+msgstr ""
+
+#: ../includes/session.inc:243
+msgid ""
+"System is blocked after source upgrade until database is updated on System/"
+"Software Upgrade page"
+msgstr ""
+
+#: ../includes/sysnames.inc:23
+#: ../includes/sysnames.inc:149
 msgid "Bank Payment"
 msgstr ""
 
-#: includes/sysnames.inc:24 includes/sysnames.inc:147
+#: ../includes/sysnames.inc:24
+#: ../includes/sysnames.inc:148
 msgid "Bank Deposit"
 msgstr ""
 
-#: includes/sysnames.inc:25
+#: ../includes/sysnames.inc:25
 msgid "Funds Transfer"
 msgstr ""
 
-#: includes/sysnames.inc:26
+#: ../includes/sysnames.inc:26
 msgid "Sales Invoice"
 msgstr ""
 
-#: includes/sysnames.inc:27 sales/credit_note_entry.php:37
+#: ../includes/sysnames.inc:27
+#: ../sales/credit_note_entry.php:37
 msgid "Customer Credit Note"
 msgstr ""
 
-#: includes/sysnames.inc:28
+#: ../includes/sysnames.inc:28
 msgid "Customer Payment"
 msgstr ""
 
-#: includes/sysnames.inc:29
+#: ../includes/sysnames.inc:29
 msgid "Delivery Note"
 msgstr ""
 
-#: includes/sysnames.inc:30
+#: ../includes/sysnames.inc:30
 msgid "Location Transfer"
 msgstr ""
 
-#: includes/sysnames.inc:31
+#: ../includes/sysnames.inc:31
 msgid "Inventory Adjustment"
 msgstr ""
 
-#: includes/sysnames.inc:32 purchasing/includes/ui/po_ui.inc:323
-#: purchasing/view/view_po.php:30
+#: ../includes/sysnames.inc:32
+#: ../purchasing/includes/ui/po_ui.inc:330
+#: ../purchasing/includes/ui/po_ui.inc.orig:330
+#: ../purchasing/view/view_po.php:30
 msgid "Purchase Order"
 msgstr ""
 
-#: includes/sysnames.inc:33
+#: ../includes/sysnames.inc:33
 msgid "Supplier Invoice"
 msgstr ""
 
-#: includes/sysnames.inc:34 purchasing/supplier_credit.php:28
+#: ../includes/sysnames.inc:34
+#: ../purchasing/supplier_credit.php:58
 msgid "Supplier Credit Note"
 msgstr ""
 
-#: includes/sysnames.inc:35
+#: ../includes/sysnames.inc:35
 msgid "Supplier Payment"
 msgstr ""
 
-#: includes/sysnames.inc:36 purchasing/view/view_grn.php:33
+#: ../includes/sysnames.inc:36
+#: ../purchasing/view/view_grn.php:33
 msgid "Purchase Order Delivery"
 msgstr ""
 
-#: includes/sysnames.inc:37 includes/sysnames.inc:95
+#: ../includes/sysnames.inc:37
+#: ../includes/sysnames.inc:95
 msgid "Work Order"
 msgstr ""
 
-#: includes/sysnames.inc:38
+#: ../includes/sysnames.inc:38
 msgid "Work Order Issue"
 msgstr ""
 
-#: includes/sysnames.inc:39
+#: ../includes/sysnames.inc:39
 msgid "Work Order Production"
 msgstr ""
 
-#: includes/sysnames.inc:40 sales/inquiry/sales_orders_view.php:139
-#: sales/inquiry/sales_orders_view.php:161
-#: sales/inquiry/sales_orders_view.php.orig:137
-#: sales/inquiry/sales_orders_view.php.orig:159
+#: ../includes/sysnames.inc:40
+#: ../sales/inquiry/sales_orders_view.php:151
+#: ../sales/inquiry/sales_orders_view.php:173
 msgid "Sales Order"
 msgstr ""
 
-#: includes/sysnames.inc:41 sales/sales_order_entry.php:614
-#: sales/sales_order_entry.php:618 sales/sales_order_entry.php:629
-#: sales/sales_order_entry.php.orig:628
+#: ../includes/sysnames.inc:41
+#: ../sales/sales_order_entry.php:645
 msgid "Sales Quotation"
 msgstr ""
 
-#: includes/sysnames.inc:42
+#: ../includes/sysnames.inc:42
 msgid "Cost Update"
 msgstr ""
 
-#: includes/sysnames.inc:47
+#: ../includes/sysnames.inc:47
 msgid "GJ"
 msgstr ""
 
-#: includes/sysnames.inc:48
+#: ../includes/sysnames.inc:48
 msgid "BP"
 msgstr ""
 
-#: includes/sysnames.inc:49
+#: ../includes/sysnames.inc:49
 msgid "BD"
 msgstr ""
 
-#: includes/sysnames.inc:50
+#: ../includes/sysnames.inc:50
 msgid "BT"
 msgstr ""
 
-#: includes/sysnames.inc:51
+#: ../includes/sysnames.inc:51
 msgid "SI"
 msgstr ""
 
-#: includes/sysnames.inc:52
+#: ../includes/sysnames.inc:52
 msgid "CN"
 msgstr ""
 
-#: includes/sysnames.inc:53
+#: ../includes/sysnames.inc:53
 msgid "CP"
 msgstr ""
 
-#: includes/sysnames.inc:54 sales/customer_invoice.php:471
-#: sales/customer_invoice.php:473
+#: ../includes/sysnames.inc:54
+#: ../sales/customer_invoice.php:547
 msgid "DN"
 msgstr ""
 
-#: includes/sysnames.inc:55
+#: ../includes/sysnames.inc:55
 msgid "IT"
 msgstr ""
 
-#: includes/sysnames.inc:56
+#: ../includes/sysnames.inc:56
 msgid "IA"
 msgstr ""
 
-#: includes/sysnames.inc:57
+#: ../includes/sysnames.inc:57
 msgid "PO"
 msgstr ""
 
-#: includes/sysnames.inc:58
+#: ../includes/sysnames.inc:58
 msgid "PI"
 msgstr ""
 
-#: includes/sysnames.inc:59
+#: ../includes/sysnames.inc:59
 msgid "PC"
 msgstr ""
 
-#: includes/sysnames.inc:60
+#: ../includes/sysnames.inc:60
 msgid "SP"
 msgstr ""
 
-#: includes/sysnames.inc:61 reporting/rep204.php:82 reporting/rep305.php:95
-#: reporting/rep305.php:98
+#: ../includes/sysnames.inc:61
+#: ../reporting/rep204.php:82
+#: ../reporting/rep305.php:98
 msgid "GRN"
 msgstr ""
 
-#: includes/sysnames.inc:62
+#: ../includes/sysnames.inc:62
 msgid "WO"
 msgstr ""
 
-#: includes/sysnames.inc:63
+#: ../includes/sysnames.inc:63
 msgid "WI"
 msgstr ""
 
-#: includes/sysnames.inc:64
+#: ../includes/sysnames.inc:64
 msgid "WP"
 msgstr ""
 
-#: includes/sysnames.inc:65
+#: ../includes/sysnames.inc:65
 msgid "SO"
 msgstr ""
 
-#: includes/sysnames.inc:66
+#: ../includes/sysnames.inc:66
 msgid "SQ"
 msgstr ""
 
-#: includes/sysnames.inc:67
+#: ../includes/sysnames.inc:67
 msgid "CU"
 msgstr ""
 
-#: includes/sysnames.inc:68
+#: ../includes/sysnames.inc:68
 msgid "Dim"
 msgstr ""
 
-#: includes/sysnames.inc:76
+#: ../includes/sysnames.inc:76
 msgid "Savings Account"
 msgstr ""
 
-#: includes/sysnames.inc:77
+#: ../includes/sysnames.inc:77
 msgid "Chequing Account"
 msgstr ""
 
-#: includes/sysnames.inc:78 manufacturing/work_order_costs.php:161
+#: ../includes/sysnames.inc:78
+#: ../manufacturing/work_order_costs.php:145
 msgid "Credit Account"
 msgstr ""
 
-#: includes/sysnames.inc:79
+#: ../includes/sysnames.inc:79
 msgid "Cash Account"
 msgstr ""
 
-#: includes/sysnames.inc:83
+#: ../includes/sysnames.inc:83
 msgid "Transfer"
 msgstr ""
 
-#: includes/sysnames.inc:84
+#: ../includes/sysnames.inc:84
 msgid "Cheque"
 msgstr ""
 
-#: includes/sysnames.inc:86 includes/sysnames.inc:180
+#: ../includes/sysnames.inc:86
+#: ../includes/sysnames.inc:181
 msgid "Cash"
 msgstr ""
 
-#: includes/sysnames.inc:96 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:338
-#: sales/customer_invoice.php:378
-#: 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_inquiry.php:230
-#: sales/inquiry/customer_inquiry.php:244
-#: sales/inquiry/customer_inquiry.php.orig:230
-#: sales/inquiry/customer_inquiry.php.orig:244
-#: sales/inquiry/sales_deliveries_view.php:180
-#: sales/inquiry/sales_orders_view.php:264
-#: sales/inquiry/sales_orders_view.php:278
-#: sales/inquiry/sales_orders_view.php.orig:262
-#: sales/inquiry/sales_orders_view.php.orig:276
-#: sales/create_recurrent_invoices.php:132
-#: sales/customer_credit_invoice.php:235 sales/customer_invoice.php:380
+#: ../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:132
+#: ../sales/customer_credit_invoice.php:235
+#: ../sales/customer_delivery.php.orig:351
+#: ../sales/customer_invoice.php:446
+#: ../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_inquiry.php:206
+#: ../sales/inquiry/customer_inquiry.php:220
+#: ../sales/inquiry/sales_deliveries_view.php:180
+#: ../sales/inquiry/sales_orders_view.php:286
+#: ../sales/inquiry/sales_orders_view.php:300
 msgid "Customer"
 msgstr ""
 
-#: includes/sysnames.inc:97 includes/sysnames.inc:172
-#: inventory/purchasing_data.php:129 purchasing/includes/ui/grn_ui.inc:20
-#: purchasing/includes/ui/po_ui.inc:316
-#: purchasing/view/view_supp_credit.php:42
-#: purchasing/view/view_supp_invoice.php:45
-#: purchasing/inquiry/po_search_completed.php:123
-#: purchasing/inquiry/po_search.php:132
-#: purchasing/inquiry/supplier_allocation_inquiry.php:129
-#: purchasing/inquiry/supplier_allocation_inquiry.php:142
-#: purchasing/inquiry/supplier_inquiry.php:171
-#: purchasing/inquiry/supplier_inquiry.php:185
-#: purchasing/inquiry/supplier_inquiry.php.orig:165
-#: purchasing/inquiry/supplier_inquiry.php.orig:179
-#: purchasing/allocations/supplier_allocation_main.php:98
-#: purchasing/allocations/supplier_allocation_main.php:106
-#: reporting/rep201.php:125 reporting/rep202.php:128 reporting/rep202.php:135
-#: reporting/rep203.php:98 reporting/rep204.php:88
-#: reporting/reports_main.php:132 reporting/reports_main.php:136
-#: reporting/reports_main.php:143 reporting/reports_main.php:153
-#: reporting/reports_main.php:159
+#: ../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/includes/ui/po_ui.inc.orig: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 ""
 
-#: includes/sysnames.inc:105
+#: ../includes/sysnames.inc:105
 msgid "Assemble"
 msgstr ""
 
-#: includes/sysnames.inc:106
+#: ../includes/sysnames.inc:106
 msgid "Unassemble"
 msgstr ""
 
-#: includes/sysnames.inc:107
+#: ../includes/sysnames.inc:107
 msgid "Advanced Manufacture"
 msgstr ""
 
-#: includes/sysnames.inc:111
+#: ../includes/sysnames.inc:111
 msgid "Labour Cost"
 msgstr ""
 
-#: includes/sysnames.inc:112
+#: ../includes/sysnames.inc:112
 msgid "Overhead Cost"
 msgstr ""
 
-#: includes/sysnames.inc:119
+#: ../includes/sysnames.inc:113
+msgid "Materials"
+msgstr ""
+
+#: ../includes/sysnames.inc:120
 msgid "Assets"
 msgstr ""
 
-#: includes/sysnames.inc:121
+#: ../includes/sysnames.inc:122
 msgid "Equity"
 msgstr ""
 
-#: includes/sysnames.inc:122
+#: ../includes/sysnames.inc:123
 msgid "Income"
 msgstr ""
 
-#: includes/sysnames.inc:123
+#: ../includes/sysnames.inc:124
 msgid "Cost of Goods Sold"
 msgstr ""
 
-#: includes/sysnames.inc:124
+#: ../includes/sysnames.inc:125
 msgid "Expense"
 msgstr ""
 
-#: includes/sysnames.inc:131
+#: ../includes/sysnames.inc:132
 msgid "Remainder"
 msgstr ""
 
-#: includes/sysnames.inc:133
+#: ../includes/sysnames.inc:134
 msgid "Amount, increase base"
 msgstr ""
 
-#: includes/sysnames.inc:134
+#: ../includes/sysnames.inc:135
 msgid "Amount, reduce base"
 msgstr ""
 
-#: includes/sysnames.inc:135
+#: ../includes/sysnames.inc:136
 msgid "% amount of base"
 msgstr ""
 
-#: includes/sysnames.inc:136
+#: ../includes/sysnames.inc:137
 msgid "% amount of base, increase base"
 msgstr ""
 
-#: includes/sysnames.inc:137
+#: ../includes/sysnames.inc:138
 msgid "% amount of base, reduce base"
 msgstr ""
 
-#: includes/sysnames.inc:138
+#: ../includes/sysnames.inc:139
 msgid "Taxes added"
 msgstr ""
 
-#: includes/sysnames.inc:139
+#: ../includes/sysnames.inc:140
 msgid "Taxes added, increase base"
 msgstr ""
 
-#: includes/sysnames.inc:140
+#: ../includes/sysnames.inc:141
 msgid "Taxes added, reduce base"
 msgstr ""
 
-#: includes/sysnames.inc:141
+#: ../includes/sysnames.inc:142
 msgid "Taxes included"
 msgstr ""
 
-#: includes/sysnames.inc:142
+#: ../includes/sysnames.inc:143
 msgid "Taxes included, increase base"
 msgstr ""
 
-#: includes/sysnames.inc:143
+#: ../includes/sysnames.inc:144
 msgid "Taxes included, reduce base"
 msgstr ""
 
-#: includes/sysnames.inc:150
+#: ../includes/sysnames.inc:151
 msgid "Supplier Invoice/Credit"
 msgstr ""
 
-#: includes/sysnames.inc:156 manufacturing/search_work_orders.php:165
-#: 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 ""
 
-#: includes/sysnames.inc:157
+#: ../includes/sysnames.inc:158
 msgid "Purchased"
 msgstr ""
 
-#: includes/sysnames.inc:158
+#: ../includes/sysnames.inc:159
 msgid "Service"
 msgstr ""
 
-#: includes/sysnames.inc:171
+#: ../includes/sysnames.inc:172
 msgid "Customer branch"
 msgstr ""
 
-#: includes/sysnames.inc:173
+#: ../includes/sysnames.inc:174
 msgid "Shipper"
 msgstr ""
 
-#: includes/sysnames.inc:174
+#: ../includes/sysnames.inc:175
 msgid "Company internal"
 msgstr ""
 
-#: includes/sysnames.inc:179
+#: ../includes/sysnames.inc:180
 msgid "Prepayment"
 msgstr ""
 
-#: includes/sysnames.inc:181
+#: ../includes/sysnames.inc:182
 msgid "After No. of Days"
 msgstr ""
 
-#: includes/sysnames.inc:182
+#: ../includes/sysnames.inc:183
 msgid "Day In Following Month"
 msgstr ""
 
-#: includes/system_tests.inc:15 includes/ui/ui_view.inc:210
-#: reporting/rep705.php:250 reporting/rep705.php:261 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
+#: ../reporting/rep705.php:250
+#: ../reporting/rep705.php:261
+#: ../reporting/rep705.php:270
 msgid "Info"
 msgstr ""
 
-#: includes/system_tests.inc:16
+#: ../includes/system_tests.inc:16
 msgid "Optional"
 msgstr ""
 
-#: includes/system_tests.inc:17
+#: ../includes/system_tests.inc:17
 msgid "Recommended"
 msgstr ""
 
-#: includes/system_tests.inc:18
+#: ../includes/system_tests.inc:18
 msgid "Required "
 msgstr ""
 
-#: includes/system_tests.inc:24
+#: ../includes/system_tests.inc:24
 msgid "MySQL version"
 msgstr ""
 
-#: includes/system_tests.inc:28
+#: ../includes/system_tests.inc:28
 msgid "Upgrade MySQL server to version at least 4.1"
 msgstr ""
 
-#: includes/system_tests.inc:35
+#: ../includes/system_tests.inc:35
 msgid "PHP MySQL extension"
 msgstr ""
 
-#: includes/system_tests.inc:40
+#: ../includes/system_tests.inc:40
 msgid "Your PHP has to have MySQL extension enabled."
 msgstr ""
 
-#: includes/system_tests.inc:46
+#: ../includes/system_tests.inc:46
 msgid "PHP version"
 msgstr ""
 
-#: includes/system_tests.inc:50
+#: ../includes/system_tests.inc:50
 msgid "Upgrade PHP to version at least 4.3.3"
 msgstr ""
 
-#: includes/system_tests.inc:57
+#: ../includes/system_tests.inc:57
 msgid "Server system"
 msgstr ""
 
-#: includes/system_tests.inc:67
+#: ../includes/system_tests.inc:67
 msgid "Session save path"
 msgstr ""
 
-#: includes/system_tests.inc:79
+#: ../includes/system_tests.inc:79
 msgid "Removed install wizard folder"
 msgstr ""
 
-#: includes/system_tests.inc:82
+#: ../includes/system_tests.inc:82
 msgid "Not removed"
 msgstr ""
 
-#: includes/system_tests.inc:83
+#: ../includes/system_tests.inc:83
 msgid "Remove or rename install wizard folder for security reasons."
 msgstr ""
 
-#: includes/system_tests.inc:90
+#: ../includes/system_tests.inc:90
 msgid "Browser type"
 msgstr ""
 
-#: includes/system_tests.inc:94
+#: ../includes/system_tests.inc:94
 msgid "Any browser is supported"
 msgstr ""
 
-#: includes/system_tests.inc:101
+#: ../includes/system_tests.inc:101
 msgid "Http server type"
 msgstr ""
 
-#: includes/system_tests.inc:105
+#: ../includes/system_tests.inc:105
 msgid "Any server is supported"
 msgstr ""
 
-#: includes/system_tests.inc:112
+#: ../includes/system_tests.inc:112
 msgid "Native gettext"
 msgstr ""
 
-#: includes/system_tests.inc:116
+#: ../includes/system_tests.inc:116
 msgid "In case of no gettext support, php emulation is used"
 msgstr ""
 
-#: includes/system_tests.inc:124
+#: ../includes/system_tests.inc:124
 msgid "Debugging mode"
 msgstr ""
 
-#: includes/system_tests.inc:128
+#: ../includes/system_tests.inc:128
 msgid "To switch debugging on set $go_debug>0 in config.php file"
 msgstr ""
 
-#: includes/system_tests.inc:137
+#: ../includes/system_tests.inc:137
 msgid "Error logging"
 msgstr ""
 
-#: includes/system_tests.inc:145
+#: ../includes/system_tests.inc:145
 msgid "Disabled"
 msgstr ""
 
-#: includes/system_tests.inc:148
+#: ../includes/system_tests.inc:148
 msgid "To switch error logging set $error_logging in config.php file"
 msgstr ""
 
-#: includes/system_tests.inc:151
+#: ../includes/system_tests.inc:151
 msgid "Log file is not writeable"
 msgstr ""
 
-#: includes/system_tests.inc:161
+#: ../includes/system_tests.inc:161
 msgid "Current database version"
 msgstr ""
 
-#: includes/system_tests.inc:165
+#: ../includes/system_tests.inc:165
 msgid "Database structure seems to be not upgraded to current version"
 msgstr ""
 
-#: includes/system_tests.inc:180
+#: ../includes/system_tests.inc:180
 msgid "Company subdirectories consistency"
 msgstr ""
 
-#: includes/system_tests.inc:193 includes/system_tests.inc:200
-#: includes/system_tests.inc:208 includes/system_tests.inc:225
-#: includes/system_tests.inc:340 includes/system_tests.inc:349
-#: includes/system_tests.inc:358 includes/system_tests.inc:366
+#: ../includes/system_tests.inc:193
+#: ../includes/system_tests.inc:200
+#: ../includes/system_tests.inc:208
+#: ../includes/system_tests.inc:225
+#: ../includes/system_tests.inc:340
+#: ../includes/system_tests.inc:349
+#: ../includes/system_tests.inc:358
+#: ../includes/system_tests.inc:366
 #, php-format
 msgid "'%s' is not writeable"
 msgstr ""
 
-#: includes/system_tests.inc:221
+#: ../includes/system_tests.inc:221
 msgid "Temporary directory"
 msgstr ""
 
-#: includes/system_tests.inc:233
+#: ../includes/system_tests.inc:233
 msgid "Language configuration consistency"
 msgstr ""
 
-#: includes/system_tests.inc:242
+#: ../includes/system_tests.inc:242
 msgid "Languages folder should be writeable."
 msgstr ""
 
-#: includes/system_tests.inc:251
+#: ../includes/system_tests.inc:251
 msgid "Languages configuration file should be writeable."
 msgstr ""
 
-#: includes/system_tests.inc:270
+#: ../includes/system_tests.inc:270
 #, php-format
 msgid "Missing %s translation file."
 msgstr ""
 
-#: includes/system_tests.inc:275
+#: ../includes/system_tests.inc:275
 #, php-format
 msgid "Missing system locale: %s"
 msgstr ""
 
-#: includes/system_tests.inc:288
+#: ../includes/system_tests.inc:288
 msgid "Main config file"
 msgstr ""
 
-#: includes/system_tests.inc:295 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 ""
 
-#: includes/system_tests.inc:296 includes/system_tests.inc:318
+#: ../includes/system_tests.inc:296
+#: ../includes/system_tests.inc:318
 #, php-format
 msgid "'%s' file exists."
 msgstr ""
 
-#: includes/system_tests.inc:300
+#: ../includes/system_tests.inc:300
 #, php-format
 msgid "'%s' file should be read-only"
 msgstr ""
 
-#: includes/system_tests.inc:309
+#: ../includes/system_tests.inc:309
 msgid "Database auth file"
 msgstr ""
 
-#: 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 ""
 
-#: includes/system_tests.inc:333
+#: ../includes/system_tests.inc:333
 msgid "Extensions system"
 msgstr ""
 
-#: includes/system_tests.inc:363 includes/system_tests.inc:371
+#: ../includes/system_tests.inc:371
 msgid "Extensions configuration files and directories should be writeable"
 msgstr ""
 
-#: includes/system_tests.inc:375 includes/system_tests.inc:384
+#: ../includes/system_tests.inc:384
 #, php-format
 msgid "Non-standard theme directory '%s' is not writable"
 msgstr ""
 
-#: includes/system_tests.inc:385 includes/system_tests.inc:394
+#: ../includes/system_tests.inc:394
 msgid ""
 "OpenSSL PHP extension have to be enabled to use extension repository system."
 msgstr ""
 
-#: includes/system_tests.inc:388 includes/system_tests.inc:397
+#: ../includes/system_tests.inc:397
 msgid ""
 "OpenSSL have to be available on your server to use extension repository "
 "system."
 msgstr ""
 
-#: includes/system_tests.inc:411 includes/system_tests.inc:420
+#: ../includes/system_tests.inc:420
 msgid "Test"
 msgstr ""
 
-#: includes/system_tests.inc:411 includes/system_tests.inc:420
+#: ../includes/system_tests.inc:420
 msgid "Test type"
 msgstr ""
 
-#: includes/system_tests.inc:411 includes/ui/view_package.php:37
-#: reporting/rep204.php:83 reporting/rep301.php:103
-#: includes/system_tests.inc:420
+#: ../includes/system_tests.inc:420
+#: ../includes/ui/view_package.php:37
+#: ../reporting/rep204.php:83
+#: ../reporting/rep301.php:103
 msgid "Value"
 msgstr ""
 
-#: includes/system_tests.inc:411 reporting/reports_main.php:39
-#: reporting/reports_main.php:49 reporting/reports_main.php:57
-#: reporting/reports_main.php:63 reporting/reports_main.php:71
-#: reporting/reports_main.php:79 reporting/reports_main.php:85
-#: reporting/reports_main.php:93 reporting/reports_main.php:100
-#: reporting/reports_main.php:106 reporting/reports_main.php:112
-#: reporting/reports_main.php:119 reporting/reports_main.php:125
-#: reporting/reports_main.php:130 reporting/reports_main.php:139
-#: reporting/reports_main.php:149 reporting/reports_main.php:156
-#: reporting/reports_main.php:160 reporting/reports_main.php:167
-#: reporting/reports_main.php:173 reporting/reports_main.php: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:85 includes/system_tests.inc:420
-#: reporting/includes/pdf_report.inc:619
+#: ../includes/system_tests.inc:420
+#: ../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:619
+#: ../sales/view/view_sales_order.php:98
+#: ../sales/view/view_sales_order.php.orig:85
 msgid "Comments"
 msgstr ""
 
-#: includes/system_tests.inc:435 includes/system_tests.inc:444
+#: ../includes/system_tests.inc:444
 msgid "Ok"
 msgstr ""
 
-#: includes/db/audit_trail_db.inc:93
+#: ../includes/db/audit_trail_db.inc:99
 msgid ""
 "Some transactions journal GL postings were not indexed due to lack of audit "
 "trail record."
 msgstr ""
 
-#: includes/db/inventory_db.inc:252
+#: ../includes/db/inventory_db.inc:252
 msgid "Cost was "
 msgstr ""
 
-#: includes/db/inventory_db.inc:252
+#: ../includes/db/inventory_db.inc:252
 msgid " changed to "
 msgstr ""
 
-#: includes/db/inventory_db.inc:252
+#: ../includes/db/inventory_db.inc:252
 msgid " for item "
 msgstr ""
 
-#: includes/db/inventory_db.inc:292
+#: ../includes/db/inventory_db.inc:292
 msgid "Zero/negative inventory handling"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:263
-#: purchasing/allocations/supplier_allocation_main.php:94
-#: sales/allocations/customer_allocation_main.php:93
+#: ../includes/ui/allocation_cart.inc:264
+#: ../purchasing/allocations/supplier_allocation_main.php:94
+#: ../sales/allocations/customer_allocation_main.php:93
 msgid "Transaction Type"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:263 reporting/rep704.php: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:96
-#: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161
-#: sales/inquiry/sales_orders_view.php:226
-#: sales/inquiry/sales_orders_view.php:263
-#: sales/inquiry/sales_orders_view.php:277
-#: sales/inquiry/sales_orders_view.php.orig:224
-#: sales/inquiry/sales_orders_view.php.orig:261
-#: sales/inquiry/sales_orders_view.php.orig:275
+#: ../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
 msgid "Ref"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:264
+#: ../includes/ui/allocation_cart.inc:265
 msgid "Other Allocations"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:264 includes/ui/ui_view.inc:489
-#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186
+#: ../includes/ui/allocation_cart.inc:265
+#: ../includes/ui/ui_view.inc:489
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:208
 msgid "This Allocation"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:264 includes/ui/allocation_cart.inc:311
-#: includes/ui/ui_view.inc:489
-#: purchasing/allocations/supplier_allocation_main.php:101
-#: reporting/rep112.php:153 reporting/rep210.php:166
-#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186
-#: 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
+#: ../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 ""
 
-#: includes/ui/allocation_cart.inc:294 reporting/rep112.php:150
-#: reporting/rep210.php:163
+#: ../includes/ui/allocation_cart.inc:297
+#: ../reporting/rep112.php:138
+#: ../reporting/rep210.php:151
 msgid "Total Allocated"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:331
+#: ../includes/ui/allocation_cart.inc:334
 msgid "The entry for one or more amounts is invalid or negative."
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:340
+#: ../includes/ui/allocation_cart.inc:343
 msgid "At least one transaction is overallocated."
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:358
+#: ../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 ""
 
-#: includes/ui/contacts_view.inc:41
+#: ../includes/ui/contacts_view.inc:41
 msgid "Assignment"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:41
+#: ../includes/ui/contacts_view.inc:41
 msgid "Sec Phone"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:41 reporting/rep103.php:223
-#: reporting/includes/header2.inc:104 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 ""
 
-#: includes/ui/contacts_view.inc:42
+#: ../includes/ui/contacts_view.inc:42
 msgid "email"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:90
+#: ../includes/ui/contacts_view.inc:90
 msgid "Contact data"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:92
+#: ../includes/ui/contacts_view.inc:92
 msgid "First Name:"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:93
+#: ../includes/ui/contacts_view.inc:93
 msgid "Last Name:"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:96
+#: ../includes/ui/contacts_view.inc:96
 msgid "Contact active for:"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:102 sales/manage/customers.php:252
-#: sales/manage/customers.php.orig:249
+#: ../includes/ui/contacts_view.inc:102
+#: ../sales/manage/customers.php:252
+#: ../sales/manage/sav.customers.php:252
 msgid "Phone:"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:105 inventory/manage/locations.php:207
-#: purchasing/manage/suppliers.php:160 sales/manage/customer_branches.php:263
-#: sales/manage/customers.php:255 sales/manage/customers.php.orig:252
-#: 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 ""
 
-#: includes/ui/contacts_view.inc:110 purchasing/manage/suppliers.php:161
-#: sales/manage/customer_branches.php:264
+#: ../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 ""
 
-#: includes/ui/contacts_view.inc:110 sales/manage/customer_branches.php:264
+#: ../includes/ui/contacts_view.inc:110
+#: ../sales/manage/customer_branches.php:266
 msgid "Customer default"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:112
+#: ../includes/ui/contacts_view.inc:112
 msgid "Notes:"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:132
+#: ../includes/ui/contacts_view.inc:132
 msgid "The contact name cannot be empty."
 msgstr ""
 
-#: includes/ui/contacts_view.inc:137
+#: ../includes/ui/contacts_view.inc:137
 msgid "Contact reference cannot be empty."
 msgstr ""
 
-#: includes/ui/contacts_view.inc:142
+#: ../includes/ui/contacts_view.inc:142
 msgid "You have to select at least one category."
 msgstr ""
 
-#: includes/ui/db_pager_view.inc:166 includes/ui/radio.ui_input.inc:899
-#: includes/ui/ui_input.inc:898 includes/ui/ui_input.inc:902
+#: ../includes/ui/db_pager_view.inc:166
+#: ../includes/ui/ui_input.inc:903
 msgid "Show also Inactive"
 msgstr ""
 
-#: includes/ui/db_pager_view.inc:175
+#: ../includes/ui/db_pager_view.inc:175
 msgid "First"
 msgstr ""
 
-#: includes/ui/db_pager_view.inc:176
+#: ../includes/ui/db_pager_view.inc:176
 msgid "Prev"
 msgstr ""
 
-#: includes/ui/db_pager_view.inc:177
+#: ../includes/ui/db_pager_view.inc:177
 msgid "Next"
 msgstr ""
 
-#: includes/ui/db_pager_view.inc:178
+#: ../includes/ui/db_pager_view.inc:178
 msgid "Last"
 msgstr ""
 
-#: includes/ui/db_pager_view.inc:187
+#: ../includes/ui/db_pager_view.inc:187
 #, php-format
 msgid "Records %d-%d of %d"
 msgstr ""
 
-#: includes/ui/db_pager_view.inc:191
+#: ../includes/ui/db_pager_view.inc:191
 msgid "No records"
 msgstr ""
 
-#: includes/ui/radio.ui_input.inc:206 includes/ui/simple_crud_class.inc:227
-#: includes/ui/ui_input.inc:206 includes/ui/ui_input.inc:207
+#: ../includes/ui/simple_crud_class.inc:227
+#: ../includes/ui/ui_input.inc:208
 msgid "Submit changes"
 msgstr ""
 
-#: includes/ui/radio.ui_input.inc:207 includes/ui/simple_crud_class.inc:229
-#: includes/ui/ui_input.inc:207 includes/ui/ui_input.inc:208
+#: ../includes/ui/simple_crud_class.inc:229
+#: ../includes/ui/ui_input.inc:209
 msgid "Clone"
 msgstr ""
 
-#: includes/ui/radio.ui_input.inc:208 includes/ui/simple_crud_class.inc:229
-#: includes/ui/ui_input.inc:208 includes/ui/ui_input.inc:209
+#: ../includes/ui/simple_crud_class.inc:229
+#: ../includes/ui/ui_input.inc:210
 msgid "Edit new record with current data"
 msgstr ""
 
-#: includes/ui/radio.ui_input.inc:209 includes/ui/simple_crud_class.inc:231
-#: includes/ui/ui_input.inc:209 includes/ui/ui_input.inc:210
+#: ../includes/ui/simple_crud_class.inc:231
+#: ../includes/ui/ui_input.inc:211
 msgid "Cancel edition"
 msgstr ""
 
-#: includes/ui/radio.ui_input.inc:628 includes/ui/ui_input.inc:627
-#: reporting/includes/reports_classes.inc:216 includes/ui/ui_input.inc:631
-#: reporting/includes/reports_classes.inc:219
+#: ../includes/ui/ui_controls.inc:79
+msgid "Request from outside of this page is forbidden."
+msgstr ""
+
+#: ../includes/ui/ui_controls.inc:80
+msgid "CSRF attack detected from: "
+msgstr ""
+
+#: ../includes/ui/ui_controls.inc:146
+msgid "You should automatically be forwarded."
+msgstr ""
+
+#: ../includes/ui/ui_controls.inc:147
+msgid "If this does not happen"
+msgstr ""
+
+#: ../includes/ui/ui_controls.inc:147
+msgid "click here"
+msgstr ""
+
+#: ../includes/ui/ui_controls.inc:147
+msgid "to continue"
+msgstr ""
+
+#: ../includes/ui/ui_controls.inc:194
+msgid "View Attachment"
+msgstr ""
+
+#: ../includes/ui/ui_controls.inc:197
+msgid "Close"
+msgstr ""
+
+#: ../includes/ui/ui_controls.inc:457
+#: ../sales/manage/customers.php:23
+#: ../sales/manage/sav.customers.php:23
+msgid "Customers"
+msgstr ""
+
+#: ../includes/ui/ui_controls.inc:459
+msgid "Branches"
+msgstr ""
+
+#: ../includes/ui/ui_controls.inc:461
+#: ../purchasing/manage/suppliers.php:22
+#: ../purchasing/manage/suppliers.php.orig:23
+msgid "Suppliers"
+msgstr ""
+
+#: ../includes/ui/ui_controls.inc:463
+#: ../inventory/transfers.php:230
+#: ../inventory/manage/items.php:22
+#: ../inventory/manage/items.php.orig:21
+msgid "Items"
+msgstr ""
+
+#: ../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:632
+#: ../reporting/includes/reports_classes.inc:219
 msgid "Click Here to Pick up the date"
 msgstr ""
 
-#: includes/ui/radio.ui_input.inc:911 includes/ui/sav.ui_lists.inc:2131
-#: includes/ui/ui_input.inc:910 includes/ui/ui_lists.inc:2152
-#: 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:302 includes/ui/ui_input.inc:914
+#: ../includes/ui/ui_input.inc:915
+#: ../includes/ui/ui_lists.inc:2156
+#: ../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 ""
 
-#: includes/ui/radio.ui_input.inc:921 includes/ui/radio.ui_input.inc:933
-#: includes/ui/ui_input.inc:920 includes/ui/ui_input.inc:932
-#: includes/ui/ui_input.inc:924 includes/ui/ui_input.inc:936
+#: ../includes/ui/ui_input.inc:925
+#: ../includes/ui/ui_input.inc:937
 msgid "Current Credit:"
 msgstr ""
 
-#: includes/ui/radio.ui_input.inc:947 includes/ui/ui_input.inc:946
-#: includes/ui/ui_input.inc:950
+#: ../includes/ui/ui_input.inc:971
 msgid "Bank Balance:"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:17 includes/ui/ui_lists.inc:17
+#: ../includes/ui/ui_lists.inc:17
 msgid "Set filter"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:100 includes/ui/ui_lists.inc:100
+#: ../includes/ui/ui_lists.inc:100
 msgid "Press Space tab for search pattern entry"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:104 includes/ui/ui_lists.inc:104
+#: ../includes/ui/ui_lists.inc:104
 msgid "Enter code fragment to search or * for all"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:105 includes/ui/ui_lists.inc:105
+#: ../includes/ui/ui_lists.inc:105
 msgid "Enter description fragment to search or * for all"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:449 includes/ui/sav.ui_lists.inc:1367
-#: includes/ui/ui_lists.inc:453 includes/ui/ui_lists.inc:1388
+#: ../includes/ui/ui_lists.inc:453
+#: ../includes/ui/ui_lists.inc:1386
 msgid "All Suppliers"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:453 includes/ui/ui_lists.inc:457
+#: ../includes/ui/ui_lists.inc:457
 msgid "Press Space tab to filter by name fragment"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:454 includes/ui/ui_lists.inc:458
+#: ../includes/ui/ui_lists.inc:458
 msgid "Select supplier"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:498 includes/ui/ui_lists.inc:505
+#: ../includes/ui/ui_lists.inc:505
 msgid "All Customers"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:502 includes/ui/ui_lists.inc:509
+#: ../includes/ui/ui_lists.inc:509
 msgid "Press Space tab to filter by name fragment; F2 - entry new customer"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:503 includes/ui/ui_lists.inc:510
+#: ../includes/ui/ui_lists.inc:510
 msgid "Select customer"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:546 includes/ui/ui_lists.inc:558
+#: ../includes/ui/ui_lists.inc:557
 msgid "All branches"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:549 includes/ui/ui_lists.inc:561
+#: ../includes/ui/ui_lists.inc:560
 msgid "Select customer branch"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:584 includes/ui/ui_lists.inc:601
+#: ../includes/ui/ui_lists.inc:600
 msgid "All Locations"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:736 includes/ui/sav.ui_lists.inc:801
-#: includes/ui/ui_lists.inc:753 includes/ui/ui_lists.inc:822
+#: ../includes/ui/ui_lists.inc:752
+#: ../includes/ui/ui_lists.inc:820
 msgid "All Items"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1274 includes/ui/ui_lists.inc:1295
+#: ../includes/ui/ui_lists.inc:1293
 msgid "All Sales Types"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1603 includes/ui/ui_lists.inc:1624
+#: ../includes/ui/ui_lists.inc:1628
 msgid "Use Item Sales Accounts"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1915 includes/ui/sav.ui_lists.inc:1932
-#: includes/ui/sav.ui_lists.inc:1949 includes/ui/ui_lists.inc:1936
-#: includes/ui/ui_lists.inc:1953 includes/ui/ui_lists.inc:1970
+#: ../includes/ui/ui_lists.inc:1940
+#: ../includes/ui/ui_lists.inc:1957
+#: ../includes/ui/ui_lists.inc:1974
 msgid "All Types"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1916 includes/ui/ui_lists.inc:1937
-#: sales/view/view_sales_order.php:127
+#: ../includes/ui/ui_lists.inc:1941
+#: ../sales/view/view_sales_order.php:140
+#: ../sales/view/view_sales_order.php.orig:127
 msgid "Sales Invoices"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1917 includes/ui/sav.ui_lists.inc:1934
-#: includes/ui/sav.ui_lists.inc:1952 includes/ui/ui_lists.inc:1938
-#: includes/ui/ui_lists.inc:1955 includes/ui/ui_lists.inc:1973
+#: ../includes/ui/ui_lists.inc:1942
+#: ../includes/ui/ui_lists.inc:1959
+#: ../includes/ui/ui_lists.inc:1977
 msgid "Overdue Invoices"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1918 includes/ui/sav.ui_lists.inc:1935
-#: includes/ui/sav.ui_lists.inc:1953 includes/ui/ui_lists.inc:1939
-#: includes/ui/ui_lists.inc:1956 includes/ui/ui_lists.inc:1974
-#: includes/ui/ui_view.inc:484
+#: ../includes/ui/ui_lists.inc:1943
+#: ../includes/ui/ui_lists.inc:1960
+#: ../includes/ui/ui_lists.inc:1978
+#: ../includes/ui/ui_view.inc:551
+#: ../includes/ui/ui_view.inc:555
 msgid "Payments"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1919 includes/ui/sav.ui_lists.inc:1936
-#: includes/ui/sav.ui_lists.inc:1954 includes/ui/ui_lists.inc:1940
-#: includes/ui/ui_lists.inc:1957 includes/ui/ui_lists.inc:1975
-#: sales/view/view_sales_order.php:158
+#: ../includes/ui/ui_lists.inc:1944
+#: ../includes/ui/ui_lists.inc:1961
+#: ../includes/ui/ui_lists.inc:1979
+#: ../sales/view/view_sales_order.php:176
+#: ../sales/view/view_sales_order.php.orig:158
 msgid "Credit Notes"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1920 includes/ui/ui_lists.inc:1941
-#: sales/view/view_sales_order.php:93
+#: ../includes/ui/ui_lists.inc:1945
+#: ../sales/view/view_sales_order.php:106
+#: ../sales/view/view_sales_order.php.orig:93
 msgid "Delivery Notes"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1933 includes/ui/sav.ui_lists.inc:1951
-#: includes/ui/ui_lists.inc:1954 includes/ui/ui_lists.inc:1972
+#: ../includes/ui/ui_lists.inc:1958
+#: ../includes/ui/ui_lists.inc:1976
 msgid "Invoices"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1937 includes/ui/sav.ui_lists.inc:1955
-#: includes/ui/ui_lists.inc:1958 includes/ui/ui_lists.inc:1976
+#: ../includes/ui/ui_lists.inc:1962
+#: ../includes/ui/ui_lists.inc:1980
 msgid "Overdue Credit Notes"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1950 includes/ui/ui_lists.inc:1971
+#: ../includes/ui/ui_lists.inc:1975
 msgid "GRNs"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1968 includes/ui/ui_lists.inc:1989
+#: ../includes/ui/ui_lists.inc:1993
 msgid "Automatically put balance on back order"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1969 includes/ui/ui_lists.inc:1990
+#: ../includes/ui/ui_lists.inc:1994
 msgid "Cancel any quantites not delivered"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1986 includes/ui/ui_lists.inc:2007
+#: ../includes/ui/ui_lists.inc:2011
 msgid "Items Returned to Inventory Location"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1987 includes/ui/ui_lists.inc:2008
+#: ../includes/ui/ui_lists.inc:2012
 msgid "Items Written Off"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:2157 includes/ui/ui_lists.inc:2178
+#: ../includes/ui/ui_lists.inc:2182
 msgid "New role"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:2215 includes/ui/ui_lists.inc:2236
+#: ../includes/ui/ui_lists.inc:2240
 msgid "No tags defined."
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:2215 includes/ui/ui_lists.inc:2236
+#: ../includes/ui/ui_lists.inc:2240
 msgid "No active tags defined."
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:2253 includes/ui/ui_lists.inc:2274
+#: ../includes/ui/ui_lists.inc:2278
 #, php-format
 msgid "Activated for '%s'"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:2256 includes/ui/ui_lists.inc:2277
+#: ../includes/ui/ui_lists.inc:2281
 msgid "Available and/or installed"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:2326 includes/ui/ui_lists.inc:2347
+#: ../includes/ui/ui_lists.inc:2351
 msgid "Standard new company American COA (4 digit)"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:2328 includes/ui/ui_lists.inc:2349
+#: ../includes/ui/ui_lists.inc:2353
 msgid "Standard American COA (4 digit) with demo data"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:2349 includes/ui/ui_lists.inc:2370
+#: ../includes/ui/ui_lists.inc:2374
 msgid "No payment Link"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:72
-msgid "Request from outside of this page is forbidden."
-msgstr ""
-
-#: includes/ui/ui_controls.inc:73
-msgid "CSRF attack detected from: "
-msgstr ""
-
-#: includes/ui/ui_controls.inc:139
-msgid "You should automatically be forwarded."
-msgstr ""
-
-#: includes/ui/ui_controls.inc:140
-msgid "If this does not happen"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:140
-msgid "click here"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:140
-msgid "to continue"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:187
-msgid "View Attachment"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:190
-msgid "Close"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:450 sales/manage/customers.php:23
-#: sales/manage/customers.php.orig:20
-msgid "Customers"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:452
-msgid "Branches"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:454 purchasing/manage/suppliers.php:22
-msgid "Suppliers"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:456 inventory/transfers.php:230
-#: inventory/manage/items.php:21
-msgid "Items"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:601
-msgid "Entered data has not been saved yet.\\nDo you want to abandon changes?"
-msgstr ""
-
-#: includes/ui/ui_msgs.inc:63
+#: ../includes/ui/ui_msgs.inc:63
 msgid "in units of : "
 msgstr ""
 
-#: includes/ui/ui_view.inc:306
+#: ../includes/ui/ui_view.inc:306
 msgid "Date Voided:"
 msgstr ""
 
-#: includes/ui/ui_view.inc:407 reporting/rep107.php:173
-#: reporting/rep109.php:182 reporting/rep110.php:186 reporting/rep111.php:169
-#: reporting/rep113.php:172 reporting/rep209.php:188
+#: ../includes/ui/ui_view.inc: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 ""
 
-#: includes/ui/ui_view.inc:413 includes/ui/ui_view.inc:432
-#: includes/ui/ui_view.inc:451 reporting/rep107.php:182
-#: reporting/rep109.php:191 reporting/rep110.php:195 reporting/rep111.php:178
-#: reporting/rep113.php:181 reporting/rep209.php:197
+#: ../includes/ui/ui_view.inc:413
+#: ../includes/ui/ui_view.inc:432
+#: ../includes/ui/ui_view.inc: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 ""
 
-#: includes/ui/ui_view.inc:484
-#: purchasing/inquiry/supplier_allocation_inquiry.php:100
-msgid "Allocations"
-msgstr ""
-
-#: includes/ui/ui_view.inc:488 reporting/includes/doctext.inc:145
-#: reporting/includes/doctext.inc:186
+#: ../includes/ui/ui_view.inc:488
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:208
 msgid "Total Amount"
 msgstr ""
 
-#: includes/ui/ui_view.inc:512 includes/ui/ui_view.inc:513
+#: ../includes/ui/ui_view.inc:512
 msgid "Total Allocated:"
 msgstr ""
 
-#: includes/ui/ui_view.inc:516 includes/ui/ui_view.inc:517
+#: ../includes/ui/ui_view.inc:518
 msgid "Left to Allocate:"
 msgstr ""
 
-#: includes/ui/ui_view.inc:569 includes/ui/ui_view.inc:570
+#: ../includes/ui/ui_view.inc:534
+#: ../includes/ui/ui_view.inc:538
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:99
+msgid "Allocations"
+msgstr ""
+
+#: ../includes/ui/ui_view.inc:551
+#: ../includes/ui/ui_view.inc:555
+msgid "Pre-Payments"
+msgstr ""
+
+#: ../includes/ui/ui_view.inc:571
 msgid "No Quick Entries are defined."
 msgstr ""
 
-#: includes/ui/ui_view.inc:597 includes/ui/ui_view.inc:598
+#: ../includes/ui/ui_view.inc:599
 msgid "No Quick Entry lines are defined."
 msgstr ""
 
-#: includes/ui/ui_view.inc:779 purchasing/includes/ui/invoice_ui.inc:452
-#: includes/ui/ui_view.inc:780
+#: ../includes/ui/ui_view.inc:781
+#: ../purchasing/includes/ui/invoice_ui.inc:473
 msgid "and"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc:842
 msgid "January"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc:842
 msgid "February"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc:842
 msgid "March"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc:842
 msgid "April"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc:842
 msgid "May"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc:842
 msgid "June"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc:842
 msgid "July"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc:842
 msgid "August"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc:842
 msgid "September"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc:842
 msgid "October"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc:842
 msgid "November"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc:842
 msgid "December"
 msgstr ""
 
-#: includes/ui/ui_view.inc:841 includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc:843
 msgid "Su"
 msgstr ""
 
-#: includes/ui/ui_view.inc:841 includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc:843
 msgid "Mo"
 msgstr ""
 
-#: includes/ui/ui_view.inc:841 includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc:843
 msgid "Tu"
 msgstr ""
 
-#: includes/ui/ui_view.inc:841 includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc:843
 msgid "We"
 msgstr ""
 
-#: includes/ui/ui_view.inc:841 includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc:843
 msgid "Th"
 msgstr ""
 
-#: includes/ui/ui_view.inc:841 includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc:843
 msgid "Fr"
 msgstr ""
 
-#: includes/ui/ui_view.inc:841 includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc:843
 msgid "Sa"
 msgstr ""
 
-#: includes/ui/ui_view.inc:842 includes/ui/ui_view.inc:843
+#: ../includes/ui/ui_view.inc:844
 msgid "W"
 msgstr ""
 
-#: includes/ui/view_package.php:7
+#: ../includes/ui/view_package.php:7
 msgid "Package Details"
 msgstr ""
 
-#: 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 ""
 
-#: includes/ui/view_package.php:19
+#: ../includes/ui/view_package.php:19
 msgid "Available version"
 msgstr ""
 
-#: includes/ui/view_package.php:20
+#: ../includes/ui/view_package.php:20
 msgid "Package type"
 msgstr ""
 
-#: includes/ui/view_package.php:21
+#: ../includes/ui/view_package.php:21
 msgid "Package content"
 msgstr ""
 
-#: includes/ui/view_package.php:23
+#: ../includes/ui/view_package.php:23
 msgid "Author"
 msgstr ""
 
-#: includes/ui/view_package.php:24
+#: ../includes/ui/view_package.php:24
 msgid "Home page"
 msgstr ""
 
-#: includes/ui/view_package.php:25
+#: ../includes/ui/view_package.php:25
 msgid "Package maintainer"
 msgstr ""
 
-#: includes/ui/view_package.php:26
+#: ../includes/ui/view_package.php:26
 msgid "Installation path"
 msgstr ""
 
-#: includes/ui/view_package.php:27
+#: ../includes/ui/view_package.php:27
 msgid "Minimal software versions"
 msgstr ""
 
-#: includes/ui/view_package.php:28
+#: ../includes/ui/view_package.php:28
 msgid "Right to left"
 msgstr ""
 
-#: includes/ui/view_package.php:29
+#: ../includes/ui/view_package.php:29
 msgid "Charset encoding"
 msgstr ""
 
-#: includes/ui/view_package.php:34
+#: ../includes/ui/view_package.php:34
 #, php-format
 msgid "Content information for package '%s'"
 msgstr ""
 
-#: includes/ui/view_package.php:37
+#: ../includes/ui/view_package.php:37
 msgid "Property"
 msgstr ""
 
-#: inventory/adjustments.php:28
+#: ../inventory/adjustments.php:28
 msgid "Item Adjustments Note"
 msgstr ""
 
-#: 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 ""
 
-#: inventory/adjustments.php:34 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 ""
 
-#: inventory/adjustments.php:43
+#: ../inventory/adjustments.php:43
 msgid "Items adjustment has been processed"
 msgstr ""
 
-#: inventory/adjustments.php:44
+#: ../inventory/adjustments.php:44
 msgid "&View this adjustment"
 msgstr ""
 
-#: inventory/adjustments.php:46
+#: ../inventory/adjustments.php:46
 msgid "View the GL &Postings for this Adjustment"
 msgstr ""
 
-#: inventory/adjustments.php:48
+#: ../inventory/adjustments.php:48
 msgid "Enter &Another Adjustment"
 msgstr ""
 
-#: inventory/adjustments.php:90 inventory/transfers.php:87
-#: sales/sales_order_entry.php:350 sales/sales_order_entry.php:359
-#: sales/sales_order_entry.php.orig:358
+#: ../inventory/adjustments.php:90
+#: ../inventory/transfers.php:87
+#: ../sales/sales_order_entry.php:369
 msgid "You must enter at least one non empty item line."
 msgstr ""
 
-#: inventory/adjustments.php:110 inventory/transfers.php:105
+#: ../inventory/adjustments.php:110
+#: ../inventory/transfers.php:105
 msgid "The entered date for the adjustment is invalid."
 msgstr ""
 
-#: inventory/adjustments.php:124
+#: ../inventory/adjustments.php:124
 msgid ""
 "The adjustment cannot be processed because an adjustment item would cause a "
 "negative inventory balance :"
 msgstr ""
 
-#: inventory/adjustments.php:154 manufacturing/work_order_issue.php:141
+#: ../inventory/adjustments.php:154
+#: ../manufacturing/work_order_issue.php:141
 msgid "The quantity entered is negative or invalid."
 msgstr ""
 
-#: inventory/adjustments.php:161 manufacturing/work_order_issue.php:148
+#: ../inventory/adjustments.php:161
+#: ../manufacturing/work_order_issue.php:148
 msgid "The entered standard cost is negative or invalid."
 msgstr ""
 
-#: inventory/adjustments.php:230
+#: ../inventory/adjustments.php:230
 msgid "Adjustment Items"
 msgstr ""
 
-#: inventory/adjustments.php:236
+#: ../inventory/adjustments.php:236
 msgid "Process Adjustment"
 msgstr ""
 
-#: inventory/cost_update.php:26
+#: ../inventory/cost_update.php:26
 msgid "Inventory Item Cost Update"
 msgstr ""
 
-#: 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 ""
 
-#: inventory/cost_update.php:51
+#: ../inventory/cost_update.php:51
 msgid "The entered cost is not numeric."
 msgstr ""
 
-#: 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 ""
 
-#: inventory/cost_update.php:67
+#: ../inventory/cost_update.php:67
 msgid "Cost has been updated."
 msgstr ""
 
-#: inventory/cost_update.php:71
+#: ../inventory/cost_update.php:71
 msgid "View the GL Journal Entries for this Cost Update"
 msgstr ""
 
-#: inventory/cost_update.php:85 inventory/prices.php:56
-#: inventory/purchasing_data.php:101 inventory/reorder_level.php:43
-#: inventory/inquiry/stock_movements.php:53
-#: inventory/inquiry/stock_status.php: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_orders_view.php:241
-#: sales/inquiry/sales_orders_view.php.orig:239
+#: ../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_orders_view.php:263
 msgid "Item:"
 msgstr ""
 
-#: inventory/cost_update.php:102
+#: ../inventory/cost_update.php:102
 msgid "Standard Material Cost Per Unit"
 msgstr ""
 
-#: inventory/cost_update.php:105
+#: ../inventory/cost_update.php:105
 msgid "Standard Labour Cost Per Unit"
 msgstr ""
 
-#: inventory/cost_update.php:106
+#: ../inventory/cost_update.php:106
 msgid "Standard Overhead Cost Per Unit"
 msgstr ""
 
-#: inventory/prices.php:16
+#: ../inventory/prices.php:16
 msgid "Inventory Item Sales prices"
 msgstr ""
 
-#: inventory/prices.php:27 inventory/inquiry/stock_movements.php:32
-#: inventory/inquiry/stock_status.php:37 inventory/manage/sales_kits.php:24
-#: manufacturing/inquiry/where_used_inquiry.php:21
-#: 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 ""
 
-#: 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 ""
 
-#: inventory/prices.php:70
+#: ../inventory/prices.php:70
 msgid "The price entered must be numeric."
 msgstr ""
 
-#: inventory/prices.php:83
+#: ../inventory/prices.php:83
 msgid "This price has been updated."
 msgstr ""
 
-#: inventory/prices.php:91
+#: ../inventory/prices.php:91
 msgid "The new price has been added."
 msgstr ""
 
-#: inventory/prices.php:105
+#: ../inventory/prices.php:105
 msgid "The selected price has been deleted."
 msgstr ""
 
-#: inventory/prices.php:133 reporting/rep104.php:116
-#: sales/customer_delivery.php:355 sales/customer_invoice.php:400
-#: sales/view/view_credit.php:73 sales/view/view_dispatch.php:93
-#: sales/view/view_invoice.php:92 sales/includes/ui/sales_credit_ui.inc:102
-#: sales/customer_invoice.php:402
+#: ../inventory/prices.php:133
+#: ../reporting/rep104.php:116
+#: ../sales/customer_delivery.php.orig:368
+#: ../sales/customer_invoice.php:468
+#: ../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 ""
 
-#: inventory/prices.php:133 inventory/purchasing_data.php:129
-#: purchasing/includes/ui/invoice_ui.inc:484
-#: 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:170
-#: sales/customer_credit_invoice.php:283 sales/customer_delivery.php:433
-#: sales/customer_invoice.php:468 sales/view/view_credit.php:91
-#: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:114
-#: sales/view/view_sales_order.php:202
-#: sales/includes/ui/sales_credit_ui.inc:168
-#: sales/customer_credit_invoice.php:281 sales/customer_invoice.php:470
+#: ../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:281
+#: ../sales/customer_delivery.php.orig:446
+#: ../sales/customer_invoice.php:542
+#: ../sales/customer_invoice.php:545
+#: ../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 ""
 
-#: inventory/prices.php:155
+#: ../inventory/prices.php:155
 msgid "There are no prices set up for this part."
 msgstr ""
 
-#: inventory/prices.php:174
+#: ../inventory/prices.php:174
+#: ../inventory/purchasing_data.php.orig:189
 msgid "Currency:"
 msgstr ""
 
-#: inventory/prices.php:176
+#: ../inventory/prices.php:176
 msgid "Sales Type:"
 msgstr ""
 
-#: inventory/prices.php:184 inventory/purchasing_data.php:191
+#: ../inventory/prices.php:184
+#: ../inventory/purchasing_data.php:191
+#: ../inventory/purchasing_data.php.orig:193
 msgid "Price:"
 msgstr ""
 
-#: inventory/prices.php:184
+#: ../inventory/prices.php:184
 msgid "per"
 msgstr ""
 
-#: inventory/prices.php:188
+#: ../inventory/prices.php:188
 msgid "The price is calculated."
 msgstr ""
 
-#: inventory/purchasing_data.php:16
+#: ../inventory/purchasing_data.php:16
+#: ../inventory/purchasing_data.php.orig:17
 msgid "Supplier Purchasing Data"
 msgstr ""
 
-#: inventory/purchasing_data.php:23 purchasing/po_entry_items.php:64
-#: purchasing/po_entry_items.php:67
+#: ../inventory/purchasing_data.php:23
+#: ../inventory/purchasing_data.php.orig:24
+#: ../purchasing/po_entry_items.php:70
+#: ../purchasing/po_entry_items.php.orig:67
 msgid "There are no purchasable inventory items defined in the system."
 msgstr ""
 
-#: inventory/purchasing_data.php:24 purchasing/po_entry_items.php:62
-#: purchasing/supplier_credit.php:32 purchasing/supplier_invoice.php:32
-#: purchasing/supplier_payment.php:40 purchasing/po_entry_items.php:65
+#: ../inventory/purchasing_data.php:24
+#: ../inventory/purchasing_data.php.orig:25
+#: ../purchasing/po_entry_items.php:68
+#: ../purchasing/po_entry_items.php.orig: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 ""
 
-#: inventory/purchasing_data.php:38 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 ""
 
-#: inventory/purchasing_data.php:44
+#: ../inventory/purchasing_data.php:44
+#: ../inventory/purchasing_data.php.orig:45
 msgid "The price entered was not numeric."
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: inventory/purchasing_data.php:66
+#: ../inventory/purchasing_data.php:66
+#: ../inventory/purchasing_data.php.orig:67
 msgid "Supplier purchasing data has been updated."
 msgstr ""
 
-#: 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 ""
 
-#: inventory/purchasing_data.php:114
+#: ../inventory/purchasing_data.php:114
 msgid "Entered item is not defined. Please re-enter."
 msgstr ""
 
-#: inventory/purchasing_data.php:123
+#: ../inventory/purchasing_data.php:123
 msgid "There is no purchasing data set up for the part selected"
 msgstr ""
 
-#: inventory/purchasing_data.php:130
+#: ../inventory/purchasing_data.php:130
+#: ../inventory/purchasing_data.php.orig:222
 msgid "Supplier's Unit"
 msgstr ""
 
-#: inventory/purchasing_data.php:130
+#: ../inventory/purchasing_data.php:130
+#: ../inventory/purchasing_data.php.orig:223
 msgid "Conversion Factor"
 msgstr ""
 
-#: inventory/purchasing_data.php:130
+#: ../inventory/purchasing_data.php:130
 msgid "Supplier's Description"
 msgstr ""
 
-#: inventory/purchasing_data.php:192
+#: ../inventory/purchasing_data.php:192
+#: ../inventory/purchasing_data.php.orig:194
 msgid "Suppliers Unit of Measure:"
 msgstr ""
 
-#: inventory/purchasing_data.php:198
+#: ../inventory/purchasing_data.php:198
+#: ../inventory/purchasing_data.php.orig:200
 msgid "Conversion Factor (to our UOM):"
 msgstr ""
 
-#: inventory/purchasing_data.php:200
+#: ../inventory/purchasing_data.php:200
+#: ../inventory/purchasing_data.php.orig:202
 msgid "Supplier's Code or Description:"
 msgstr ""
 
-#: 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/includes/ui/po_ui.inc.orig: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:280
+#: ../sales/customer_delivery.php.orig:444
+#: ../sales/customer_invoice.php:541
+#: ../sales/customer_invoice.php:544
+#: ../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.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/includes/ui/po_ui.inc.orig: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:280
+#: ../sales/customer_delivery.php.orig:444
+#: ../sales/customer_invoice.php:541
+#: ../sales/customer_invoice.php:544
+#: ../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.orig:140
+msgid "Item Description"
+msgstr ""
+
+#: ../inventory/reorder_level.php:16
 msgid "Reorder Levels"
 msgstr ""
 
-#: inventory/reorder_level.php:24 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 ""
 
-#: inventory/reorder_level.php:57 inventory/inquiry/stock_status.php:72
-#: inventory/inquiry/stock_status.php: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:124
-#: purchasing/inquiry/po_search_completed.php:134
-#: 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
+#: ../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 ""
 
-#: inventory/reorder_level.php:57 inventory/inquiry/stock_movements.php:82
-#: inventory/inquiry/stock_status.php:76 purchasing/supplier_credit.php:203
-#: sales/sales_order_entry.php:492 sales/includes/ui/sales_order_ui.inc:175
-#: sales/sales_order_entry.php:496 sales/includes/ui/sales_order_ui.inc:179
-#: sales/sales_order_entry.php:507 sales/sales_order_entry.php.orig:506
+#: ../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:523
+#: ../sales/includes/ui/sales_order_ui.inc.orig:175
 msgid "Quantity On Hand"
 msgstr ""
 
-#: inventory/reorder_level.php:57 inventory/inquiry/stock_status.php:76
-#: sales/includes/db/sales_order_db.inc:110
-#: sales/includes/db/sales_order_db.inc:263
-#: sales/includes/db/sales_order_db.inc.orig:110
-#: sales/includes/db/sales_order_db.inc.orig:263
+#: ../inventory/reorder_level.php:57
+#: ../inventory/inquiry/stock_status.php:70
+#: ../inventory/inquiry/stock_status.php.orig:76
+#: ../sales/includes/db/old.sales_order_db.inc:110
+#: ../sales/includes/db/old.sales_order_db.inc:263
+#: ../sales/includes/db/sales_order_db.inc:112
+#: ../sales/includes/db/sales_order_db.inc:275
+#: ../sales/includes/db/sales_order_db.inc.orig:112
+#: ../sales/includes/db/sales_order_db.inc.orig:275
 msgid "Re-Order Level"
 msgstr ""
 
-#: inventory/reorder_level.php:75
+#: ../inventory/reorder_level.php:75
 msgid "Reorder levels has been updated."
 msgstr ""
 
-#: inventory/transfers.php:28
+#: ../inventory/transfers.php:28
 msgid "Inventory Location Transfers"
 msgstr ""
 
-#: inventory/transfers.php:43
+#: ../inventory/transfers.php:43
 msgid "Inventory transfer has been processed"
 msgstr ""
 
-#: inventory/transfers.php:44
+#: ../inventory/transfers.php:44
 msgid "&View this transfer"
 msgstr ""
 
-#: inventory/transfers.php:46
+#: ../inventory/transfers.php:46
 msgid "Enter &Another Inventory Transfer"
 msgstr ""
 
-#: inventory/transfers.php:117
+#: ../inventory/transfers.php:117
 msgid "The locations to transfer from and to must be different."
 msgstr ""
 
-#: 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 ""
 
-#: inventory/transfers.php:160
+#: ../inventory/transfers.php:160
 msgid "The quantity entered must be a positive number."
 msgstr ""
 
-#: inventory/transfers.php:237
+#: ../inventory/transfers.php:237
 msgid "Process Transfer"
 msgstr ""
 
-#: inventory/includes/item_adjustments_ui.inc:20
-#: inventory/includes/stock_transfers_ui.inc:20
-#: manufacturing/includes/work_order_issue_ui.inc:20
-#: sales/includes/ui/sales_order_ui.inc:60
+#: ../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 ""
 
-#: inventory/includes/item_adjustments_ui.inc:34
-#: manufacturing/work_order_entry.php:210 purchasing/inquiry/po_search.php:67
-#: sales/inquiry/sales_deliveries_view.php:107
-#: sales/inquiry/sales_orders_view.php:232
-#: sales/inquiry/sales_orders_view.php.orig:230
+#: ../inventory/includes/item_adjustments_ui.inc:34
+#: ../manufacturing/work_order_entry.php:210
+#: ../purchasing/inquiry/po_search.php:67
+#: ../sales/inquiry/sales_deliveries_view.php:107
+#: ../sales/inquiry/sales_orders_view.php:254
 msgid "Location:"
 msgstr ""
 
-#: inventory/includes/item_adjustments_ui.inc:43
+#: ../inventory/includes/item_adjustments_ui.inc:43
 msgid "Detail:"
 msgstr ""
 
-#: inventory/includes/item_adjustments_ui.inc:48
+#: ../inventory/includes/item_adjustments_ui.inc:48
 msgid "Positive Adjustment"
 msgstr ""
 
-#: inventory/includes/item_adjustments_ui.inc:48
+#: ../inventory/includes/item_adjustments_ui.inc:48
 msgid "Negative Adjustment"
 msgstr ""
 
-#: inventory/includes/item_adjustments_ui.inc:62
-#: inventory/includes/stock_transfers_ui.inc:60
-#: manufacturing/includes/work_order_issue_ui.inc:33
-#: purchasing/includes/ui/po_ui.inc:236 purchasing/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:169
-#: reporting/includes/doctext.inc:206 sales/customer_credit_invoice.php:282
-#: sales/customer_delivery.php:431 sales/customer_invoice.php:467
-#: sales/view/view_credit.php:90 sales/view/view_dispatch.php:112
-#: sales/view/view_invoice.php:113 sales/view/view_sales_order.php:201
-#: sales/includes/ui/sales_credit_ui.inc:167
-#: sales/includes/ui/sales_order_ui.inc:140
-#: sales/customer_credit_invoice.php:280 sales/customer_invoice.php:469
-#: sales/includes/ui/sales_order_ui.inc:144
-msgid "Item Code"
-msgstr ""
-
-#: inventory/includes/item_adjustments_ui.inc:62
-#: inventory/includes/stock_transfers_ui.inc:60
-#: manufacturing/includes/work_order_issue_ui.inc:33
-#: purchasing/includes/ui/po_ui.inc:236 purchasing/view/view_grn.php:40
-#: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:29
-#: reporting/includes/doctext.inc:169 reporting/includes/doctext.inc:206
-#: sales/customer_credit_invoice.php:282 sales/customer_delivery.php:431
-#: sales/customer_invoice.php:467 sales/view/view_credit.php:90
-#: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:113
-#: sales/view/view_sales_order.php:201
-#: sales/includes/ui/sales_credit_ui.inc:167
-#: sales/includes/ui/sales_order_ui.inc:140
-#: sales/customer_credit_invoice.php:280 sales/customer_invoice.php:469
-#: sales/includes/ui/sales_order_ui.inc:144
-msgid "Item Description"
-msgstr ""
-
-#: inventory/includes/item_adjustments_ui.inc:62
-#: inventory/includes/stock_transfers_ui.inc:60
-#: inventory/manage/item_codes.php:124 inventory/manage/sales_kits.php:40
-#: inventory/view/view_adjustment.php:56 inventory/view/view_transfer.php:56
-#: manufacturing/view/wo_issue_view.php:77
-#: manufacturing/manage/bom_edit.php:71
-#: manufacturing/includes/manufacturing_ui.inc:29
-#: manufacturing/includes/manufacturing_ui.inc:157
-#: manufacturing/includes/manufacturing_ui.inc:332
-#: manufacturing/includes/work_order_issue_ui.inc:33
-#: purchasing/includes/ui/invoice_ui.inc:484
-#: purchasing/includes/ui/po_ui.inc:236 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:170
-#: reporting/includes/doctext.inc:203 sales/view/view_credit.php:90
-#: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:113
-#: sales/view/view_sales_order.php:201
-#: sales/includes/ui/sales_credit_ui.inc:167
-#: sales/includes/ui/sales_order_ui.inc:140
-#: sales/includes/ui/sales_order_ui.inc:144
+#: ../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/includes/ui/po_ui.inc.orig: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:541
+#: ../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.orig:140
 msgid "Quantity"
 msgstr ""
 
-#: 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:237 purchasing/view/view_grn.php:41
-#: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:30
-#: reporting/includes/doctext.inc:170 sales/view/view_credit.php:91
-#: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:114
-#: sales/view/view_sales_order.php:201
-#: sales/includes/ui/sales_credit_ui.inc:167
-#: sales/includes/ui/sales_order_ui.inc:142
-#: sales/includes/ui/sales_order_ui.inc:146
+#: ../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/includes/ui/po_ui.inc.orig: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.orig:142
 msgid "Unit"
 msgstr ""
 
-#: 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
+#: ../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 ""
 
-#: inventory/includes/stock_transfers_ui.inc:35
-#: inventory/inquiry/stock_movements.php:60
-#: manufacturing/includes/work_order_issue_ui.inc:164
+#: ../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 ""
 
-#: inventory/includes/stock_transfers_ui.inc:36
+#: ../inventory/includes/stock_transfers_ui.inc:36
 msgid "To Location:"
 msgstr ""
 
-#: inventory/includes/stock_transfers_ui.inc:46
+#: ../inventory/includes/stock_transfers_ui.inc:46
 msgid "Transfer Type:"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: inventory/includes/db/items_db.inc:125
-#: 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 ""
 
-#: 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 ""
 
-#: inventory/inquiry/stock_movements.php:28
+#: ../inventory/inquiry/stock_movements.php:26
+#: ../inventory/inquiry/stock_movements.php.orig:27
 msgid "Inventory Item Movement"
 msgstr ""
 
-#: inventory/inquiry/stock_movements.php:65
+#: ../inventory/inquiry/stock_movements.php:61
+#: ../inventory/inquiry/stock_movements.php.orig:63
 msgid "Show Movements"
 msgstr ""
 
-#: inventory/inquiry/stock_movements.php:65
-#: purchasing/includes/ui/invoice_ui.inc:453
-#: purchasing/inquiry/supplier_allocation_inquiry.php:57
-#: purchasing/inquiry/supplier_inquiry.php:58
-#: purchasing/inquiry/supplier_inquiry.php.orig:54
-#: sales/inquiry/customer_allocation_inquiry.php:51
-#: sales/inquiry/customer_inquiry.php:58
-#: sales/inquiry/customer_inquiry.php.orig:58
+#: ../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_inquiry.php:54
 msgid "Refresh Inquiry"
 msgstr ""
 
-#: inventory/inquiry/stock_movements.php:81
+#: ../inventory/inquiry/stock_movements.php:77
+#: ../inventory/inquiry/stock_movements.php.orig:79
 msgid "Detail"
 msgstr ""
 
-#: inventory/inquiry/stock_movements.php:82
+#: ../inventory/inquiry/stock_movements.php:78
+#: ../inventory/inquiry/stock_movements.php.orig:80
 msgid "Quantity In"
 msgstr ""
 
-#: inventory/inquiry/stock_movements.php:82
+#: ../inventory/inquiry/stock_movements.php:78
+#: ../inventory/inquiry/stock_movements.php.orig:80
 msgid "Quantity Out"
 msgstr ""
 
-#: inventory/inquiry/stock_movements.php:97
+#: ../inventory/inquiry/stock_movements.php:93
+#: ../inventory/inquiry/stock_movements.php.orig:95
 msgid "Quantity on hand before"
 msgstr ""
 
-#: inventory/inquiry/stock_movements.php:185
+#: ../inventory/inquiry/stock_movements.php:181
+#: ../inventory/inquiry/stock_movements.php.orig:183
 msgid "Quantity on hand after"
 msgstr ""
 
-#: inventory/inquiry/stock_status.php:19 inventory/inquiry/stock_status.php:21
+#: ../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 ""
 
-#: inventory/inquiry/stock_status.php:62
+#: ../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 ""
 
-#: inventory/inquiry/stock_status.php:72 inventory/inquiry/stock_status.php:77
-#: reporting/rep303.php:109 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 ""
 
-#: inventory/inquiry/stock_status.php:77 reporting/rep303.php:109
-#: 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 ""
 
-#: inventory/manage/item_categories.php:16
+#: ../inventory/manage/item_categories.php:16
 msgid "Item Categories"
 msgstr ""
 
-#: inventory/manage/item_categories.php:34
+#: ../inventory/manage/item_categories.php:34
 msgid "The item category description cannot be empty."
 msgstr ""
 
-#: inventory/manage/item_categories.php:48
+#: ../inventory/manage/item_categories.php:48
 msgid "Selected item category has been updated"
 msgstr ""
 
-#: inventory/manage/item_categories.php:58
+#: ../inventory/manage/item_categories.php:58
 msgid "New item category has been added"
 msgstr ""
 
-#: 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 ""
 
-#: inventory/manage/item_categories.php:77
+#: ../inventory/manage/item_categories.php:77
 msgid "Selected item category has been deleted"
 msgstr ""
 
-#: inventory/manage/item_categories.php:98
+#: ../inventory/manage/item_categories.php:98
 msgid "Tax type"
 msgstr ""
 
-#: inventory/manage/item_categories.php:98 inventory/manage/item_codes.php:124
-#: inventory/manage/sales_kits.php:40 inventory/view/view_adjustment.php:57
-#: inventory/view/view_transfer.php:56 manufacturing/view/wo_issue_view.php:77
-#: manufacturing/manage/bom_edit.php:71 purchasing/po_receive_items.php:62
-#: sales/customer_credit_invoice.php:282 sales/customer_delivery.php:432
-#: sales/customer_invoice.php:467 sales/customer_credit_invoice.php:280
-#: sales/customer_invoice.php:469
+#: ../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:280
+#: ../sales/customer_delivery.php.orig:445
+#: ../sales/customer_invoice.php:541
+#: ../sales/customer_invoice.php:544
 msgid "Units"
 msgstr ""
 
-#: inventory/manage/item_categories.php:98
+#: ../inventory/manage/item_categories.php:98
 msgid "Sales Act"
 msgstr ""
 
-#: inventory/manage/item_categories.php:99
+#: ../inventory/manage/item_categories.php:99
 msgid "Inventory Account"
 msgstr ""
 
-#: inventory/manage/item_categories.php:99
+#: ../inventory/manage/item_categories.php:99
 msgid "COGS Account"
 msgstr ""
 
-#: inventory/manage/item_categories.php:99
+#: ../inventory/manage/item_categories.php:99
 msgid "Adjustment Account"
 msgstr ""
 
-#: inventory/manage/item_categories.php:100
+#: ../inventory/manage/item_categories.php:100
 msgid "Assembly Account"
 msgstr ""
 
-#: inventory/manage/item_categories.php:180
+#: ../inventory/manage/item_categories.php:180
 msgid "Category Name:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:182
+#: ../inventory/manage/item_categories.php:182
 msgid "Default values for new items"
 msgstr ""
 
-#: inventory/manage/item_categories.php:184 inventory/manage/items.php:326
+#: ../inventory/manage/item_categories.php:184
+#: ../inventory/manage/items.php:333
+#: ../inventory/manage/items.php.orig:326
 msgid "Item Tax Type:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:186 inventory/manage/items.php:328
+#: ../inventory/manage/item_categories.php:186
+#: ../inventory/manage/items.php:335
+#: ../inventory/manage/items.php.orig:328
 msgid "Item Type:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:188 inventory/manage/items.php:330
+#: ../inventory/manage/item_categories.php:188
+#: ../inventory/manage/items.php:337
+#: ../inventory/manage/items.php.orig:330
 msgid "Units of Measure:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:190 inventory/manage/items.php:334
+#: ../inventory/manage/item_categories.php:190
+#: ../inventory/manage/items.php:341
+#: ../inventory/manage/items.php.orig:334
 msgid "Exclude from sales:"
 msgstr ""
 
-#: inventory/manage/item_codes.php:16
+#: ../inventory/manage/item_codes.php:16
 msgid "Foreign Item Codes"
 msgstr ""
 
-#: inventory/manage/item_codes.php:23 sales/sales_order_entry.php:659
-#: sales/sales_order_entry.php:663 sales/sales_order_entry.php:674
-#: sales/sales_order_entry.php.orig:673
+#: ../inventory/manage/item_codes.php:23
+#: ../sales/sales_order_entry.php:690
 msgid "There are no inventory items defined in the system."
 msgstr ""
 
-#: inventory/manage/item_codes.php:41
+#: ../inventory/manage/item_codes.php:41
 msgid "The price entered was not positive number."
 msgstr ""
 
-#: inventory/manage/item_codes.php:47 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 ""
 
-#: inventory/manage/item_codes.php:55 inventory/manage/items.php:156
-#: 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 ""
 
-#: inventory/manage/item_codes.php:67
+#: ../inventory/manage/item_codes.php:67
 msgid "New item code has been added."
 msgstr ""
 
-#: inventory/manage/item_codes.php:73
+#: ../inventory/manage/item_codes.php:73
 msgid "Item code has been updated."
 msgstr ""
 
-#: inventory/manage/item_codes.php:85
+#: ../inventory/manage/item_codes.php:85
 msgid "Item code has been sucessfully deleted."
 msgstr ""
 
-#: inventory/manage/item_codes.php:124
+#: ../inventory/manage/item_codes.php:124
 msgid "EAN/UPC Code"
 msgstr ""
 
-#: 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
+#: ../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 ""
 
-#: inventory/manage/item_codes.php:178
+#: ../inventory/manage/item_codes.php:178
 msgid "UPC/EAN code:"
 msgstr ""
 
-#: inventory/manage/item_codes.php:179 inventory/manage/sales_kits.php:245
-#: manufacturing/work_order_add_finished.php:206
-#: manufacturing/work_order_entry.php:424
-#: manufacturing/manage/bom_edit.php:228
+#: ../inventory/manage/item_codes.php: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 ""
 
-#: inventory/manage/item_codes.php:180 inventory/manage/items.php: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:167
-#: 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 ""
 
-#: inventory/manage/item_codes.php:181 inventory/manage/items.php:303
-#: inventory/manage/sales_kits.php:207 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 ""
 
-#: inventory/manage/items.php:80
+#: ../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 ""
 
-#: inventory/manage/items.php:106
+#: ../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 ""
 
-#: inventory/manage/items.php:108
+#: ../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 ""
 
-#: inventory/manage/items.php:135
+#: ../inventory/manage/items.php:142
+#: ../inventory/manage/items.php.orig:135
 msgid "The item name must be entered."
 msgstr ""
 
-#: inventory/manage/items.php:141
+#: ../inventory/manage/items.php:148
+#: ../inventory/manage/items.php.orig:141
 msgid "The item code cannot be empty"
 msgstr ""
 
-#: inventory/manage/items.php:149
+#: ../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 ""
 
-#: inventory/manage/items.php:185
+#: ../inventory/manage/items.php:192
+#: ../inventory/manage/items.php.orig:185
 msgid "Item has been updated."
 msgstr ""
 
-#: inventory/manage/items.php:198
+#: ../inventory/manage/items.php:205
+#: ../inventory/manage/items.php.orig:198
 msgid "A new item has been added."
 msgstr ""
 
-#: inventory/manage/items.php:241
+#: ../inventory/manage/items.php:248
+#: ../inventory/manage/items.php.orig:241
 msgid "Selected item has been deleted."
 msgstr ""
 
-#: inventory/manage/items.php: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:471
-#: purchasing/includes/ui/invoice_ui.inc:483 reporting/rep204.php:82
+#: ../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 ""
 
-#: inventory/manage/items.php:263 inventory/manage/items.php:294
+#: ../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 ""
 
-#: inventory/manage/items.php:332
+#: ../inventory/manage/items.php:339
+#: ../inventory/manage/items.php.orig:332
 msgid "Editable description:"
 msgstr ""
 
-#: inventory/manage/items.php:352 sales/manage/customer_branches.php:248
+#: ../inventory/manage/items.php:359
+#: ../inventory/manage/items.php.orig:352
+#: ../sales/manage/customer_branches.php:249
 msgid "GL Accounts"
 msgstr ""
 
-#: inventory/manage/items.php:375
+#: ../inventory/manage/items.php:382
+#: ../inventory/manage/items.php.orig:375
 msgid "Other"
 msgstr ""
 
-#: inventory/manage/items.php:378
+#: ../inventory/manage/items.php:385
+#: ../inventory/manage/items.php.orig:378
 msgid "Image File (.jpg)"
 msgstr ""
 
-#: inventory/manage/items.php:393
+#: ../inventory/manage/items.php:400
+#: ../inventory/manage/items.php.orig:393
 msgid "No image"
 msgstr ""
 
-#: inventory/manage/items.php:398
+#: ../inventory/manage/items.php:405
+#: ../inventory/manage/items.php.orig:398
 msgid "Delete Image:"
 msgstr ""
 
-#: inventory/manage/items.php:400
+#: ../inventory/manage/items.php:407
+#: ../inventory/manage/items.php.orig:400
 msgid "Item status:"
 msgstr ""
 
-#: inventory/manage/items.php:406
+#: ../inventory/manage/items.php:413
+#: ../inventory/manage/items.php.orig:406
 msgid "Insert New Item"
 msgstr ""
 
-#: inventory/manage/items.php:410
+#: ../inventory/manage/items.php:417
+#: ../inventory/manage/items.php.orig:410
 msgid "Update Item"
 msgstr ""
 
-#: inventory/manage/items.php:413
+#: ../inventory/manage/items.php:420
+#: ../inventory/manage/items.php.orig:413
 msgid "Select this items and return to document entry."
 msgstr ""
 
-#: inventory/manage/items.php:414
+#: ../inventory/manage/items.php:421
+#: ../inventory/manage/items.php.orig:414
 msgid "Clone This Item"
 msgstr ""
 
-#: inventory/manage/items.php:415
+#: ../inventory/manage/items.php:422
+#: ../inventory/manage/items.php.orig:415
 msgid "Delete This Item"
 msgstr ""
 
-#: inventory/manage/items.php:430
+#: ../inventory/manage/items.php:437
+#: ../inventory/manage/items.php.orig:430
 msgid "Select an item:"
 msgstr ""
 
-#: inventory/manage/items.php:431
+#: ../inventory/manage/items.php:438
+#: ../inventory/manage/items.php.orig:431
 msgid "New item"
 msgstr ""
 
-#: inventory/manage/items.php:454 purchasing/manage/suppliers.php:306
-#: sales/manage/customer_branches.php:322 sales/manage/customers.php:342
-#: sales/manage/customers.php.orig:339 sales/manage/customers.php:344
+#: ../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:344
+#: ../sales/manage/sav.customers.php:342
 msgid "&General settings"
 msgstr ""
 
-#: inventory/manage/items.php:455 purchasing/manage/suppliers.php:308
-#: sales/manage/customers.php:344 sales/manage/customers.php.orig:341
-#: sales/manage/customers.php:346
+#: ../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:346
+#: ../sales/manage/sav.customers.php:344
 msgid "&Transactions"
 msgstr ""
 
-#: inventory/manage/items.php:456
+#: ../inventory/manage/items.php:463
+#: ../inventory/manage/items.php.orig:456
 msgid "&Status"
 msgstr ""
 
-#: inventory/manage/item_units.php:16
+#: ../inventory/manage/item_units.php:16
 msgid "Units of Measure"
 msgstr ""
 
-#: inventory/manage/item_units.php:34
+#: ../inventory/manage/item_units.php:34
 msgid "The unit of measure code cannot be empty."
 msgstr ""
 
-#: inventory/manage/item_units.php:40
+#: ../inventory/manage/item_units.php:40
 msgid "The unit of measure code is too long."
 msgstr ""
 
-#: inventory/manage/item_units.php:46
+#: ../inventory/manage/item_units.php:46
 msgid "The unit of measure description cannot be empty."
 msgstr ""
 
-#: inventory/manage/item_units.php:53
+#: ../inventory/manage/item_units.php:53
 msgid "Selected unit has been updated"
 msgstr ""
 
-#: inventory/manage/item_units.php:55
+#: ../inventory/manage/item_units.php:55
 msgid "New unit has been added"
 msgstr ""
 
-#: 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 ""
 
-#: inventory/manage/item_units.php:75
+#: ../inventory/manage/item_units.php:75
 msgid "Selected unit has been deleted"
 msgstr ""
 
-#: inventory/manage/item_units.php:94
+#: ../inventory/manage/item_units.php:94
 msgid "Decimals"
 msgstr ""
 
-#: inventory/manage/item_units.php:107 inventory/manage/item_units.php:142
+#: ../inventory/manage/item_units.php:107
+#: ../inventory/manage/item_units.php:142
 msgid "User Quantity Decimals"
 msgstr ""
 
-#: inventory/manage/item_units.php:136 inventory/manage/item_units.php:139
+#: ../inventory/manage/item_units.php:136
+#: ../inventory/manage/item_units.php:139
 msgid "Unit Abbreviation:"
 msgstr ""
 
-#: inventory/manage/item_units.php:140
+#: ../inventory/manage/item_units.php:140
 msgid "Descriptive Name:"
 msgstr ""
 
-#: inventory/manage/item_units.php:142
+#: ../inventory/manage/item_units.php:142
 msgid "Decimal Places:"
 msgstr ""
 
-#: inventory/manage/locations.php:16
+#: ../inventory/manage/locations.php:16
 msgid "Inventory Locations"
 msgstr ""
 
-#: 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 ""
 
-#: inventory/manage/locations.php:45
+#: ../inventory/manage/locations.php:45
 msgid "The location name must be entered."
 msgstr ""
 
-#: inventory/manage/locations.php:56
+#: ../inventory/manage/locations.php:56
 msgid "Selected location has been updated"
 msgstr ""
 
-#: inventory/manage/locations.php:65
+#: ../inventory/manage/locations.php:65
 msgid "New location has been added"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: inventory/manage/locations.php:94 inventory/manage/locations.php:100
-#: inventory/manage/locations.php:105 inventory/manage/locations.php:110
-#: inventory/manage/locations.php:115
+#: ../inventory/manage/locations.php: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 ""
 
-#: inventory/manage/locations.php:129
+#: ../inventory/manage/locations.php:129
 msgid "Selected location has been deleted"
 msgstr ""
 
-#: inventory/manage/locations.php:146
+#: ../inventory/manage/locations.php:146
 msgid "Location Code"
 msgstr ""
 
-#: inventory/manage/locations.php:146
+#: ../inventory/manage/locations.php:146
 msgid "Location Name"
 msgstr ""
 
-#: inventory/manage/locations.php:192 inventory/manage/locations.php:196
+#: ../inventory/manage/locations.php:192
+#: ../inventory/manage/locations.php:196
 msgid "Location Code:"
 msgstr ""
 
-#: inventory/manage/locations.php:199
+#: ../inventory/manage/locations.php:199
 msgid "Location Name:"
 msgstr ""
 
-#: inventory/manage/locations.php:200
+#: ../inventory/manage/locations.php:200
 msgid "Contact for deliveries:"
 msgstr ""
 
-#: inventory/manage/locations.php:204
+#: ../inventory/manage/locations.php:204
 msgid "Telephone No:"
 msgstr ""
 
-#: inventory/manage/locations.php:206
+#: ../inventory/manage/locations.php:206
 msgid "Facsimile No:"
 msgstr ""
 
-#: inventory/manage/movement_types.php:16
+#: ../inventory/manage/movement_types.php:16
 msgid "Inventory Movement Types"
 msgstr ""
 
-#: inventory/manage/movement_types.php:34
+#: ../inventory/manage/movement_types.php:34
 msgid "The inventory movement type name cannot be empty."
 msgstr ""
 
-#: inventory/manage/movement_types.php:43
+#: ../inventory/manage/movement_types.php:43
 msgid "Selected movement type has been updated"
 msgstr ""
 
-#: inventory/manage/movement_types.php:48
+#: ../inventory/manage/movement_types.php:48
 msgid "New movement type has been added"
 msgstr ""
 
-#: 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 ""
 
-#: inventory/manage/movement_types.php:76
+#: ../inventory/manage/movement_types.php:76
 msgid "Selected movement type has been deleted"
 msgstr ""
 
-#: inventory/manage/sales_kits.php:16
+#: ../inventory/manage/sales_kits.php:16
 msgid "Sales Kits & Alias Codes"
 msgstr ""
 
-#: inventory/manage/sales_kits.php:40
+#: ../inventory/manage/sales_kits.php:40
 msgid "Stock Item"
 msgstr ""
 
-#: inventory/manage/sales_kits.php:54
+#: ../inventory/manage/sales_kits.php:54
 msgid "kit"
 msgstr ""
 
-#: inventory/manage/sales_kits.php:72 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 ""
 
-#: inventory/manage/sales_kits.php:93
+#: ../inventory/manage/sales_kits.php:93
 msgid "Kit/alias code cannot be empty."
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: inventory/manage/sales_kits.php:116
+#: ../inventory/manage/sales_kits.php:116
 msgid "New alias code has been created."
 msgstr ""
 
-#: inventory/manage/sales_kits.php:119
+#: ../inventory/manage/sales_kits.php:119
 msgid "New component has been added to selected kit."
 msgstr ""
 
-#: inventory/manage/sales_kits.php:129
+#: ../inventory/manage/sales_kits.php:129
 msgid "Component of selected kit has been updated."
 msgstr ""
 
-#: inventory/manage/sales_kits.php:139
+#: ../inventory/manage/sales_kits.php:139
 msgid "Kit common properties has been updated"
 msgstr ""
 
-#: 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 ""
 
-#: inventory/manage/sales_kits.php:168 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 ""
 
-#: inventory/manage/sales_kits.php:183
+#: ../inventory/manage/sales_kits.php:183
 msgid "Select a sale kit:"
 msgstr ""
 
-#: inventory/manage/sales_kits.php:184
+#: ../inventory/manage/sales_kits.php:184
 msgid "New kit"
 msgstr ""
 
-#: inventory/manage/sales_kits.php:199
+#: ../inventory/manage/sales_kits.php:199
 msgid "Alias/kit code:"
 msgstr ""
 
-#: inventory/manage/sales_kits.php:208
+#: ../inventory/manage/sales_kits.php:208
 msgid "Update kit/alias name"
 msgstr ""
 
-#: inventory/manage/sales_kits.php:223 manufacturing/manage/bom_edit.php:204
-#: manufacturing/manage/bom_edit.php:211
+#: ../inventory/manage/sales_kits.php:223
+#: ../manufacturing/manage/bom_edit.php:204
+#: ../manufacturing/manage/bom_edit.php:211
 msgid "Component:"
 msgstr ""
 
-#: inventory/manage/sales_kits.php:237
+#: ../inventory/manage/sales_kits.php:237
 msgid "kits"
 msgstr ""
 
-#: inventory/view/view_adjustment.php:17
+#: ../inventory/view/view_adjustment.php:17
 msgid "View Inventory Adjustment"
 msgstr ""
 
-#: inventory/view/view_adjustment.php:43
+#: ../inventory/view/view_adjustment.php:43
 msgid "At Location"
 msgstr ""
 
-#: inventory/view/view_adjustment.php:46 inventory/view/view_transfer.php:46
+#: ../inventory/view/view_adjustment.php:46
+#: ../inventory/view/view_transfer.php:46
 msgid "Adjustment Type"
 msgstr ""
 
-#: inventory/view/view_adjustment.php:73
+#: ../inventory/view/view_adjustment.php:73
 msgid "This adjustment has been voided."
 msgstr ""
 
-#: inventory/view/view_transfer.php:17
+#: ../inventory/view/view_transfer.php:17
 msgid "View Inventory Transfer"
 msgstr ""
 
-#: 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:207
+#: ../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 ""
 
-#: inventory/view/view_transfer.php:41
+#: ../inventory/view/view_transfer.php:41
 msgid "To Location"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:26
+#: ../manufacturing/search_work_orders.php:26
 msgid "Search Outstanding Work Orders"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:31
+#: ../manufacturing/search_work_orders.php:31
 msgid "Search Work Orders"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:69
+#: ../manufacturing/search_work_orders.php:69
 msgid "at Location:"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:76
-#: purchasing/inquiry/po_search_completed.php:75
+#: ../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 ""
 
-#: manufacturing/search_work_orders.php:78
-#: purchasing/inquiry/po_search_completed.php:77
-#: purchasing/inquiry/po_search.php:76
-#: sales/inquiry/sales_deliveries_view.php:116
-#: sales/inquiry/sales_orders_view.php:247
-#: sales/inquiry/sales_orders_view.php.orig:245
+#: ../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_orders_view.php:269
 msgid "Select documents"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:117
+#: ../manufacturing/search_work_orders.php:117
 msgid "Release"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:120
+#: ../manufacturing/search_work_orders.php:120
 msgid "Issue"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:127
+#: ../manufacturing/search_work_orders.php:127
 msgid "Produce"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:140
+#: ../manufacturing/search_work_orders.php:140
 msgid "Costs"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:164
+#: ../manufacturing/search_work_orders.php:164
 msgid "Required"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:167
-#: manufacturing/includes/manufacturing_ui.inc:277
-#: manufacturing/includes/manufacturing_ui.inc:281
-#: reporting/includes/doctext.inc:205 sales/inquiry/sales_orders_view.php:268
-#: sales/inquiry/sales_orders_view.php.orig:266
+#: ../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
 msgid "Required By"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:176
+#: ../manufacturing/search_work_orders.php:176
 msgid "Marked orders are overdue."
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:29
+#: ../manufacturing/work_order_add_finished.php:29
 msgid "Produce or Unassemble Finished Items From Work Order"
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:44
+#: ../manufacturing/work_order_add_finished.php:44
 msgid "The manufacturing process has been entered."
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:46
-#: manufacturing/work_order_costs.php:45 manufacturing/work_order_entry.php:56
-#: manufacturing/work_order_issue.php:38
-#: manufacturing/work_order_release.php:72
+#: ../manufacturing/work_order_add_finished.php: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 ""
 
-#: manufacturing/work_order_add_finished.php:48
-#: manufacturing/work_order_costs.php:47 manufacturing/work_order_entry.php:65
-#: manufacturing/work_order_issue.php:40
+#: ../manufacturing/work_order_add_finished.php:48
+#: ../manufacturing/work_order_entry.php:65
+#: ../manufacturing/work_order_issue.php:42
 msgid "View the GL Journal Entries for this Work Order"
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:50
-#: manufacturing/work_order_entry.php:67
+#: ../manufacturing/work_order_add_finished.php:50
+#: ../manufacturing/work_order_entry.php:67
 msgid "Print the GL Journal Entries for this Work Order"
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:52
-#: manufacturing/work_order_costs.php:51 manufacturing/work_order_issue.php:42
+#: ../manufacturing/work_order_add_finished.php:52
+#: ../manufacturing/work_order_costs.php:49
+#: ../manufacturing/work_order_issue.php:44
 msgid "Select another &Work Order to Process"
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:65
-#: manufacturing/work_order_costs.php:64
-#: manufacturing/work_order_entry.php:341
-#: manufacturing/includes/db/work_order_issues_db.inc:30
-#: manufacturing/includes/db/work_order_produce_items_db.inc:27
+#: ../manufacturing/work_order_add_finished.php: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 ""
 
-#: manufacturing/work_order_add_finished.php:91
+#: ../manufacturing/work_order_add_finished.php:91
 msgid "The quantity entered is not a valid number or less then zero."
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:110
+#: ../manufacturing/work_order_add_finished.php:110
 msgid ""
 "The production date cannot be before the release date of the work order."
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:117
+#: ../manufacturing/work_order_add_finished.php:117
 msgid ""
 "The production exceeds the quantity needed. Please change the Work Order."
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:129
+#: ../manufacturing/work_order_add_finished.php:129
 msgid ""
 "The unassembling cannot be processed because there is insufficient stock."
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:147
+#: ../manufacturing/work_order_add_finished.php:147
 msgid ""
 "The production cannot be processed because a required item would cause a "
 "negative inventory balance :"
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:204
+#: ../manufacturing/work_order_add_finished.php:204
 msgid "Produce Finished Items"
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:204
+#: ../manufacturing/work_order_add_finished.php:204
 msgid "Return Items to Work Order"
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:214
-#: purchasing/allocations/supplier_allocate.php:65
-#: sales/allocations/customer_allocate.php:64
+#: ../manufacturing/work_order_add_finished.php:214
+#: ../purchasing/allocations/supplier_allocate.php:65
+#: ../sales/allocations/customer_allocate.php:64
 msgid "Process"
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:215
+#: ../manufacturing/work_order_add_finished.php:215
 msgid "Process And Close Order"
 msgstr ""
 
-#: manufacturing/work_order_costs.php:29
+#: ../manufacturing/work_order_costs.php:29
 msgid "Work Order Additional Costs"
 msgstr ""
 
-#: manufacturing/work_order_costs.php:43
+#: ../manufacturing/work_order_costs.php:43
 msgid "The additional cost has been entered."
 msgstr ""
 
-#: manufacturing/work_order_costs.php:49
+#: ../manufacturing/work_order_costs.php:47
 msgid "Enter another additional cost."
 msgstr ""
 
-#: manufacturing/work_order_costs.php:76
+#: ../manufacturing/work_order_costs.php:73
 msgid "The amount entered is not a valid number or less then zero."
 msgstr ""
 
-#: manufacturing/work_order_costs.php:95
+#: ../manufacturing/work_order_costs.php:92
 msgid ""
 "The additional cost date cannot be before the release date of the work order."
 msgstr ""
 
-#: manufacturing/work_order_costs.php:159
+#: ../manufacturing/work_order_costs.php:143
 msgid "Additional Costs:"
 msgstr ""
 
-#: manufacturing/work_order_costs.php:160
+#: ../manufacturing/work_order_costs.php:144
 msgid "Debit Account"
 msgstr ""
 
-#: manufacturing/work_order_costs.php:167
+#: ../manufacturing/work_order_costs.php:151
 msgid "Process Additional Cost"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:29
+#: ../manufacturing/work_order_entry.php:29
 msgid "Work Order Entry"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:32
+#: ../manufacturing/work_order_entry.php:32
 msgid "There are no manufacturable items defined in the system."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:54
+#: ../manufacturing/work_order_entry.php:54
 msgid "The work order been added."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:62
+#: ../manufacturing/work_order_entry.php:62
 msgid "Print this Work Order"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:64
+#: ../manufacturing/work_order_entry.php:64
 msgid "Email this Work Order"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:80
+#: ../manufacturing/work_order_entry.php:80
 msgid "The work order been updated."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:90
+#: ../manufacturing/work_order_entry.php:90
 msgid "Work order has been deleted."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:100
+#: ../manufacturing/work_order_entry.php:100
 msgid ""
 "This work order has been closed. There can be no more issues against it."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:110
+#: ../manufacturing/work_order_entry.php:110
 msgid "Enter a new work order"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:111
+#: ../manufacturing/work_order_entry.php:111
 msgid "Select an existing work order"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:147
+#: ../manufacturing/work_order_entry.php:147
 msgid "The quantity entered is invalid or less than zero."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:169
+#: ../manufacturing/work_order_entry.php:169
 msgid "The selected item to manufacture does not have a bom."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:178
+#: ../manufacturing/work_order_entry.php:178
 msgid "The labour cost entered is invalid or less than zero."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:186
+#: ../manufacturing/work_order_entry.php:186
 msgid "The cost entered is invalid or less than zero."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:209
+#: ../manufacturing/work_order_entry.php:209
 msgid ""
 "The work order cannot be processed because there is an insufficient quantity "
 "for component:"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:223
+#: ../manufacturing/work_order_entry.php:223
 msgid ""
 "The selected item cannot be unassembled because there is insufficient stock."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:249
+#: ../manufacturing/work_order_entry.php:249
 msgid ""
 "The quantity cannot be changed to be less than the quantity already "
 "manufactured for this order."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:298
+#: ../manufacturing/work_order_entry.php:298
 msgid ""
 "This work order cannot be deleted because it has already been processed."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:349
+#: ../manufacturing/work_order_entry.php:349
 msgid "This work order is closed and cannot be edited."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:397
-#: manufacturing/work_order_entry.php:405
+#: ../manufacturing/work_order_entry.php:397
+#: ../manufacturing/work_order_entry.php:405
 msgid "Destination Location:"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:416
+#: ../manufacturing/work_order_entry.php:416
 msgid "Quantity Required:"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:418
+#: ../manufacturing/work_order_entry.php:418
 msgid "Quantity Manufactured:"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:437
+#: ../manufacturing/work_order_entry.php:437
 msgid "Credit Labour Account"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:444
+#: ../manufacturing/work_order_entry.php:444
 msgid "Credit Overhead Account"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:449
+#: ../manufacturing/work_order_entry.php:449
 msgid "Released On:"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:459
+#: ../manufacturing/work_order_entry.php:459
 msgid "Save changes to work order"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:462
+#: ../manufacturing/work_order_entry.php:462
 msgid "Close This Work Order"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:464
+#: ../manufacturing/work_order_entry.php:464
 msgid "Delete This Work Order"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:470
+#: ../manufacturing/work_order_entry.php:470
 msgid "Add Workorder"
 msgstr ""
 
-#: manufacturing/work_order_issue.php:29
+#: ../manufacturing/work_order_issue.php:31
 msgid "Issue Items to Work Order"
 msgstr ""
 
-#: manufacturing/work_order_issue.php:36
+#: ../manufacturing/work_order_issue.php:38
 msgid "The work order issue has been entered."
 msgstr ""
 
-#: manufacturing/work_order_issue.php:79
+#: ../manufacturing/work_order_issue.php:78
 msgid "The entered date for the issue is invalid."
 msgstr ""
 
-#: manufacturing/work_order_issue.php:106
+#: ../manufacturing/work_order_issue.php:106
 msgid ""
 "The issue cannot be processed because an entered item would cause a negative "
 "inventory balance :"
 msgstr ""
 
-#: manufacturing/work_order_issue.php:124
+#: ../manufacturing/work_order_issue.php:124
 msgid ""
 "The process cannot be completed because there is an insufficient total "
 "quantity for a component."
 msgstr ""
 
-#: manufacturing/work_order_issue.php:125
+#: ../manufacturing/work_order_issue.php:125
 msgid "Component is :"
 msgstr ""
 
-#: manufacturing/work_order_issue.php:126
+#: ../manufacturing/work_order_issue.php:126
 msgid "From location :"
 msgstr ""
 
-#: manufacturing/work_order_issue.php:219
+#: ../manufacturing/work_order_issue.php:219
 msgid "Items to Issue"
 msgstr ""
 
-#: manufacturing/work_order_issue.php:225
+#: ../manufacturing/work_order_issue.php:225
 msgid "Process Issue"
 msgstr ""
 
-#: manufacturing/work_order_release.php:27
+#: ../manufacturing/work_order_release.php:27
 msgid "Work Order Release to Manufacturing"
 msgstr ""
 
-#: manufacturing/work_order_release.php:49
+#: ../manufacturing/work_order_release.php:49
 msgid "This work order has already been released."
 msgstr ""
 
-#: 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 ""
 
-#: manufacturing/work_order_release.php:70
+#: ../manufacturing/work_order_release.php:70
 msgid "The work order has been released to manufacturing."
 msgstr ""
 
-#: manufacturing/work_order_release.php:74
+#: ../manufacturing/work_order_release.php:74
 msgid "Select another &work order"
 msgstr ""
 
-#: manufacturing/work_order_release.php:95
+#: ../manufacturing/work_order_release.php:95
 msgid "Work Order #:"
 msgstr ""
 
-#: manufacturing/work_order_release.php:96
+#: ../manufacturing/work_order_release.php:96
 msgid "Work Order Reference:"
 msgstr ""
 
-#: manufacturing/work_order_release.php:98
-#: manufacturing/includes/manufacturing_ui.inc:278
+#: ../manufacturing/work_order_release.php:98
+#: ../manufacturing/includes/manufacturing_ui.inc:278
 msgid "Released Date"
 msgstr ""
 
-#: manufacturing/work_order_release.php:104
+#: ../manufacturing/work_order_release.php:104
 msgid "Release Work Order"
 msgstr ""
 
-#: 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 ""
 
-#: manufacturing/view/wo_issue_view.php:43
+#: ../manufacturing/view/wo_issue_view.php:43
 msgid "Issue #"
 msgstr ""
 
-#: manufacturing/view/wo_issue_view.php:43
-#: 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 ""
 
-#: manufacturing/view/wo_issue_view.php:44
+#: ../manufacturing/view/wo_issue_view.php:44
 msgid "To Work Centre"
 msgstr ""
 
-#: manufacturing/view/wo_issue_view.php:44
+#: ../manufacturing/view/wo_issue_view.php:44
 msgid "Date of Issue"
 msgstr ""
 
-#: manufacturing/view/wo_issue_view.php:61
+#: ../manufacturing/view/wo_issue_view.php:61
 msgid "This issue has been voided."
 msgstr ""
 
-#: manufacturing/view/wo_issue_view.php:72
+#: ../manufacturing/view/wo_issue_view.php:72
 msgid "There are no items for this issue."
 msgstr ""
 
-#: manufacturing/view/wo_issue_view.php:77
-#: manufacturing/includes/manufacturing_ui.inc:28
-#: manufacturing/includes/manufacturing_ui.inc:83 reporting/rep401.php:69
-#: reporting/rep401.php:74
+#: ../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 ""
 
-#: manufacturing/view/wo_issue_view.php:114
+#: ../manufacturing/view/wo_issue_view.php:114
 msgid "Items for this Issue"
 msgstr ""
 
-#: manufacturing/view/wo_production_view.php:20
+#: ../manufacturing/view/wo_production_view.php:20
 msgid "View Work Order Production"
 msgstr ""
 
-#: manufacturing/view/wo_production_view.php:44
+#: ../manufacturing/view/wo_production_view.php:44
 msgid "Production #"
 msgstr ""
 
-#: manufacturing/view/wo_production_view.php:45
+#: ../manufacturing/view/wo_production_view.php:45
 msgid "Quantity Manufactured"
 msgstr ""
 
-#: manufacturing/view/wo_production_view.php:61
+#: ../manufacturing/view/wo_production_view.php:61
 msgid "This production has been voided."
 msgstr ""
 
-#: manufacturing/view/work_order_view.php:26
+#: ../manufacturing/view/work_order_view.php:26
 msgid "View Work Order"
 msgstr ""
 
-#: manufacturing/view/work_order_view.php:51
+#: ../manufacturing/view/work_order_view.php:51
 msgid "BOM for item:"
 msgstr ""
 
-#: manufacturing/view/work_order_view.php:56 reporting/rep409.php:91
+#: ../manufacturing/view/work_order_view.php:56
+#: ../reporting/rep409.php:91
 msgid "Work Order Requirements"
 msgstr ""
 
-#: manufacturing/view/work_order_view.php:61
+#: ../manufacturing/view/work_order_view.php:61
 msgid "Issues"
 msgstr ""
 
-#: manufacturing/view/work_order_view.php:64
+#: ../manufacturing/view/work_order_view.php:64
 msgid "Productions"
 msgstr ""
 
-#: manufacturing/view/work_order_view.php:67
-#: 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 ""
 
-#: manufacturing/view/work_order_view.php:82
+#: ../manufacturing/view/work_order_view.php:82
 msgid "This work order has been voided."
 msgstr ""
 
-#: manufacturing/inquiry/bom_cost_inquiry.php:24
-#: manufacturing/manage/bom_edit.php:24
+#: ../manufacturing/inquiry/bom_cost_inquiry.php:24
+#: ../manufacturing/manage/bom_edit.php:24
 msgid "There are no manufactured or kit items defined in the system."
 msgstr ""
 
-#: manufacturing/inquiry/bom_cost_inquiry.php:35
-#: manufacturing/manage/bom_edit.php:170
+#: ../manufacturing/inquiry/bom_cost_inquiry.php:35
+#: ../manufacturing/manage/bom_edit.php:170
 msgid "Select a manufacturable item:"
 msgstr ""
 
-#: manufacturing/inquiry/bom_cost_inquiry.php:38
+#: ../manufacturing/inquiry/bom_cost_inquiry.php:38
 msgid "All Costs Are In:"
 msgstr ""
 
-#: manufacturing/inquiry/where_used_inquiry.php:17
+#: ../manufacturing/inquiry/where_used_inquiry.php:17
 msgid "Inventory Item Where Used Inquiry"
 msgstr ""
 
-#: 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 ""
 
-#: manufacturing/inquiry/where_used_inquiry.php:43
+#: ../manufacturing/inquiry/where_used_inquiry.php:43
 msgid "Parent Item"
 msgstr ""
 
-#: 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:207
+#: ../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 ""
 
-#: manufacturing/inquiry/where_used_inquiry.php:46
-#: manufacturing/includes/manufacturing_ui.inc:277
-#: 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 ""
 
-#: manufacturing/manage/bom_edit.php:16
+#: ../manufacturing/manage/bom_edit.php:16
 msgid "Bill Of Materials"
 msgstr ""
 
-#: 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 ""
 
-#: manufacturing/manage/bom_edit.php:70 reporting/rep105.php:112
+#: ../manufacturing/manage/bom_edit.php:70
+#: ../reporting/rep105.php:112
 msgid "Code"
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:110
+#: ../manufacturing/manage/bom_edit.php:110
 msgid "Selected component has been updated"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: manufacturing/manage/bom_edit.php:224
+#: ../manufacturing/manage/bom_edit.php:224
 msgid "Location to Draw From:"
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:225
+#: ../manufacturing/manage/bom_edit.php:225
 msgid "Work Centre Added:"
 msgstr ""
 
-#: manufacturing/manage/work_centres.php:16
+#: ../manufacturing/manage/work_centres.php:16
 msgid "Work Centres"
 msgstr ""
 
-#: manufacturing/manage/work_centres.php:34
+#: ../manufacturing/manage/work_centres.php:34
 msgid "The work centre name cannot be empty."
 msgstr ""
 
-#: manufacturing/manage/work_centres.php:44
+#: ../manufacturing/manage/work_centres.php:44
 msgid "Selected work center has been updated"
 msgstr ""
 
-#: manufacturing/manage/work_centres.php:49
+#: ../manufacturing/manage/work_centres.php:49
 msgid "New work center has been added"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: manufacturing/manage/work_centres.php:83
+#: ../manufacturing/manage/work_centres.php:83
 msgid "Selected work center has been deleted"
 msgstr ""
 
-#: manufacturing/manage/work_centres.php:101
+#: ../manufacturing/manage/work_centres.php:101
 msgid "description"
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:22
+#: ../manufacturing/includes/manufacturing_ui.inc:22
 msgid "The bill of material for this item is empty."
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:29
-#: manufacturing/includes/manufacturing_ui.inc:61
+#: ../manufacturing/includes/manufacturing_ui.inc:29
+#: ../manufacturing/includes/manufacturing_ui.inc:61
 msgid "Total Cost"
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:77
+#: ../manufacturing/includes/manufacturing_ui.inc:77
 msgid "There are no Requirements for this Order."
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:84
-#: reporting/includes/doctext.inc:207
+#: ../manufacturing/includes/manufacturing_ui.inc:84
+#: ../reporting/includes/doctext.inc:229
 msgid "Unit Quantity"
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:84
-#: reporting/includes/doctext.inc:207
+#: ../manufacturing/includes/manufacturing_ui.inc:84
+#: ../reporting/includes/doctext.inc:229
 msgid "Total Quantity"
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:84
-#: reporting/includes/doctext.inc:207
+#: ../manufacturing/includes/manufacturing_ui.inc:84
+#: ../reporting/includes/doctext.inc:229
 msgid "Units Issued"
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:84
+#: ../manufacturing/includes/manufacturing_ui.inc:84
 msgid "On Hand"
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:138
+#: ../manufacturing/includes/manufacturing_ui.inc:138
 msgid "Marked items have insufficient quantities in stock."
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:152
+#: ../manufacturing/includes/manufacturing_ui.inc:152
 msgid "There are no Productions for this Order."
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:195
+#: ../manufacturing/includes/manufacturing_ui.inc:195
 msgid "There are no Issues for this Order."
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:231
+#: ../manufacturing/includes/manufacturing_ui.inc:231
 msgid "There are no additional costs for this Order."
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:269
-#: manufacturing/includes/manufacturing_ui.inc:325
+#: ../manufacturing/includes/manufacturing_ui.inc:269
+#: ../manufacturing/includes/manufacturing_ui.inc:325
 msgid "The work order number sent is not valid."
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:276
-#: manufacturing/includes/manufacturing_ui.inc:280
-#: manufacturing/includes/manufacturing_ui.inc:331
-#: reporting/includes/doctext.inc:201
+#: ../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 ""
 
-#: manufacturing/includes/manufacturing_ui.inc:277
-#: manufacturing/includes/manufacturing_ui.inc:281
-#: manufacturing/includes/manufacturing_ui.inc:332
-#: reporting/includes/doctext.inc:202
+#: ../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 ""
 
-#: manufacturing/includes/manufacturing_ui.inc:311
-#: 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 ""
 
-#: manufacturing/includes/work_order_issue_ui.inc:162
+#: ../manufacturing/includes/work_order_issue_ui.inc:162
 msgid "Return Items to Location"
 msgstr ""
 
-#: manufacturing/includes/work_order_issue_ui.inc:162
+#: ../manufacturing/includes/work_order_issue_ui.inc:162
 msgid "Issue Items to Work order"
 msgstr ""
 
-#: manufacturing/includes/work_order_issue_ui.inc:165
+#: ../manufacturing/includes/work_order_issue_ui.inc:165
 msgid "To Work Centre:"
 msgstr ""
 
-#: manufacturing/includes/work_order_issue_ui.inc:167
+#: ../manufacturing/includes/work_order_issue_ui.inc:167
 msgid "Issue Date:"
 msgstr ""
 
-#: manufacturing/includes/db/work_order_issues_db.inc:81
+#: ../manufacturing/includes/db/work_order_issues_db.inc:81
 msgid "Issue of"
 msgstr ""
 
-#: manufacturing/includes/db/work_order_issues_db.inc:90
+#: ../manufacturing/includes/db/work_order_issues_db.inc:90
 msgid "Issue to"
 msgstr ""
 
-#: manufacturing/includes/db/work_order_issues_db.inc:208
+#: ../manufacturing/includes/db/work_order_issues_db.inc:208
 msgid "Reversed the issue of"
 msgstr ""
 
-#: manufacturing/includes/db/work_order_issues_db.inc:220
+#: ../manufacturing/includes/db/work_order_issues_db.inc:220
 msgid "Reversed the issue to"
 msgstr ""
 
-#: manufacturing/includes/db/work_order_produce_items_db.inc:74
+#: ../manufacturing/includes/db/work_order_produce_items_db.inc:73
 msgid "Production."
 msgstr ""
 
-#: manufacturing/includes/db/work_order_produce_items_db.inc:158
+#: ../manufacturing/includes/db/work_order_produce_items_db.inc:157
 msgid "Reversed the production "
 msgstr ""
 
-#: manufacturing/includes/db/work_orders_db.inc:278
-#: purchasing/includes/db/po_db.inc:116
-#: sales/includes/db/cust_trans_db.inc:111
-#: sales/includes/db/sales_order_db.inc:249
-#: sales/includes/db/sales_order_db.inc.orig:249
-#: sales/includes/db/cust_trans_db.inc.orig:111
+#: ../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/old.sales_order_db.inc:249
+#: ../sales/includes/db/sales_order_db.inc:261
+#: ../sales/includes/db/sales_order_db.inc.orig:261
 msgid "Updated."
 msgstr ""
 
-#: manufacturing/includes/db/work_orders_db.inc:297
+#: ../manufacturing/includes/db/work_orders_db.inc:100
 msgid "Canceled."
 msgstr ""
 
-#: manufacturing/includes/db/work_orders_db.inc:373
+#: ../manufacturing/includes/db/work_orders_db.inc:176
 msgid "Released."
 msgstr ""
 
-#: manufacturing/includes/db/work_orders_db.inc:445
-#: manufacturing/includes/db/work_orders_db.inc:461
-msgid "Voiding Work Order Trans # "
-msgstr ""
-
-#: manufacturing/includes/db/work_orders_quick_db.inc:106
+#: ../manufacturing/includes/db/work_orders_quick_db.inc:89
 msgid "Quick production."
 msgstr ""
 
-#: manufacturing/includes/db/work_orders_quick_db.inc:220
+#: ../manufacturing/includes/db/work_orders_quick_db.inc:169
 msgid "Produced"
 msgstr ""
 
-#: purchasing/includes/db/invoice_db.inc:284
+#: ../purchasing/includes/db/invoice_db.inc:298
 msgid "Supplier invoice adjustment for zero inventory of "
 msgstr ""
 
-#: purchasing/includes/db/invoice_db.inc:284 reporting/rep106.php:81
-#: sales/inquiry/sales_deliveries_view.php:166
-#: sales/inquiry/sales_orders_view.php:147
-#: sales/inquiry/sales_orders_view.php.orig:145
+#: ../purchasing/includes/db/invoice_db.inc:298
+#: ../reporting/rep106.php:81
+#: ../sales/inquiry/sales_deliveries_view.php:166
+#: ../sales/inquiry/sales_orders_view.php:159
 msgid "Invoice"
 msgstr ""
 
-#: purchasing/includes/db/invoice_db.inc:690
-#: purchasing/includes/db/invoice_db.inc:692
+#: ../purchasing/includes/db/invoice_db.inc:716
+#: ../purchasing/includes/db/invoice_db.inc:718
 msgid "GRN Removal"
 msgstr ""
 
-#: purchasing/includes/ui/grn_ui.inc:23 purchasing/includes/ui/po_ui.inc:319
-#: sales/view/view_sales_order.php:74
+#: ../purchasing/includes/ui/grn_ui.inc:23
+#: ../purchasing/includes/ui/po_ui.inc:326
+#: ../purchasing/includes/ui/po_ui.inc.orig:326
+#: ../sales/view/view_sales_order.php:74
+#: ../sales/view/view_sales_order.php.orig:74
 msgid "Order Currency"
 msgstr ""
 
-#: purchasing/includes/ui/grn_ui.inc:25
+#: ../purchasing/includes/ui/grn_ui.inc:25
 msgid "For Purchase Order"
 msgstr ""
 
-#: purchasing/includes/ui/grn_ui.inc:28 sales/view/view_sales_order.php:67
+#: ../purchasing/includes/ui/grn_ui.inc:28
+#: ../sales/view/view_sales_order.php:67
+#: ../sales/view/view_sales_order.php.orig:67
 msgid "Ordered On"
 msgstr ""
 
-#: purchasing/includes/ui/grn_ui.inc:40 purchasing/includes/ui/grn_ui.inc:54
-#: purchasing/includes/ui/po_ui.inc:334 purchasing/includes/ui/po_ui.inc:339
+#: ../purchasing/includes/ui/grn_ui.inc:40
+#: ../purchasing/includes/ui/grn_ui.inc:54
+#: ../purchasing/includes/ui/po_ui.inc:341
+#: ../purchasing/includes/ui/po_ui.inc:346
+#: ../purchasing/includes/ui/po_ui.inc.orig:341
+#: ../purchasing/includes/ui/po_ui.inc.orig:346
 msgid "Deliver Into Location"
 msgstr ""
 
-#: purchasing/includes/ui/grn_ui.inc:46
+#: ../purchasing/includes/ui/grn_ui.inc:46
 msgid "Date Items Received"
 msgstr ""
 
-#: purchasing/includes/ui/grn_ui.inc:49 purchasing/includes/ui/grn_ui.inc:55
-#: purchasing/includes/ui/po_ui.inc:344
-#: purchasing/view/view_supp_credit.php:44
-#: purchasing/view/view_supp_invoice.php:47
-#: purchasing/inquiry/po_search_completed.php:125
-#: purchasing/inquiry/po_search.php:134
-#: purchasing/inquiry/supplier_inquiry.php:172
-#: purchasing/inquiry/supplier_inquiry.php.orig:166
+#: ../purchasing/includes/ui/grn_ui.inc:49
+#: ../purchasing/includes/ui/grn_ui.inc:55
+#: ../purchasing/includes/ui/po_ui.inc:351
+#: ../purchasing/includes/ui/po_ui.inc.orig: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 ""
 
-#: purchasing/includes/ui/grn_ui.inc:62 purchasing/includes/ui/po_ui.inc:348
-#: sales/view/view_sales_order.php:79
+#: ../purchasing/includes/ui/grn_ui.inc:62
+#: ../purchasing/includes/ui/po_ui.inc:355
+#: ../purchasing/includes/ui/po_ui.inc.orig:355
+#: ../sales/view/view_sales_order.php:92
+#: ../sales/view/view_sales_order.php.orig:79
 msgid "Delivery Address"
 msgstr ""
 
-#: purchasing/includes/ui/grn_ui.inc:65 purchasing/includes/ui/po_ui.inc:352
+#: ../purchasing/includes/ui/grn_ui.inc:65
+#: ../purchasing/includes/ui/po_ui.inc:367
+#: ../purchasing/includes/ui/po_ui.inc.orig:367
 msgid "Order Comments"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:96
-#: 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 ""
 
-#: purchasing/includes/ui/invoice_ui.inc:114
+#: ../purchasing/includes/ui/invoice_ui.inc:125
 msgid "Terms:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:126
-#: purchasing/manage/suppliers.php:98 purchasing/manage/suppliers.php:103
+#: ../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 ""
 
-#: purchasing/includes/ui/invoice_ui.inc:130
-#: purchasing/manage/suppliers.php:105 sales/manage/customer_branches.php:246
-#: sales/manage/customers.php:292 sales/manage/customers.php.orig:289
-#: sales/manage/customers.php:294
+#: ../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:294
+#: ../sales/manage/sav.customers.php:292
 msgid "Tax Group:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:145
+#: ../purchasing/includes/ui/invoice_ui.inc:159
 msgid "Sub-total:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:153
+#: ../purchasing/includes/ui/invoice_ui.inc:167
 msgid "Invoice Total:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:156
-#: sales/customer_credit_invoice.php:332
-#: sales/includes/ui/sales_credit_ui.inc:233
-#: sales/customer_credit_invoice.php:330
+#: ../purchasing/includes/ui/invoice_ui.inc:170
+#: ../sales/customer_credit_invoice.php:330
+#: ../sales/includes/ui/sales_credit_ui.inc:233
 msgid "Credit Note Total"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:187
+#: ../purchasing/includes/ui/invoice_ui.inc:175
+#: ../purchasing/includes/ui/po_ui.inc.orig:487
+#: ../purchasing/po_entry_items.php.orig:554
+msgid "Tax algorithm:"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:207
 msgid "Add GL Line"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:188
+#: ../purchasing/includes/ui/invoice_ui.inc:208
 msgid "Reset"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:189
-#: purchasing/po_receive_items.php:334
+#: ../purchasing/includes/ui/invoice_ui.inc:209
+#: ../purchasing/po_receive_items.php:332
 msgid "Clear all GL entry fields"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:207
+#: ../purchasing/includes/ui/invoice_ui.inc:227
 msgid "GL Items for this Invoice"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:209
+#: ../purchasing/includes/ui/invoice_ui.inc:229
 msgid "GL Items for this Credit Note"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:219
+#: ../purchasing/includes/ui/invoice_ui.inc:239
 msgid "Quick Entry:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:392
+#: ../purchasing/includes/ui/invoice_ui.inc:412
 msgid "Add to Invoice"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:394
+#: ../purchasing/includes/ui/invoice_ui.inc:414
 msgid "Add to Credit Note"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:396 sales/customer_invoice.php:522
-#: sales/customer_invoice.php:524
+#: ../purchasing/includes/ui/invoice_ui.inc:416
+#: ../sales/customer_invoice.php:603
 msgid "Remove"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:396
-#: purchasing/includes/ui/invoice_ui.inc:431
+#: ../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 ""
 
-#: purchasing/includes/ui/invoice_ui.inc:398
+#: ../purchasing/includes/ui/invoice_ui.inc:418
+#, php-format
 msgid ""
-"You are about to remove all yet non-invoiced items from selected delivery "
-"line. This operation also irreversibly changes related order line. Do you "
-"want to continue ?"
+"You are about to remove all yet non-invoiced items from delivery line #%d. "
+"This operation also irreversibly changes related order line. Do you want to "
+"continue ?"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:429
+#: ../purchasing/includes/ui/invoice_ui.inc:449
 msgid "Items Received Yet to be Invoiced"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:434
+#: ../purchasing/includes/ui/invoice_ui.inc:454
 msgid "Delivery Item Selected For Adding To A Supplier Credit Note"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:439
+#: ../purchasing/includes/ui/invoice_ui.inc:459
 msgid "Received Items Charged on this Invoice"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:441
+#: ../purchasing/includes/ui/invoice_ui.inc:461
 msgid "Received Items Credited on this Note"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:451
+#: ../purchasing/includes/ui/invoice_ui.inc:471
 msgid "Received between"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:462
+#: ../purchasing/includes/ui/invoice_ui.inc:483
 msgid "Add All Items"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:471
-#: purchasing/includes/ui/invoice_ui.inc:483
-#: sales/inquiry/sales_orders_view.php:155
-#: sales/inquiry/sales_orders_view.php.orig:153
+#: ../purchasing/includes/ui/invoice_ui.inc:492
+#: ../purchasing/includes/ui/invoice_ui.inc:504
+#: ../sales/inquiry/sales_orders_view.php:167
 msgid "Delivery"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:471
+#: ../purchasing/includes/ui/invoice_ui.inc:492
+msgid "Sequence #"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:492
 msgid "P.O."
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:472
+#: ../purchasing/includes/ui/invoice_ui.inc:493
 msgid "Received On"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:472 purchasing/view/view_po.php:46
+#: ../purchasing/includes/ui/invoice_ui.inc:493
+#: ../purchasing/view/view_po.php:46
 msgid "Quantity Received"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:472 purchasing/view/view_grn.php:41
-#: 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 ""
 
-#: purchasing/includes/ui/invoice_ui.inc:473
+#: ../purchasing/includes/ui/invoice_ui.inc:494
 msgid "Qty Yet To Invoice"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:473
-#: purchasing/includes/ui/po_ui.inc:238
-#: sales/includes/ui/sales_order_ui.inc:142
-#: sales/includes/ui/sales_order_ui.inc:146
+#: ../purchasing/includes/ui/invoice_ui.inc:494
+#: ../purchasing/includes/ui/po_ui.inc:245
+#: ../purchasing/includes/ui/po_ui.inc.orig:245
+#: ../sales/includes/ui/sales_order_ui.inc.orig:142
 msgid "Price after Tax"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:473
-#: purchasing/includes/ui/po_ui.inc:238
-#: sales/includes/ui/sales_order_ui.inc:142
-#: sales/includes/ui/sales_order_ui.inc:146
+#: ../purchasing/includes/ui/invoice_ui.inc:494
+#: ../purchasing/includes/ui/po_ui.inc:245
+#: ../purchasing/includes/ui/po_ui.inc.orig:245
+#: ../sales/includes/ui/sales_order_ui.inc.orig:142
 msgid "Price before Tax"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:479
+#: ../purchasing/includes/ui/invoice_ui.inc:500
 msgid "Qty Yet To Credit"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:484
+#: ../purchasing/includes/ui/invoice_ui.inc:505
 msgid "Line Value"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:551
+#: ../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 ""
 
-#: purchasing/includes/ui/invoice_ui.inc:554
+#: ../purchasing/includes/ui/invoice_ui.inc:576
 msgid ""
 "There are no received items for the selected supplier that have been "
 "invoiced."
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:555
+#: ../purchasing/includes/ui/invoice_ui.inc:577
 msgid "Credits can only be applied to invoiced items."
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:149
+#: ../purchasing/includes/ui/po_ui.inc:156
+#: ../purchasing/includes/ui/po_ui.inc.orig:156
 msgid "Supplier Currency:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:178 sales/sales_order_entry.php:683
-#: sales/sales_order_entry.php:687 sales/sales_order_entry.php:698
-#: sales/sales_order_entry.php.orig:697
+#: ../purchasing/includes/ui/po_ui.inc:185
+#: ../purchasing/includes/ui/po_ui.inc.orig:185
+#: ../sales/sales_order_entry.php:714
 msgid "Order Date:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:179 sales/sales_order_entry.php:670
-#: sales/sales_order_entry.php:674 sales/sales_order_entry.php:685
-#: sales/sales_order_entry.php.orig:684
+#: ../purchasing/includes/ui/po_ui.inc:186
+#: ../purchasing/includes/ui/po_ui.inc.orig:186
+#: ../sales/sales_order_entry.php:701
 msgid "Delivery Date:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:179 sales/sales_order_entry.php:664
-#: sales/sales_order_entry.php:668 sales/sales_order_entry.php:679
-#: sales/sales_order_entry.php.orig:678
+#: ../purchasing/includes/ui/po_ui.inc:186
+#: ../purchasing/includes/ui/po_ui.inc.orig:186
+#: ../sales/sales_order_entry.php:695
 msgid "Invoice Date:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:190
+#: ../purchasing/includes/ui/po_ui.inc:197
+#: ../purchasing/includes/ui/po_ui.inc.orig:197
 msgid "Due Date:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:192
+#: ../purchasing/includes/ui/po_ui.inc:199
+#: ../purchasing/includes/ui/po_ui.inc.orig:199
 msgid "Supplier's Reference:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:193
+#: ../purchasing/includes/ui/po_ui.inc:200
+#: ../purchasing/includes/ui/po_ui.inc.orig:200
 msgid "Receive Into:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:218
+#: ../purchasing/includes/ui/po_ui.inc:225
+#: ../purchasing/includes/ui/po_ui.inc.orig: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 ""
 
-#: purchasing/includes/ui/po_ui.inc:222
+#: ../purchasing/includes/ui/po_ui.inc:229
+#: ../purchasing/includes/ui/po_ui.inc.orig:229
 msgid "Deliver to:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:231
+#: ../purchasing/includes/ui/po_ui.inc:238
+#: ../purchasing/includes/ui/po_ui.inc.orig:238
 msgid "Order Items"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:237 purchasing/po_receive_items.php:62
+#: ../purchasing/includes/ui/po_ui.inc:244
+#: ../purchasing/includes/ui/po_ui.inc.orig:244
+#: ../purchasing/po_receive_items.php:62
 msgid "Received"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:238
-#: sales/includes/ui/sales_order_ui.inc:611
-#: sales/includes/ui/sales_order_ui.inc:615
+#: ../purchasing/includes/ui/po_ui.inc:245
+#: ../purchasing/includes/ui/po_ui.inc.orig:245
+#: ../sales/includes/ui/sales_order_ui.inc.orig:611
 msgid "Required Delivery Date"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:238 purchasing/view/view_grn.php:41
-#: purchasing/view/view_po.php:46
+#: ../purchasing/includes/ui/po_ui.inc:245
+#: ../purchasing/includes/ui/po_ui.inc.orig:245
+#: ../purchasing/view/view_grn.php:41
+#: ../purchasing/view/view_po.php:46
 msgid "Line Total"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:289 purchasing/po_receive_items.php:114
-#: reporting/rep107.php:148 reporting/rep109.php:151 reporting/rep110.php:161
-#: reporting/rep111.php:138 reporting/rep113.php:147 reporting/rep209.php:167
-#: sales/customer_credit_invoice.php:324 sales/customer_delivery.php:501
-#: sales/customer_invoice.php:563 sales/view/view_dispatch.php:146
-#: sales/view/view_invoice.php:148 sales/includes/ui/sales_credit_ui.inc:217
-#: sales/includes/ui/sales_order_ui.inc:229
-#: sales/customer_credit_invoice.php:322 sales/customer_invoice.php:565
-#: sales/includes/ui/sales_order_ui.inc:233
+#: ../purchasing/includes/ui/po_ui.inc:296
+#: ../purchasing/includes/ui/po_ui.inc.orig: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:322
+#: ../sales/customer_delivery.php.orig:514
+#: ../sales/customer_invoice.php:647
+#: ../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.orig:229
 msgid "Sub-total"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:298 purchasing/po_receive_items.php:122
-#: purchasing/view/view_grn.php:79 purchasing/view/view_po.php:93
-#: sales/customer_delivery.php:508 sales/view/view_sales_order.php:244
-#: sales/includes/ui/sales_order_ui.inc:236
-#: sales/includes/ui/sales_order_ui.inc:240
+#: ../purchasing/includes/ui/po_ui.inc:305
+#: ../purchasing/includes/ui/po_ui.inc.orig:305
+#: ../purchasing/po_receive_items.php:122
+#: ../purchasing/view/view_grn.php:79
+#: ../purchasing/view/view_po.php:93
+#: ../sales/customer_delivery.php.orig:521
+#: ../sales/view/view_sales_order.php:262
+#: ../sales/view/view_sales_order.php.orig:244
+#: ../sales/includes/ui/sales_order_ui.inc.orig:236
 msgid "Amount Total"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:299
-#: purchasing/allocations/supplier_allocate.php:64
-#: sales/allocations/customer_allocate.php:63
-#: sales/includes/ui/sales_order_ui.inc:237
-#: sales/includes/ui/sales_order_ui.inc:241
+#: ../purchasing/includes/ui/po_ui.inc:306
+#: ../purchasing/includes/ui/po_ui.inc.orig:306
+#: ../purchasing/allocations/supplier_allocate.php:64
+#: ../sales/allocations/customer_allocate.php:63
+#: ../sales/includes/ui/sales_order_ui.inc.orig:237
 msgid "Refresh"
 msgstr ""
 
-#: purchasing/po_entry_items.php:38 purchasing/po_entry_items.php:41
+#: ../purchasing/includes/ui/po_ui.inc:361
+#: ../purchasing/includes/ui/po_ui.inc.orig:361
+#: ../sales/view/view_sales_order.php:83
+msgid "Required Pre-Payment"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:362
+#: ../purchasing/includes/ui/po_ui.inc.orig:362
+msgid "Pre-Payments Allocated"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc.orig:488
+#: ../purchasing/po_entry_items.php.orig:555
+#: ../sales/customer_invoice.php:454
+#: ../sales/includes/ui/sales_order_ui.inc.orig:407
+#: ../sales/includes/ui/sales_order_ui.inc.orig:409
+msgid "Payment:"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc.orig:488
+#: ../purchasing/po_entry_items.php.orig:555
+msgid "Delayed"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc.orig:490
+#: ../sales/includes/ui/sales_order_ui.inc.orig:622
+#: ../sales/includes/ui/sales_order_ui.inc.orig:624
+msgid "Pre-Payment Required:"
+msgstr ""
+
+#: ../purchasing/po_entry_items.php:41
+#: ../purchasing/po_entry_items.php.orig:38
 msgid "Modify Purchase Order #"
 msgstr ""
 
-#: purchasing/po_entry_items.php:43 purchasing/po_entry_items.php:46
+#: ../purchasing/po_entry_items.php:46
+#: ../purchasing/po_entry_items.php.orig:43
 msgid "Purchase Order Entry"
 msgstr ""
 
-#: purchasing/po_entry_items.php:48 purchasing/po_entry_items.php:51
+#: ../purchasing/po_entry_items.php:51
+#: ../purchasing/po_entry_items.php.orig:48
 msgid "Direct GRN Entry"
 msgstr ""
 
-#: purchasing/po_entry_items.php:53 purchasing/po_entry_items.php:56
+#: ../purchasing/po_entry_items.php:56
+#: ../purchasing/po_entry_items.php.orig:53
 msgid "Direct Purchase Invoice Entry"
 msgstr ""
 
-#: purchasing/po_entry_items.php:74 purchasing/po_entry_items.php:77
+#: ../purchasing/po_entry_items.php:80
+#: ../purchasing/po_entry_items.php.orig:77
 msgid "Purchase Order has been entered"
 msgstr ""
 
-#: purchasing/po_entry_items.php:76 purchasing/po_entry_items.php:79
+#: ../purchasing/po_entry_items.php:82
+#: ../purchasing/po_entry_items.php.orig:79
 msgid "Purchase Order has been updated"
 msgstr ""
 
-#: purchasing/po_entry_items.php:77 purchasing/po_entry_items.php:80
+#: ../purchasing/po_entry_items.php:83
+#: ../purchasing/po_entry_items.php.orig:80
 msgid "&View this order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:79 sales/sales_order_entry.php:105
-#: sales/sales_order_entry.php:125 purchasing/po_entry_items.php:82
-#: sales/sales_order_entry.php:113 sales/sales_order_entry.php:133
-#: sales/sales_order_entry.php.orig:113 sales/sales_order_entry.php.orig:133
+#: ../purchasing/po_entry_items.php:85
+#: ../purchasing/po_entry_items.php.orig:82
+#: ../sales/sales_order_entry.php:119
+#: ../sales/sales_order_entry.php:139
 msgid "&Print This Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:81 sales/sales_order_entry.php:106
-#: sales/sales_order_entry.php:126 purchasing/po_entry_items.php:84
-#: sales/sales_order_entry.php:114 sales/sales_order_entry.php:134
-#: sales/sales_order_entry.php.orig:114 sales/sales_order_entry.php.orig:134
+#: ../purchasing/po_entry_items.php:87
+#: ../purchasing/po_entry_items.php.orig:84
+#: ../sales/sales_order_entry.php:120
+#: ../sales/sales_order_entry.php:140
 msgid "&Email This Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:83 purchasing/po_entry_items.php:86
+#: ../purchasing/po_entry_items.php:89
+#: ../purchasing/po_entry_items.php.orig:86
 msgid "&Receive Items on this Purchase Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:85 purchasing/po_entry_items.php:88
+#: ../purchasing/po_entry_items.php:91
+#: ../purchasing/po_entry_items.php.orig:88
 msgid "Enter &Another Purchase Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:87 purchasing/po_entry_items.php:90
+#: ../purchasing/po_entry_items.php:93
+#: ../purchasing/po_entry_items.php.orig:90
 msgid "Select An &Outstanding Purchase Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:96 purchasing/po_entry_items.php:99
+#: ../purchasing/po_entry_items.php:102
+#: ../purchasing/po_entry_items.php.orig:99
 msgid "Direct GRN has been entered"
 msgstr ""
 
-#: purchasing/po_entry_items.php:98 purchasing/po_entry_items.php:101
+#: ../purchasing/po_entry_items.php:104
+#: ../purchasing/po_entry_items.php.orig:101
 msgid "&View this GRN"
 msgstr ""
 
-#: purchasing/po_entry_items.php:102 purchasing/po_receive_items.php:40
-#: purchasing/po_entry_items.php:105
+#: ../purchasing/po_entry_items.php:108
+#: ../purchasing/po_entry_items.php.orig:105
+#: ../purchasing/po_receive_items.php:40
 msgid "View the GL Journal Entries for this Delivery"
 msgstr ""
 
-#: purchasing/po_entry_items.php:107 purchasing/po_receive_items.php:42
-#: purchasing/po_entry_items.php:110
+#: ../purchasing/po_entry_items.php:113
+#: ../purchasing/po_entry_items.php.orig:110
+#: ../purchasing/po_receive_items.php:42
 msgid "Entry purchase &invoice for this receival"
 msgstr ""
 
-#: purchasing/po_entry_items.php:112 purchasing/po_entry_items.php:115
+#: ../purchasing/po_entry_items.php:118
+#: ../purchasing/po_entry_items.php.orig:115
 msgid "Enter &Another GRN"
 msgstr ""
 
-#: purchasing/po_entry_items.php:121 purchasing/po_entry_items.php:124
+#: ../purchasing/po_entry_items.php:127
+#: ../purchasing/po_entry_items.php.orig:124
 msgid "Direct Purchase Invoice has been entered"
 msgstr ""
 
-#: purchasing/po_entry_items.php:123 purchasing/po_entry_items.php:126
+#: ../purchasing/po_entry_items.php:129
+#: ../purchasing/po_entry_items.php.orig:126
 msgid "&View this Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:128 purchasing/supplier_invoice.php:46
-#: purchasing/po_entry_items.php:131
+#: ../purchasing/po_entry_items.php:134
+#: ../purchasing/po_entry_items.php.orig:131
+#: ../purchasing/supplier_invoice.php:69
 msgid "View the GL Journal Entries for this Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:130 purchasing/supplier_invoice.php:48
-#: purchasing/po_entry_items.php:133
+#: ../purchasing/po_entry_items.php:136
+#: ../purchasing/po_entry_items.php.orig:133
+#: ../purchasing/supplier_invoice.php:71
 msgid "Entry supplier &payment for this invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:136 purchasing/po_entry_items.php:139
+#: ../purchasing/po_entry_items.php:142
+#: ../purchasing/po_entry_items.php.orig:139
 msgid "Enter &Another Direct Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:168 purchasing/po_entry_items.php:171
+#: ../purchasing/po_entry_items.php:174
+#: ../purchasing/po_entry_items.php.orig:171
 msgid ""
 "This item cannot be deleted because some of it has already been received."
 msgstr ""
 
-#: purchasing/po_entry_items.php:183 purchasing/po_entry_items.php:186
+#: ../purchasing/po_entry_items.php:189
+#: ../purchasing/po_entry_items.php.orig:186
 msgid ""
 "This order cannot be cancelled because some of it has already been received."
 msgstr ""
 
-#: purchasing/po_entry_items.php:184 purchasing/po_entry_items.php:187
+#: ../purchasing/po_entry_items.php:190
+#: ../purchasing/po_entry_items.php.orig:187
 msgid ""
 "The line item quantities may be modified to quantities more than already "
 "received. prices cannot be altered for lines that have already been received "
 "and quantities cannot be reduced below the quantity already received."
 msgstr ""
 
-#: purchasing/po_entry_items.php:199 purchasing/po_entry_items.php:202
+#: ../purchasing/po_entry_items.php:205
+#: ../purchasing/po_entry_items.php.orig:202
 msgid "This purchase order has been cancelled."
 msgstr ""
 
-#: purchasing/po_entry_items.php:201 purchasing/po_entry_items.php:204
+#: ../purchasing/po_entry_items.php:207
+#: ../purchasing/po_entry_items.php.orig:204
 msgid "Enter a new purchase order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:213 sales/sales_order_entry.php:464
-#: sales/sales_order_entry.php:468 purchasing/po_entry_items.php:216
-#: sales/sales_order_entry.php:479 sales/sales_order_entry.php.orig:478
+#: ../purchasing/po_entry_items.php:219
+#: ../purchasing/po_entry_items.php.orig:216
+#: ../sales/sales_order_entry.php:495
 msgid "Item description cannot be empty."
 msgstr ""
 
-#: purchasing/po_entry_items.php:223 purchasing/po_entry_items.php:226
+#: ../purchasing/po_entry_items.php:229
+#: ../purchasing/po_entry_items.php.orig:226
 msgid "The quantity of the order item must be numeric and not less than "
 msgstr ""
 
-#: purchasing/po_entry_items.php:230 purchasing/po_entry_items.php:233
+#: ../purchasing/po_entry_items.php:236
+#: ../purchasing/po_entry_items.php.orig:233
 msgid "The price entered must be numeric and not less than zero."
 msgstr ""
 
-#: purchasing/po_entry_items.php:254 purchasing/po_entry_items.php:257
+#: ../purchasing/po_entry_items.php:260
+#: ../purchasing/po_entry_items.php.orig:257
 msgid ""
 "You are attempting to make the quantity ordered a quantity less than has "
 "already been invoiced or received.  This is prohibited."
 msgstr ""
 
-#: purchasing/po_entry_items.php:255 purchasing/po_entry_items.php:258
+#: ../purchasing/po_entry_items.php:261
+#: ../purchasing/po_entry_items.php.orig:258
 msgid ""
 "The quantity received can only be modified by entering a negative receipt "
 "and the quantity invoiced can only be reduced by entering a credit note "
 "against this item."
 msgstr ""
 
-#: purchasing/po_entry_items.php:283 purchasing/po_entry_items.php:286
+#: ../purchasing/po_entry_items.php:289
+#: ../purchasing/po_entry_items.php.orig:286
 msgid "The selected item is already on this order."
 msgstr ""
 
-#: purchasing/po_entry_items.php:310 purchasing/po_entry_items.php:313
+#: ../purchasing/po_entry_items.php:316
+#: ../purchasing/po_entry_items.php.orig:313
 msgid ""
 "The selected item does not exist or it is a kit part and therefore cannot be "
 "purchased."
 msgstr ""
 
-#: purchasing/po_entry_items.php:326 purchasing/supplier_invoice.php:343
-#: purchasing/supplier_payment.php:118 purchasing/po_entry_items.php:329
-#: purchasing/supplier_payment.php:113
+#: ../purchasing/po_entry_items.php:332
+#: ../purchasing/po_entry_items.php.orig:329
+#: ../purchasing/supplier_invoice.php:382
+#: ../purchasing/supplier_payment.php:113
 msgid "There is no supplier selected."
 msgstr ""
 
-#: purchasing/po_entry_items.php:333 purchasing/po_entry_items.php:336
+#: ../purchasing/po_entry_items.php:339
+#: ../purchasing/po_entry_items.php.orig:336
 msgid "The entered order date is invalid."
 msgstr ""
 
-#: purchasing/po_entry_items.php:340 purchasing/po_receive_items.php:181
-#: sales/sales_order_entry.php:345 purchasing/po_entry_items.php:343
-#: sales/sales_order_entry.php:354 sales/sales_order_entry.php.orig:353
-msgid "The entered date is not in fiscal year"
-msgstr ""
-
-#: purchasing/po_entry_items.php:347 purchasing/po_entry_items.php:350
+#: ../purchasing/po_entry_items.php:352
+#: ../purchasing/po_entry_items.php.orig:349
 msgid "The entered due date is invalid."
 msgstr ""
 
-#: purchasing/po_entry_items.php:356 purchasing/po_entry_items.php:359
+#: ../purchasing/po_entry_items.php:361
+#: ../purchasing/po_entry_items.php.orig:358
 msgid "There is no reference entered for this purchase order."
 msgstr ""
 
-#: purchasing/po_entry_items.php:371 purchasing/supplier_invoice.php:161
-#: purchasing/po_entry_items.php:374
+#: ../purchasing/po_entry_items.php:376
+#: ../purchasing/po_entry_items.php.orig:373
+#: ../purchasing/supplier_invoice.php:186
 msgid "You must enter a supplier's invoice reference."
 msgstr ""
 
-#: purchasing/po_entry_items.php:378 purchasing/supplier_invoice.php:187
-#: purchasing/po_entry_items.php:381
+#: ../purchasing/po_entry_items.php:383
+#: ../purchasing/po_entry_items.php.orig:380
+#: ../purchasing/supplier_invoice.php:212
 msgid ""
 "This invoice number has already been entered. It cannot be entered again."
 msgstr ""
 
-#: purchasing/po_entry_items.php:384 purchasing/po_entry_items.php:387
+#: ../purchasing/po_entry_items.php:389
+#: ../purchasing/po_entry_items.php.orig:386
 msgid "There is no delivery address specified."
 msgstr ""
 
-#: purchasing/po_entry_items.php:390 purchasing/po_entry_items.php:393
+#: ../purchasing/po_entry_items.php:395
+#: ../purchasing/po_entry_items.php.orig:392
 msgid "There is no location specified to move any items into."
 msgstr ""
 
-#: purchasing/po_entry_items.php:397 purchasing/po_entry_items.php:401
+#: ../purchasing/po_entry_items.php:403
+#: ../purchasing/po_entry_items.php.orig:399
 msgid ""
 "The order cannot be placed because there are no lines entered on this order."
 msgstr ""
 
-#: purchasing/po_entry_items.php:523 sales/sales_order_entry.php:687
-#: sales/sales_order_entry.php:691 purchasing/po_entry_items.php:527
-#: sales/sales_order_entry.php:702 sales/sales_order_entry.php.orig:701
+#: ../purchasing/po_entry_items.php:408
+#: ../purchasing/po_entry_items.php.orig:404
+msgid "Required prepayment is greater than total invoice value."
+msgstr ""
+
+#: ../purchasing/po_entry_items.php.orig:492
+msgid "Payment for:"
+msgstr ""
+
+#: ../purchasing/po_entry_items.php.orig:563
+#: ../sales/sales_order_entry.php:718
 msgid "Place Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:524 purchasing/po_entry_items.php:528
+#: ../purchasing/po_entry_items.php.orig:564
 msgid "Update Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:525 sales/sales_order_entry.php:686
-#: sales/sales_order_entry.php:690 purchasing/po_entry_items.php:529
-#: sales/sales_order_entry.php:701 sales/sales_order_entry.php.orig:700
+#: ../purchasing/po_entry_items.php.orig:565
+#: ../sales/sales_order_entry.php:717
 msgid "Cancel Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:527 purchasing/po_entry_items.php:531
+#: ../purchasing/po_entry_items.php.orig:567
 msgid "Process GRN"
 msgstr ""
 
-#: purchasing/po_entry_items.php:528 purchasing/po_entry_items.php:532
+#: ../purchasing/po_entry_items.php.orig:568
 msgid "Update GRN"
 msgstr ""
 
-#: purchasing/po_entry_items.php:529 purchasing/po_entry_items.php:533
+#: ../purchasing/po_entry_items.php.orig:569
 msgid "Cancel GRN"
 msgstr ""
 
-#: purchasing/po_entry_items.php:532 sales/customer_invoice.php:582
-#: sales/customer_invoice.php:584 purchasing/po_entry_items.php:536
+#: ../purchasing/po_entry_items.php.orig:572
+#: ../sales/customer_invoice.php:686
 msgid "Process Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:533 purchasing/po_entry_items.php:537
+#: ../purchasing/po_entry_items.php.orig:573
 msgid "Update Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:534 sales/sales_order_entry.php:667
-#: sales/sales_order_entry.php:671 purchasing/po_entry_items.php:538
-#: sales/sales_order_entry.php:682 sales/sales_order_entry.php.orig:681
+#: ../purchasing/po_entry_items.php.orig:574
+#: ../sales/sales_order_entry.php:698
 msgid "Cancel Invoice"
 msgstr ""
 
-#: purchasing/po_receive_items.php:25
+#: ../purchasing/po_receive_items.php:25
 msgid "Receive Purchase Order Items"
 msgstr ""
 
-#: purchasing/po_receive_items.php:34
+#: ../purchasing/po_receive_items.php:34
 msgid "Purchase Order Delivery has been processed"
 msgstr ""
 
-#: purchasing/po_receive_items.php:36
+#: ../purchasing/po_receive_items.php:36
 msgid "&View this Delivery"
 msgstr ""
 
-#: purchasing/po_receive_items.php:44
+#: ../purchasing/po_receive_items.php:44
 msgid "Select a different &purchase order for receiving items against"
 msgstr ""
 
-#: purchasing/po_receive_items.php:53
+#: ../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 ""
 
-#: purchasing/po_receive_items.php:62 reporting/rep105.php:112
-#: sales/customer_delivery.php:432
+#: ../purchasing/po_receive_items.php:62
+#: ../reporting/rep105.php:112
+#: ../sales/customer_delivery.php.orig:445
 msgid "Ordered"
 msgstr ""
 
-#: 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:225
+#: ../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 ""
 
-#: purchasing/po_receive_items.php:63 sales/customer_delivery.php:433
+#: ../purchasing/po_receive_items.php:63
+#: ../sales/customer_delivery.php.orig:446
 msgid "This Delivery"
 msgstr ""
 
-#: purchasing/po_receive_items.php:168 purchasing/po_receive_items.php:224
+#: ../purchasing/po_receive_items.php:168
+#: ../purchasing/po_receive_items.php:222
 msgid ""
 "There is nothing to process. Please enter valid quantities greater than zero."
 msgstr ""
 
-#: purchasing/po_receive_items.php:229
+#: ../purchasing/po_receive_items.php:227
 msgid ""
 "Entered quantities cannot be greater than the quantity entered on the "
 "purchase order including the allowed over-receive percentage"
 msgstr ""
 
-#: purchasing/po_receive_items.php:231
+#: ../purchasing/po_receive_items.php:229
 msgid ""
 "Modify the ordered items on the purchase order if you wish to increase the "
 "quantities."
 msgstr ""
 
-#: purchasing/po_receive_items.php:249
+#: ../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 "
@@ -9597,153 +10978,167 @@ msgid ""
 "by the other user."
 msgstr ""
 
-#: purchasing/po_receive_items.php:252
+#: ../purchasing/po_receive_items.php:250
 msgid "Select a different purchase order for receiving goods against"
 msgstr ""
 
-#: purchasing/po_receive_items.php:255
+#: ../purchasing/po_receive_items.php:253
 msgid "Re-Read the updated purchase order for receiving goods against"
 msgstr ""
 
-#: purchasing/po_receive_items.php:329
+#: ../purchasing/po_receive_items.php:327
 msgid "Items to Receive"
 msgstr ""
 
-#: purchasing/po_receive_items.php:334
+#: ../purchasing/po_receive_items.php:332
 msgid "Process Receive Items"
 msgstr ""
 
-#: 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 ""
 
-#: purchasing/supplier_credit.php:44
+#: ../purchasing/supplier_credit.php:79
 msgid "View this Credit Note"
 msgstr ""
 
-#: purchasing/supplier_credit.php:46
+#: ../purchasing/supplier_credit.php:81
 msgid "View the GL Journal Entries for this Credit Note"
 msgstr ""
 
-#: purchasing/supplier_credit.php:48
+#: ../purchasing/supplier_credit.php:83
 msgid "Enter Another Credit Note"
 msgstr ""
 
-#: purchasing/supplier_credit.php:102 purchasing/supplier_invoice.php:102
+#: ../purchasing/supplier_credit.php:119
+#: ../purchasing/supplier_invoice.php:127
 msgid ""
 "The account code entered is not a valid code, this line cannot be added to "
 "the transaction."
 msgstr ""
 
-#: purchasing/supplier_credit.php:112 purchasing/supplier_invoice.php:112
+#: ../purchasing/supplier_credit.php:129
+#: ../purchasing/supplier_invoice.php:137
 msgid ""
 "The amount entered is not numeric. This line cannot be added to the "
 "transaction."
 msgstr ""
 
-#: purchasing/supplier_credit.php:142
+#: ../purchasing/supplier_credit.php: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 ""
 
-#: purchasing/supplier_credit.php:149
+#: ../purchasing/supplier_credit.php:166
 msgid "You must enter an credit note reference."
 msgstr ""
 
-#: purchasing/supplier_credit.php:163
+#: ../purchasing/supplier_credit.php:180
 msgid "You must enter a supplier's credit note reference."
 msgstr ""
 
-#: 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 ""
 
-#: purchasing/supplier_credit.php:182 purchasing/supplier_invoice.php:180
+#: ../purchasing/supplier_credit.php:199
+#: ../purchasing/supplier_invoice.php:205
 msgid ""
 "The invoice as entered cannot be processed because the due date is in an "
 "incorrect format."
 msgstr ""
 
-#: purchasing/supplier_credit.php:189
+#: ../purchasing/supplier_credit.php: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 ""
 
-#: purchasing/supplier_credit.php:201
+#: ../purchasing/supplier_credit.php:218
 msgid ""
 "The return cannot be processed because there is an insufficient quantity for "
 "item:"
 msgstr ""
 
-#: purchasing/supplier_credit.php:245
+#: ../purchasing/supplier_credit.php:262
 msgid "The quantity to credit must be numeric and greater than zero."
 msgstr ""
 
-#: purchasing/supplier_credit.php:252
+#: ../purchasing/supplier_credit.php:269
 msgid "The price is either not numeric or negative."
 msgstr ""
 
-#: purchasing/supplier_credit.php:354
+#: ../purchasing/supplier_credit.php:371
 msgid "Enter Credit Note"
 msgstr ""
 
-#: purchasing/supplier_invoice.php:28
+#: ../purchasing/supplier_invoice.php:43
 msgid "Enter Supplier Invoice"
 msgstr ""
 
-#: purchasing/supplier_invoice.php:43
+#: ../purchasing/supplier_invoice.php:48
+#, php-format
+msgid "Modifying Purchase Invoice # %d"
+msgstr ""
+
+#: ../purchasing/supplier_invoice.php:66
 msgid "Supplier invoice has been processed."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:44
+#: ../purchasing/supplier_invoice.php:67
 msgid "View this Invoice"
 msgstr ""
 
-#: purchasing/supplier_invoice.php:50
+#: ../purchasing/supplier_invoice.php:73
 msgid "Enter Another Invoice"
 msgstr ""
 
-#: purchasing/supplier_invoice.php:141
+#: ../purchasing/supplier_invoice.php:166
 msgid ""
 "The invoice cannot be processed because the there are no items or values on "
 "the invoice.  Invoices are expected to have a charge."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:147
+#: ../purchasing/supplier_invoice.php:172
 msgid "You must enter an invoice reference."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:168
+#: ../purchasing/supplier_invoice.php:193
 msgid ""
 "The invoice as entered cannot be processed because the invoice date is in an "
 "incorrect format."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:224
+#: ../purchasing/supplier_invoice.php:254
 msgid "The quantity to invoice must be numeric and greater than zero."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:231
+#: ../purchasing/supplier_invoice.php:261
 msgid "The price is not numeric."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:244
+#: ../purchasing/supplier_invoice.php:274
 msgid ""
 "The price being invoiced is more than the purchase order price by more than "
 "the allowed over-charge percentage. The system is set up to prohibit this. "
 "See the system administrator to modify the set up parameters if necessary."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:245 purchasing/supplier_invoice.php:258
+#: ../purchasing/supplier_invoice.php:275
+#: ../purchasing/supplier_invoice.php:288
 msgid "The over-charge percentage allowance is :"
 msgstr ""
 
-#: purchasing/supplier_invoice.php:257
+#: ../purchasing/supplier_invoice.php:287
 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 "
@@ -9751,3944 +11146,4256 @@ msgid ""
 "necessary."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:325
+#: ../purchasing/supplier_invoice.php:364
 #, php-format
 msgid "All yet non-invoiced items on delivery line # %d has been removed."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:367
+#: ../purchasing/supplier_invoice.php:406
 msgid "Enter Invoice"
 msgstr ""
 
-#: purchasing/supplier_payment.php:31
+#: ../purchasing/supplier_payment.php:31
 msgid "Supplier Payment Entry"
 msgstr ""
 
-#: purchasing/supplier_payment.php:90 purchasing/supplier_payment.php:85
+#: ../purchasing/supplier_payment.php:85
 msgid "Invalid purchase invoice number."
 msgstr ""
 
-#: purchasing/supplier_payment.php:96 purchasing/supplier_payment.php:91
+#: ../purchasing/supplier_payment.php:91
 msgid "Payment has been sucessfully entered"
 msgstr ""
 
-#: purchasing/supplier_payment.php:98 purchasing/supplier_payment.php:93
+#: ../purchasing/supplier_payment.php:93
 msgid "&Print This Remittance"
 msgstr ""
 
-#: purchasing/supplier_payment.php:99 purchasing/supplier_payment.php:94
+#: ../purchasing/supplier_payment.php:94
 msgid "&Email This Remittance"
 msgstr ""
 
-#: purchasing/supplier_payment.php:101 purchasing/supplier_payment.php:96
+#: ../purchasing/supplier_payment.php:96
 msgid "View the GL &Journal Entries for this Payment"
 msgstr ""
 
-#: purchasing/supplier_payment.php:105 purchasing/supplier_payment.php:100
+#: ../purchasing/supplier_payment.php:100
 msgid "Enter another supplier &payment"
 msgstr ""
 
-#: purchasing/supplier_payment.php:152 sales/customer_payments.php:192
-#: purchasing/supplier_payment.php:147 sales/customer_payments.php.orig:192
+#: ../purchasing/supplier_payment.php:147
+#: ../sales/customer_payments.php:192
 msgid "The exchange rate must be numeric and greater than zero."
 msgstr ""
 
-#: purchasing/supplier_payment.php:164 purchasing/supplier_payment.php:159
+#: ../purchasing/supplier_payment.php:159
 msgid "The entered discount is invalid or less than zero."
 msgstr ""
 
-#: purchasing/supplier_payment.php:172 purchasing/supplier_payment.php:167
+#: ../purchasing/supplier_payment.php:167
 msgid ""
 "The total of the amount and the discount is zero or negative. Please enter "
 "positive values."
 msgstr ""
 
-#: purchasing/supplier_payment.php:273 purchasing/supplier_payment.php:270
+#: ../purchasing/supplier_payment.php:270
 msgid "Payment To:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:280 purchasing/supplier_payment.php:283
+#: ../purchasing/supplier_payment.php:283
 msgid "From Bank Account:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:288
-#: purchasing/view/view_supp_payment.php:55
-#: purchasing/supplier_payment.php:291
+#: ../purchasing/supplier_payment.php:291
+#: ../purchasing/view/view_supp_payment.php:55
 msgid "Date Paid"
 msgstr ""
 
-#: purchasing/supplier_payment.php:311 sales/customer_payments.php:407
-#: purchasing/supplier_payment.php:314 sales/customer_payments.php:410
-#: sales/customer_payments.php.orig:409
+#: ../purchasing/supplier_payment.php:314
+#: ../sales/customer_payments.php:409
 msgid "Amount of Discount:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:312 purchasing/supplier_payment.php:315
+#: ../purchasing/supplier_payment.php:315
 msgid "Amount of Payment:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:318 purchasing/supplier_payment.php:321
+#: ../purchasing/supplier_payment.php:321
 msgid "The amount and discount are in the bank account's currency."
 msgstr ""
 
-#: purchasing/supplier_payment.php:321 purchasing/supplier_payment.php:324
+#: ../purchasing/supplier_payment.php:324
 msgid "Enter Payment"
 msgstr ""
 
-#: purchasing/view/view_grn.php:21
+#: ../purchasing/view/view_grn.php:21
 msgid "View Purchase Order Delivery"
 msgstr ""
 
-#: 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 ""
 
-#: purchasing/view/view_grn.php:37 purchasing/view/view_po.php:41
-#: sales/view/view_sales_order.php:198
+#: ../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 ""
 
-#: purchasing/view/view_grn.php:40 reporting/includes/doctext.inc:65
-#: reporting/includes/doctext.inc:170 reporting/includes/doctext.inc:222
-#: sales/inquiry/sales_deliveries_view.php:186
+#: ../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
 msgid "Delivery Date"
 msgstr ""
 
-#: purchasing/view/view_grn.php:70 purchasing/view/view_po.php:84
-#: purchasing/view/view_supp_credit.php:60
-#: purchasing/view/view_supp_invoice.php:65 sales/view/view_credit.php:136
-#: sales/view/view_sales_order.php:234
+#: ../purchasing/view/view_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 ""
 
-#: purchasing/view/view_grn.php:86
+#: ../purchasing/view/view_grn.php:86
 msgid "This delivery has been voided."
 msgstr ""
 
-#: purchasing/view/view_po.php:22
+#: ../purchasing/view/view_po.php:22
 msgid "View Purchase Order"
 msgstr ""
 
-#: 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 ""
 
-#: purchasing/view/view_po.php:46
+#: ../purchasing/view/view_po.php:46
 msgid "Requested By"
 msgstr ""
 
-#: purchasing/view/view_po.php:100
-#: purchasing/inquiry/supplier_allocation_inquiry.php:148
-#: purchasing/inquiry/supplier_inquiry.php:193
-#: purchasing/inquiry/supplier_inquiry.php.orig:187
-#: sales/inquiry/customer_allocation_inquiry.php:165
-#: sales/inquiry/customer_inquiry.php:251
-#: sales/inquiry/customer_inquiry.php.orig:251
-#: sales/inquiry/sales_deliveries_view.php:206
-#: sales/inquiry/sales_orders_view.php:318
-#: sales/inquiry/sales_orders_view.php.orig:316
+#: ../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_inquiry.php:227
+#: ../sales/inquiry/sales_deliveries_view.php:206
+#: ../sales/inquiry/sales_orders_view.php:344
 msgid "Marked items are overdue."
 msgstr ""
 
-#: purchasing/view/view_po.php:113 sales/view/view_invoice.php:97
-#: sales/view/view_sales_order.php:51
+#: ../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 ""
 
-#: purchasing/view/view_po.php:115
+#: ../purchasing/view/view_po.php:115
 msgid "Delivered On"
 msgstr ""
 
-#: purchasing/view/view_po.php:138 sales/view/view_sales_order.php:53
+#: ../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 ""
 
-#: purchasing/view/view_supp_credit.php:23
+#: ../purchasing/view/view_supp_credit.php:23
 msgid "View Supplier Credit Note"
 msgstr ""
 
-#: purchasing/view/view_supp_credit.php:38
+#: ../purchasing/view/view_supp_credit.php:38
 msgid "SUPPLIER CREDIT NOTE"
 msgstr ""
 
-#: purchasing/view/view_supp_credit.php:47
-#: purchasing/view/view_supp_invoice.php:50
-#: sales/customer_credit_invoice.php:270 sales/view/view_invoice.php:95
-#: sales/customer_credit_invoice.php:268
+#: ../purchasing/view/view_supp_credit.php:47
+#: ../purchasing/view/view_supp_invoice.php:51
+#: ../reporting/includes/doctext.inc:141
+#: ../sales/customer_credit_invoice.php:268
+#: ../sales/view/view_invoice.php:100
 msgid "Invoice Date"
 msgstr ""
 
-#: purchasing/view/view_supp_credit.php:66
+#: ../purchasing/view/view_supp_credit.php:66
 msgid "TOTAL CREDIT NOTE"
 msgstr ""
 
-#: purchasing/view/view_supp_credit.php:71 sales/view/view_credit.php:147
+#: ../purchasing/view/view_supp_credit.php:71
+#: ../sales/view/view_credit.php:147
 msgid "This credit note has been voided."
 msgstr ""
 
-#: purchasing/view/view_supp_invoice.php:23
+#: ../purchasing/view/view_supp_invoice.php:24
 msgid "View Supplier Invoice"
 msgstr ""
 
-#: purchasing/view/view_supp_invoice.php:40
+#: ../purchasing/view/view_supp_invoice.php:41
 msgid "SUPPLIER INVOICE"
 msgstr ""
 
-#: purchasing/view/view_supp_invoice.php:72 reporting/rep107.php:196
-#: sales/view/view_invoice.php:164
+#: ../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 ""
 
-#: purchasing/view/view_supp_invoice.php:76 sales/view/view_invoice.php:168
+#: ../purchasing/view/view_supp_invoice.php:77
+#: ../sales/view/view_invoice.php:170
 msgid "This invoice has been voided."
 msgstr ""
 
-#: purchasing/view/view_supp_payment.php:22
+#: ../purchasing/view/view_supp_payment.php:22
 msgid "View Payment to Supplier"
 msgstr ""
 
-#: purchasing/view/view_supp_payment.php:47
+#: ../purchasing/view/view_supp_payment.php:47
 msgid "Payment to Supplier"
 msgstr ""
 
-#: purchasing/view/view_supp_payment.php:53
+#: ../purchasing/view/view_supp_payment.php:53
 msgid "To Supplier"
 msgstr ""
 
-#: purchasing/view/view_supp_payment.php:59 sales/view/view_receipt.php:43
+#: ../purchasing/view/view_supp_payment.php:59
+#: ../sales/view/view_receipt.php:43
 msgid "Payment Currency"
 msgstr ""
 
-#: purchasing/view/view_supp_payment.php:62 sales/customer_delivery.php:433
-#: sales/customer_invoice.php:468 sales/view/view_receipt.php:45
-#: sales/view/view_sales_order.php:202 sales/customer_invoice.php:470
+#: ../purchasing/view/view_supp_payment.php:62
+#: ../sales/customer_delivery.php.orig:446
+#: ../sales/customer_invoice.php:542
+#: ../sales/customer_invoice.php:545
+#: ../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
+#: ../purchasing/view/view_supp_payment.php:69
 msgid "Supplier's Currency"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:27 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 ""
 
-#: purchasing/manage/suppliers.php:89
+#: ../purchasing/manage/suppliers.php:91
+#: ../purchasing/manage/suppliers.php.orig:92
 msgid "Basic Data"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:91
+#: ../purchasing/manage/suppliers.php:93
+#: ../purchasing/manage/suppliers.php.orig:94
 msgid "Supplier Name:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:92
+#: ../purchasing/manage/suppliers.php:94
+#: ../purchasing/manage/suppliers.php.orig:95
 msgid "Supplier Short Name:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:95
+#: ../purchasing/manage/suppliers.php:97
+#: ../purchasing/manage/suppliers.php.orig:98
 msgid "Website:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:106
+#: ../purchasing/manage/suppliers.php:108
+#: ../purchasing/manage/suppliers.php.orig:109
 msgid "Our Customer No:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:108
+#: ../purchasing/manage/suppliers.php:110
+#: ../purchasing/manage/suppliers.php.orig:120
 msgid "Purchasing"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:109
+#: ../purchasing/manage/suppliers.php:111
+#: ../purchasing/manage/suppliers.php.orig:121
 msgid "Bank Name/Account:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:110 sales/manage/customers.php:263
-#: sales/manage/customers.php.orig:260 sales/manage/customers.php:264
+#: ../purchasing/manage/suppliers.php:112
+#: ../purchasing/manage/suppliers.php.orig:122
+#: ../sales/manage/customers.php:264
+#: ../sales/manage/sav.customers.php:263
 msgid "Credit Limit:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:111 sales/manage/customers.php:265
-#: sales/manage/customers.php.orig:262 sales/manage/customers.php:266
+#: ../purchasing/manage/suppliers.php:113
+#: ../purchasing/manage/suppliers.php.orig:123
+#: ../sales/manage/customers.php:266
+#: ../sales/manage/sav.customers.php:265
 msgid "Payment Terms:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:117 purchasing/manage/suppliers.php:120
+#: ../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 ""
 
-#: purchasing/manage/suppliers.php:122 reporting/rep704.php:92
-#: reporting/rep704.php:102 reporting/rep704.php:110
+#: ../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 ""
 
-#: purchasing/manage/suppliers.php:123
+#: ../purchasing/manage/suppliers.php:129
+#: ../purchasing/manage/suppliers.php.orig:139
 msgid "Accounts Payable Account:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:124
+#: ../purchasing/manage/suppliers.php:130
+#: ../purchasing/manage/suppliers.php.orig:140
 msgid "Purchase Account:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:125
+#: ../purchasing/manage/suppliers.php:131
+#: ../purchasing/manage/suppliers.php.orig:141
 msgid "Use Item Inventory/COGS Account"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:128 purchasing/manage/suppliers.php:157
+#: ../purchasing/manage/suppliers.php:134
+#: ../purchasing/manage/suppliers.php:137
+#: ../purchasing/manage/suppliers.php.orig:112
 msgid "Contact Data"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:148 sales/manage/customer_branches.php:266
+#: ../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 ""
 
-#: purchasing/manage/suppliers.php:149 sales/manage/customer_branches.php:267
+#: ../purchasing/manage/suppliers.php:158
+#: ../purchasing/manage/suppliers.php.orig:160
+#: ../sales/manage/customer_branches.php:269
 msgid "Mailing Address:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:150
+#: ../purchasing/manage/suppliers.php:159
+#: ../purchasing/manage/suppliers.php.orig:161
 msgid "Physical Address:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:152
+#: ../purchasing/manage/suppliers.php:161
+#: ../purchasing/manage/suppliers.php.orig:163
 msgid "General"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:153 sales/manage/customer_branches.php:269
-#: sales/manage/customers.php:286 sales/manage/customers.php.orig:283
-#: sales/manage/customers.php:287
+#: ../purchasing/manage/suppliers.php:162
+#: ../purchasing/manage/suppliers.php.orig:164
+#: ../sales/manage/customer_branches.php:271
+#: ../sales/manage/customers.php:287
+#: ../sales/manage/sav.customers.php:286
 msgid "General Notes:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:155
+#: ../purchasing/manage/suppliers.php:164
+#: ../purchasing/manage/suppliers.php.orig:166
 msgid "Supplier status:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:161
-msgid "System default"
-msgstr ""
-
-#: purchasing/manage/suppliers.php:168
+#: ../purchasing/manage/suppliers.php:170
+#: ../purchasing/manage/suppliers.php.orig:173
 msgid "Update Supplier"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:169
+#: ../purchasing/manage/suppliers.php:171
+#: ../purchasing/manage/suppliers.php.orig:174
 msgid "Update supplier data"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:170
+#: ../purchasing/manage/suppliers.php:172
+#: ../purchasing/manage/suppliers.php.orig:175
 msgid "Select this supplier and return to document entry."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:171
+#: ../purchasing/manage/suppliers.php:173
+#: ../purchasing/manage/suppliers.php.orig:176
 msgid "Delete Supplier"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:172
+#: ../purchasing/manage/suppliers.php:174
+#: ../purchasing/manage/suppliers.php.orig:177
 msgid "Delete supplier data if have been never used"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:176
+#: ../purchasing/manage/suppliers.php:178
+#: ../purchasing/manage/suppliers.php.orig:181
 msgid "Add New Supplier Details"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:195
+#: ../purchasing/manage/suppliers.php:197
+#: ../purchasing/manage/suppliers.php.orig:200
 msgid "The supplier name must be entered."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:202
+#: ../purchasing/manage/suppliers.php:204
+#: ../purchasing/manage/suppliers.php.orig:207
 msgid "The supplier short name must be entered."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:222
+#: ../purchasing/manage/suppliers.php:224
+#: ../purchasing/manage/suppliers.php.orig:227
 msgid "Supplier has been updated."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:240
+#: ../purchasing/manage/suppliers.php:242
+#: ../purchasing/manage/suppliers.php.orig:245
 msgid "A new supplier has been added."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:258
+#: ../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 ""
 
-#: purchasing/manage/suppliers.php:266
+#: ../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 ""
 
-#: purchasing/manage/suppliers.php:287
-#: 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 ""
 
-#: purchasing/manage/suppliers.php:288
+#: ../purchasing/manage/suppliers.php:290
+#: ../purchasing/manage/suppliers.php.orig:293
 msgid "New supplier"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:307 sales/manage/customer_branches.php:323
-#: sales/manage/customers.php:343 sales/manage/customers.php.orig:340
-#: sales/manage/customers.php:345
+#: ../purchasing/manage/suppliers.php:309
+#: ../purchasing/manage/suppliers.php.orig:312
+#: ../sales/manage/customer_branches.php:325
+#: ../sales/manage/customers.php:345
+#: ../sales/manage/sav.customers.php:343
 msgid "&Contacts"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:309
+#: ../purchasing/manage/suppliers.php:311
+#: ../purchasing/manage/suppliers.php.orig:314
 msgid "Purchase &Orders"
 msgstr ""
 
-#: purchasing/inquiry/po_search_completed.php:26
+#: ../purchasing/inquiry/po_search_completed.php:24
+#: ../purchasing/inquiry/po_search_completed.php.orig:25
 msgid "Search Purchase Orders"
 msgstr ""
 
-#: purchasing/inquiry/po_search_completed.php:63
-#: purchasing/inquiry/po_search.php:62
-#: sales/inquiry/sales_deliveries_view.php:103
-#: sales/inquiry/sales_orders_view.php:225
-#: sales/inquiry/sales_orders_view.php.orig:223
+#: ../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_orders_view.php:247
 msgid "#:"
 msgstr ""
 
-#: purchasing/inquiry/po_search_completed.php:68
+#: ../purchasing/inquiry/po_search_completed.php:65
+#: ../purchasing/inquiry/po_search_completed.php.orig:66
 msgid "into location:"
 msgstr ""
 
-#: purchasing/inquiry/po_search_completed.php:126
-#: purchasing/inquiry/po_search.php:135
-#: sales/inquiry/sales_orders_view.php:267
-#: sales/inquiry/sales_orders_view.php.orig:265
+#: ../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
 msgid "Order Date"
 msgstr ""
 
-#: purchasing/inquiry/po_search_completed.php:128
-#: purchasing/inquiry/po_search.php:137
-#: sales/inquiry/sales_orders_view.php:270
-#: sales/inquiry/sales_orders_view.php.orig:268
+#: ../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
 msgid "Order Total"
 msgstr ""
 
-#: purchasing/inquiry/po_search.php:25
+#: ../purchasing/inquiry/po_search.php:25
 msgid "Search Outstanding Purchase Orders"
 msgstr ""
 
-#: purchasing/inquiry/po_search.php:98
+#: ../purchasing/inquiry/po_search.php:98
 msgid "Receive"
 msgstr ""
 
-#: purchasing/inquiry/po_search.php:148
+#: ../purchasing/inquiry/po_search.php:148
 msgid "Marked orders have overdue items."
 msgstr ""
 
-#: purchasing/inquiry/supplier_allocation_inquiry.php:23
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:23
 msgid "Supplier Allocation Inquiry"
 msgstr ""
 
-#: purchasing/inquiry/supplier_allocation_inquiry.php:55
-#: sales/inquiry/customer_allocation_inquiry.php:49
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:55
+#: ../sales/inquiry/customer_allocation_inquiry.php:49
 msgid "show settled:"
 msgstr ""
 
-#: purchasing/inquiry/supplier_allocation_inquiry.php:103
-msgid "Pay"
-msgstr ""
-
-#: purchasing/inquiry/supplier_allocation_inquiry.php:130
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:129
 msgid "Supp Reference"
 msgstr ""
 
-#: purchasing/inquiry/supplier_allocation_inquiry.php:136
-#: reporting/rep101.php:131 reporting/rep201.php:119
-#: reporting/includes/doctext.inc:225
-#: sales/inquiry/customer_allocation_inquiry.php:154
+#: ../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
 msgid "Allocated"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:27
-#: purchasing/inquiry/supplier_inquiry.php.orig:25
+#: ../purchasing/inquiry/supplier_inquiry.php:25
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:25
 msgid "Supplier Inquiry"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:51
-#: purchasing/inquiry/supplier_inquiry.php.orig:47
+#: ../purchasing/inquiry/supplier_inquiry.php:48
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:48
 msgid "Select a supplier:"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:70
-#: purchasing/inquiry/supplier_inquiry.php:71
-#: purchasing/inquiry/supplier_inquiry.php:72
-#: purchasing/inquiry/supplier_inquiry.php.orig:66
-#: purchasing/inquiry/supplier_inquiry.php.orig:67
-#: purchasing/inquiry/supplier_inquiry.php.orig:68 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:75 sales/inquiry/customer_inquiry.php:76
-#: sales/inquiry/customer_inquiry.php:77
-#: sales/inquiry/customer_inquiry.php.orig:75
-#: sales/inquiry/customer_inquiry.php.orig:76
-#: sales/inquiry/customer_inquiry.php.orig:77
-#: sales/create_recurrent_invoices.php:132
+#: ../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:132
+#: ../sales/manage/recurrent_invoices.php:102
+#: ../sales/inquiry/customer_inquiry.php:71
+#: ../sales/inquiry/customer_inquiry.php:72
+#: ../sales/inquiry/customer_inquiry.php:73
 msgid "Days"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:72
-#: purchasing/inquiry/supplier_inquiry.php.orig:68 reporting/rep102.php:120
-#: reporting/rep108.php:152 reporting/rep202.php:124 reporting/rep202.php:156
-#: sales/inquiry/customer_inquiry.php:77
-#: sales/inquiry/customer_inquiry.php.orig:77
+#: ../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
 msgid "Over"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:76
-#: purchasing/inquiry/supplier_inquiry.php.orig:72
-#: sales/inquiry/customer_inquiry.php:80
-#: sales/inquiry/customer_inquiry.php.orig:80
+#: ../purchasing/inquiry/supplier_inquiry.php:73
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:73
+#: ../sales/inquiry/customer_inquiry.php:76
 msgid "Terms"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:76
-#: purchasing/inquiry/supplier_inquiry.php.orig:72 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:80
-#: sales/inquiry/customer_inquiry.php.orig:80
+#: ../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
 msgid "Current"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:77
-#: purchasing/inquiry/supplier_inquiry.php.orig:73 reporting/rep102.php:124
-#: reporting/rep108.php:154 reporting/rep202.php:129
-#: sales/inquiry/customer_inquiry.php:81
-#: sales/inquiry/customer_inquiry.php.orig:81
+#: ../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
 msgid "Total Balance"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:133
-#: purchasing/inquiry/supplier_inquiry.php.orig:127
-#: sales/inquiry/customer_inquiry.php:164
-#: sales/inquiry/customer_inquiry.php.orig:164
+#: ../purchasing/inquiry/supplier_inquiry.php:133
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:130
+#: ../sales/inquiry/customer_inquiry.php:162
 msgid "Credit This"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:155
-#: purchasing/inquiry/supplier_inquiry.php.orig:149
+#: ../purchasing/inquiry/supplier_inquiry.php:155
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:152
 msgid "Print Remittance"
 msgstr ""
 
-#: purchasing/allocations/supplier_allocate.php:29
+#: ../purchasing/allocations/supplier_allocate.php:29
 msgid "Allocate Supplier Payment or Credit Note"
 msgstr ""
 
-#: purchasing/allocations/supplier_allocate.php:50
+#: ../purchasing/allocations/supplier_allocate.php:50
 msgid "Allocation of"
 msgstr ""
 
-#: purchasing/allocations/supplier_allocate.php:55
-#: sales/allocations/customer_allocate.php:54
+#: ../purchasing/allocations/supplier_allocate.php:55
+#: ../sales/allocations/customer_allocate.php:54
 msgid "Total:"
 msgstr ""
 
-#: purchasing/allocations/supplier_allocate.php:64
-#: 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 ""
 
-#: purchasing/allocations/supplier_allocate.php:65
-#: sales/allocations/customer_allocate.php:64
+#: ../purchasing/allocations/supplier_allocate.php:65
+#: ../sales/allocations/customer_allocate.php:64
 msgid "Process allocations"
 msgstr ""
 
-#: purchasing/allocations/supplier_allocate.php:66
-#: purchasing/allocations/supplier_allocate.php:72
-#: sales/allocations/customer_allocate.php:65
-#: sales/allocations/customer_allocate.php:71
+#: ../purchasing/allocations/supplier_allocate.php:66
+#: ../purchasing/allocations/supplier_allocate.php:72
+#: ../sales/allocations/customer_allocate.php:65
+#: ../sales/allocations/customer_allocate.php:71
 msgid "Back to Allocations"
 msgstr ""
 
-#: purchasing/allocations/supplier_allocate.php:67
-#: purchasing/allocations/supplier_allocate.php:73
-#: sales/allocations/customer_allocate.php:65
-#: sales/allocations/customer_allocate.php:72
+#: ../purchasing/allocations/supplier_allocate.php: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 ""
 
-#: purchasing/allocations/supplier_allocate.php:71
-#: 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 ""
 
-#: purchasing/allocations/supplier_allocation_main.php:26
+#: ../purchasing/allocations/supplier_allocation_main.php:26
 msgid "Supplier Allocations"
 msgstr ""
 
-#: purchasing/allocations/supplier_allocation_main.php:36
+#: ../purchasing/allocations/supplier_allocation_main.php:36
 msgid "Select a Supplier: "
 msgstr ""
 
-#: purchasing/allocations/supplier_allocation_main.php:39
-#: 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 ""
 
-#: purchasing/allocations/supplier_allocation_main.php:70
-#: sales/allocations/customer_allocation_main.php:74
+#: ../purchasing/allocations/supplier_allocation_main.php:70
+#: ../sales/allocations/customer_allocation_main.php:74
 msgid "Allocate"
 msgstr ""
 
-#: purchasing/allocations/supplier_allocation_main.php:111
-#: 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 ""
 
-#: reporting/rep101.php:120 reporting/rep102.php:106 reporting/rep114.php:103
-#: reporting/rep202.php:110 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 ""
 
-#: reporting/rep101.php:130 reporting/rep201.php:118 reporting/rep203.php:91
-#: reporting/rep709.php:109 reporting/includes/doctext.inc:145
-#: reporting/includes/doctext.inc:186 reporting/includes/doctext.inc:224
+#: ../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 ""
 
-#: reporting/rep101.php:130 reporting/rep201.php:118
-#: reporting/includes/doctext.inc:224
+#: ../reporting/rep101.php:130
+#: ../reporting/rep201.php:118
+#: ../reporting/includes/doctext.inc:246
 msgid "Charges"
 msgstr ""
 
-#: reporting/rep101.php:130 reporting/rep201.php:119
-#: reporting/includes/doctext.inc:225
+#: ../reporting/rep101.php:130
+#: ../reporting/rep201.php:119
+#: ../reporting/includes/doctext.inc:247
 msgid "Credits"
 msgstr ""
 
-#: 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
+#: ../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 ""
 
-#: reporting/rep101.php:141
+#: ../reporting/rep101.php:141
 msgid "Customer Balances"
 msgstr ""
 
-#: 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 reporting/rep305.php:183
+#: ../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:183
 msgid "Grand Total"
 msgstr ""
 
-#: 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
+#: ../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 ""
 
-#: reporting/rep102.php:102 reporting/rep202.php:106 reporting/rep709.php:95
+#: ../reporting/rep102.php:102
+#: ../reporting/rep202.php:106
+#: ../reporting/rep709.php:95
 msgid "Detailed Report"
 msgstr ""
 
-#: 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
+#: ../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 ""
 
-#: reporting/rep102.php:133 reporting/rep202.php:138
-#: reporting/reports_main.php:45 reporting/reports_main.php:110
-#: reporting/reports_main.php:145
+#: ../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
+#: ../reporting/rep102.php:138
 msgid "Aged Customer Analysis"
 msgstr ""
 
-#: reporting/rep103.php:115
+#: ../reporting/rep103.php:115
 msgid "All Areas"
 msgstr ""
 
-#: reporting/rep103.php:119
+#: ../reporting/rep103.php:119
 msgid "All Sales Folk"
 msgstr ""
 
-#: reporting/rep103.php:123
+#: ../reporting/rep103.php:123
 msgid "Greater than "
 msgstr ""
 
-#: reporting/rep103.php:127
+#: ../reporting/rep103.php:127
 msgid "Less than "
 msgstr ""
 
-#: reporting/rep103.php:136
+#: ../reporting/rep103.php:136
 msgid "Customer Postal Address"
 msgstr ""
 
-#: reporting/rep103.php:136
+#: ../reporting/rep103.php:136
 msgid "Price/Turnover"
 msgstr ""
 
-#: reporting/rep103.php:136
+#: ../reporting/rep103.php:136
 msgid "Branch Contact Information"
 msgstr ""
 
-#: reporting/rep103.php:137
+#: ../reporting/rep103.php:137
 msgid "Branch Delivery Address"
 msgstr ""
 
-#: reporting/rep103.php:142 reporting/reports_main.php:52
+#: ../reporting/rep103.php:142
+#: ../reporting/reports_main.php:52
 msgid "Activity Since"
 msgstr ""
 
-#: reporting/rep103.php:143 reporting/reports_main.php:53
-#: 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 ""
 
-#: reporting/rep103.php:144 reporting/reports_main.php:54
+#: ../reporting/rep103.php:144
+#: ../reporting/reports_main.php:54
 msgid "Sales Folk"
 msgstr ""
 
-#: reporting/rep103.php:145
+#: ../reporting/rep103.php:145
 msgid "Activity"
 msgstr ""
 
-#: reporting/rep103.php:147
+#: ../reporting/rep103.php:147
 msgid "Customer Details Listing"
 msgstr ""
 
-#: reporting/rep103.php:175
+#: ../reporting/rep103.php:175
 msgid "Customers in"
 msgstr ""
 
-#: reporting/rep103.php:196
+#: ../reporting/rep103.php:196
 msgid "Price List"
 msgstr ""
 
-#: reporting/rep103.php:207
+#: ../reporting/rep103.php:207
 msgid "Turnover"
 msgstr ""
 
-#: reporting/rep103.php:216
+#: ../reporting/rep103.php:216
 msgid "Ph"
 msgstr ""
 
-#: reporting/rep104.php:109
+#: ../reporting/rep104.php:109
 msgid "Category/Items"
 msgstr ""
 
-#: reporting/rep104.php:109 reporting/rep301.php:103 reporting/rep303.php:109
-#: reporting/rep303.php:115
+#: ../reporting/rep104.php:109
+#: ../reporting/rep301.php:103
+#: ../reporting/rep303.php:109
+#: ../reporting/rep303.php:115
 msgid "UOM"
 msgstr ""
 
-#: reporting/rep104.php:109
+#: ../reporting/rep104.php:109
 msgid "GP %"
 msgstr ""
 
-#: reporting/rep104.php:117 reporting/reports_main.php:70
+#: ../reporting/rep104.php:117
+#: ../reporting/reports_main.php:70
 msgid "Show GP %"
 msgstr ""
 
-#: reporting/rep104.php:124
+#: ../reporting/rep104.php:124
 msgid "Price Listing"
 msgstr ""
 
-#: reporting/rep104.php:191
+#: ../reporting/rep104.php:191
 msgid "Sales Kits"
 msgstr ""
 
-#: reporting/rep105.php:101
+#: ../reporting/rep105.php:101
 msgid "All Orders"
 msgstr ""
 
-#: reporting/rep105.php:103 reporting/reports_main.php:78
+#: ../reporting/rep105.php:103
+#: ../reporting/reports_main.php:78
 msgid "Back Orders Only"
 msgstr ""
 
-#: reporting/rep105.php:107 reporting/rep204.php:82
-#: sales/inquiry/customer_allocation_inquiry.php:147
-#: sales/inquiry/customer_inquiry.php:226
-#: sales/inquiry/customer_inquiry.php.orig:226
+#: ../reporting/rep105.php:107
+#: ../reporting/rep204.php:82
+#: ../sales/inquiry/customer_allocation_inquiry.php:147
+#: ../sales/inquiry/customer_inquiry.php:202
 msgid "Order"
 msgstr ""
 
-#: reporting/rep105.php:107 reporting/rep106.php:81 reporting/rep112.php:176
-#: sales/create_recurrent_invoices.php:115
-#: sales/customer_credit_invoice.php:238 sales/customer_delivery.php:339
-#: sales/customer_invoice.php:379 sales/manage/customers.php:251
-#: sales/manage/customers.php:289 sales/manage/customers.php.orig:248
-#: sales/manage/customers.php.orig:286 sales/manage/recurrent_invoices.php:102
-#: sales/view/view_credit.php:58 sales/inquiry/customer_inquiry.php:231
-#: sales/inquiry/customer_inquiry.php.orig:231
-#: sales/inquiry/sales_deliveries_view.php:182
-#: sales/inquiry/sales_orders_view.php:265
-#: sales/inquiry/sales_orders_view.php:279
-#: sales/inquiry/sales_orders_view.php.orig:263
-#: sales/inquiry/sales_orders_view.php.orig:277
-#: sales/create_recurrent_invoices.php:132
-#: sales/customer_credit_invoice.php:236 sales/customer_invoice.php:381
-#: sales/manage/customers.php:290
+#: ../reporting/rep105.php:107
+#: ../reporting/rep106.php:81
+#: ../reporting/rep112.php:164
+#: ../sales/create_recurrent_invoices.php:132
+#: ../sales/customer_credit_invoice.php:236
+#: ../sales/customer_delivery.php.orig:352
+#: ../sales/customer_invoice.php:447
+#: ../sales/manage/customers.php:251
+#: ../sales/manage/customers.php:290
+#: ../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/sales_deliveries_view.php:182
+#: ../sales/inquiry/sales_orders_view.php:287
+#: ../sales/inquiry/sales_orders_view.php:301
 msgid "Branch"
 msgstr ""
 
-#: reporting/rep105.php:107 reporting/rep106.php:81
+#: ../reporting/rep105.php:107
+#: ../reporting/rep106.php:81
 msgid "Customer Ref"
 msgstr ""
 
-#: reporting/rep105.php:108
+#: ../reporting/rep105.php:108
 msgid "Ord Date"
 msgstr ""
 
-#: reporting/rep105.php:108
+#: ../reporting/rep105.php:108
 msgid "Del Date"
 msgstr ""
 
-#: reporting/rep105.php:108 reporting/rep401.php:69
+#: ../reporting/rep105.php:108
+#: ../reporting/rep401.php:69
 msgid "Loc"
 msgstr ""
 
-#: reporting/rep105.php:112 sales/customer_delivery.php:432
-#: sales/customer_invoice.php:467 sales/customer_invoice.php:469
+#: ../reporting/rep105.php:112
+#: ../sales/customer_delivery.php.orig:445
+#: ../sales/customer_invoice.php:544
 msgid "Invoiced"
 msgstr ""
 
-#: reporting/rep105.php:119
+#: ../reporting/rep105.php:119
 msgid "Selection"
 msgstr ""
 
-#: reporting/rep105.php:124
+#: ../reporting/rep105.php:124
 msgid "Order Status Listing"
 msgstr ""
 
-#: reporting/rep106.php:82
+#: ../reporting/rep106.php:82
 msgid "Inv Date"
 msgstr ""
 
-#: 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
+#: ../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 ""
 
-#: reporting/rep106.php:86
+#: ../reporting/rep106.php:86
 msgid "Salesman"
 msgstr ""
 
-#: reporting/rep106.php:86 reporting/includes/header2.inc:110
-#: sales/manage/sales_people.php:99
+#: ../reporting/rep106.php:86
+#: ../reporting/includes/header2.inc:110
+#: ../sales/manage/sales_people.php:99
 msgid "Email"
 msgstr ""
 
-#: reporting/rep106.php:87 sales/manage/sales_people.php:99
+#: ../reporting/rep106.php:87
+#: ../sales/manage/sales_people.php:99
 msgid "Break Pt."
 msgstr ""
 
-#: reporting/rep106.php:96
+#: ../reporting/rep106.php:96
 msgid "Salesman Listing"
 msgstr ""
 
-#: reporting/rep107.php:66 reporting/rep107.php:89 reporting/rep107.php:94
-#: reporting/includes/doctext.inc:105
+#: ../reporting/rep107.php:85
+#: ../reporting/rep107.php:105
+#: ../reporting/includes/doctext.inc:118
 msgid "INVOICE"
 msgstr ""
 
-#: reporting/rep107.php:151 reporting/rep109.php:154 reporting/rep110.php:164
-#: reporting/rep111.php:141 reporting/rep113.php:150
-#: sales/view/view_credit.php:138 sales/view/view_dispatch.php:155
-#: sales/view/view_invoice.php:157 sales/view/view_sales_order.php:227
-#: sales/includes/ui/sales_credit_ui.inc:222
+#: ../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 ""
 
-#: reporting/rep108.php:84 reporting/rep108.php:115
-#: reporting/includes/doctext.inc:216
+#: ../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 ""
 
-#: reporting/rep108.php:126
+#: ../reporting/rep108.php:126
 msgid "Outstanding Transactions"
 msgstr ""
 
-#: reporting/rep108.php:169
+#: ../reporting/rep108.php:169
 msgid "Statement"
 msgstr ""
 
-#: reporting/rep108.php:169
+#: ../reporting/rep108.php:169
 msgid "as of"
 msgstr ""
 
-#: reporting/rep109.php:65 reporting/rep109.php:93 reporting/rep109.php:99
-#: reporting/includes/doctext.inc:53
+#: ../reporting/rep109.php:66
+#: ../reporting/rep109.php:94
+#: ../reporting/rep109.php:100
+#: ../reporting/includes/doctext.inc:65
 msgid "SALES ORDER"
 msgstr ""
 
-#: reporting/rep109.php:67 reporting/rep109.php:88 reporting/rep109.php:99
-#: reporting/includes/doctext.inc:53
+#: ../reporting/rep109.php:68
+#: ../reporting/rep109.php:89
+#: ../reporting/rep109.php:100
+#: ../reporting/includes/doctext.inc:65
 msgid "QUOTE"
 msgstr ""
 
-#: reporting/rep109.php:160 reporting/rep111.php:147
+#: ../reporting/rep109.php:161
+#: ../reporting/rep111.php:146
 msgid "TOTAL ORDER EX VAT"
 msgstr ""
 
-#: reporting/rep109.php:206 reporting/rep111.php:193
-msgid "TOTAL ORDER VAT INCL."
-msgstr ""
-
-#: reporting/rep110.php:68
+#: ../reporting/rep110.php:68
 msgid "DELIVERY"
 msgstr ""
 
-#: reporting/rep110.php:70 reporting/rep110.php:97
-#: reporting/includes/doctext.inc:70
+#: ../reporting/rep110.php:70
+#: ../reporting/rep110.php:97
+#: ../reporting/includes/doctext.inc:82
 msgid "PACKING SLIP"
 msgstr ""
 
-#: reporting/rep110.php:92 reporting/rep110.php:103
-#: reporting/includes/doctext.inc:70
+#: ../reporting/rep110.php:92
+#: ../reporting/rep110.php:103
+#: ../reporting/includes/doctext.inc:82
 msgid "DELIVERY NOTE"
 msgstr ""
 
-#: reporting/rep110.php:208
+#: ../reporting/rep110.php:208
 msgid "TOTAL DELIVERY INCL. VAT"
 msgstr ""
 
-#: reporting/rep111.php:61 reporting/rep111.php:86
-#: reporting/includes/doctext.inc:38
+#: ../reporting/rep111.php:61
+#: ../reporting/rep111.php:86
+#: ../reporting/includes/doctext.inc:50
 msgid "SALES QUOTATION"
 msgstr ""
 
-#: reporting/rep112.php:92 reporting/rep112.php:113
-#: reporting/includes/doctext.inc:176
+#: ../reporting/rep112.php:80
+#: ../reporting/rep112.php:101
+#: ../reporting/includes/doctext.inc:198
 msgid "RECEIPT"
 msgstr ""
 
-#: reporting/rep112.php:122 reporting/rep210.php:136
+#: ../reporting/rep112.php:110
+#: ../reporting/rep210.php:124
 msgid "As advance / full / part / payment towards:"
 msgstr ""
 
-#: reporting/rep112.php:157
+#: ../reporting/rep112.php:145
 msgid "TOTAL RECEIPT"
 msgstr ""
 
-#: reporting/rep112.php:167
+#: ../reporting/rep112.php:155
 msgid "Received / Sign"
 msgstr ""
 
-#: reporting/rep112.php:169
+#: ../reporting/rep112.php:157
 msgid "By Cash / Cheque* / Draft No."
 msgstr ""
 
-#: reporting/rep112.php:171
+#: ../reporting/rep112.php:159
 msgid "Dated"
 msgstr ""
 
-#: reporting/rep112.php:174
+#: ../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:91
+#: ../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
+#: ../reporting/rep113.php:194
+#: ../sales/view/view_credit.php:143
 msgid "TOTAL CREDIT"
 msgstr ""
 
-#: reporting/rep114.php:85
+#: ../reporting/rep114.php:85
 msgid "Sales Summary Report"
 msgstr ""
 
-#: reporting/rep114.php:89 reporting/reports_main.php:62
+#: ../reporting/rep114.php:89
+#: ../reporting/reports_main.php:62
 msgid "Tax Id Only"
 msgstr ""
 
-#: reporting/rep114.php:93
+#: ../reporting/rep114.php:93
 msgid "Tax Id"
 msgstr ""
 
-#: reporting/rep114.php:93
+#: ../reporting/rep114.php:93
 msgid "Total ex. Tax"
 msgstr ""
 
-#: reporting/rep114.php:93 reporting/rep709.php:110 taxes/tax_groups.php:177
+#: ../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
+#: ../reporting/rep201.php:108
 msgid "Balances in Home currency"
 msgstr ""
 
-#: reporting/rep201.php:129
+#: ../reporting/rep201.php:129
 msgid "Supplier Balances"
 msgstr ""
 
-#: reporting/rep202.php:142
+#: ../reporting/rep202.php:142
 msgid "currency"
 msgstr ""
 
-#: reporting/rep202.php:143
+#: ../reporting/rep202.php:143
 msgid "Aged Supplier Analysis"
 msgstr ""
 
-#: reporting/rep203.php:102
+#: ../reporting/rep203.php:102
 msgid "Payment Report"
 msgstr ""
 
-#: reporting/rep204.php:82
+#: ../reporting/rep204.php:82
 msgid "Qty Recd"
 msgstr ""
 
-#: reporting/rep204.php:82
+#: ../reporting/rep204.php:82
 msgid "qty Inv"
 msgstr ""
 
-#: reporting/rep204.php:83
+#: ../reporting/rep204.php:83
 msgid "Act Price"
 msgstr ""
 
-#: reporting/rep204.php:90
+#: ../reporting/rep204.php:90
 msgid "Outstanding GRNs Report"
 msgstr ""
 
-#: reporting/rep209.php:88 reporting/rep209.php:107 reporting/rep209.php:112
-#: reporting/includes/doctext.inc:149
+#: ../reporting/rep209.php:88
+#: ../reporting/rep209.php:107
+#: ../reporting/rep209.php:112
+#: ../reporting/includes/doctext.inc:171
 msgid "PURCHASE ORDER"
 msgstr ""
 
-#: reporting/rep209.php:211
+#: ../reporting/rep209.php:214
 msgid "TOTAL PO"
 msgstr ""
 
-#: reporting/rep210.php:94 reporting/rep210.php:122 reporting/rep210.php:127
-#: reporting/includes/doctext.inc:129
+#: ../reporting/rep210.php:82
+#: ../reporting/rep210.php:110
+#: ../reporting/rep210.php:115
+#: ../reporting/includes/doctext.inc:151
 msgid "REMITTANCE"
 msgstr ""
 
-#: reporting/rep210.php:171
+#: ../reporting/rep210.php:159
 msgid "TOTAL REMITTANCE"
 msgstr ""
 
-#: reporting/rep301.php:112
+#: ../reporting/rep301.php:112
 msgid "Inventory Valuation Report"
 msgstr ""
 
-#: reporting/rep302.php:123
+#: ../reporting/rep302.php:123
 msgid "QOH"
 msgstr ""
 
-#: reporting/rep302.php:123
+#: ../reporting/rep302.php:123
 msgid "Cust Ord"
 msgstr ""
 
-#: reporting/rep302.php:123
+#: ../reporting/rep302.php:123
 msgid "Supp Ord"
 msgstr ""
 
-#: reporting/rep302.php:123
+#: ../reporting/rep302.php:123
 msgid "Sugg Ord"
 msgstr ""
 
-#: reporting/rep302.php:132
+#: ../reporting/rep302.php:132
 msgid "Inventory Planning Report"
 msgstr ""
 
-#: reporting/rep303.php:97
+#: ../reporting/rep303.php:97
 msgid "Shortage"
 msgstr ""
 
-#: reporting/rep303.php:109 reporting/rep303.php:115 reporting/rep305.php:95
-#: reporting/rep305.php:98
+#: ../reporting/rep303.php:109
+#: ../reporting/rep303.php:115
+#: ../reporting/rep305.php:98
 msgid "Stock ID"
 msgstr ""
 
-#: reporting/rep303.php:109
+#: ../reporting/rep303.php:109
 msgid "Check"
 msgstr ""
 
-#: reporting/rep303.php:123
+#: ../reporting/rep303.php:123
 msgid "Only Shortage"
 msgstr ""
 
-#: reporting/rep303.php:131
+#: ../reporting/rep303.php:131
 msgid "Stock Check Sheets"
 msgstr ""
 
-#: reporting/rep304.php:112 reporting/rep305.php:95 reporting/rep305.php:98
+#: ../reporting/rep304.php:112
+#: ../reporting/rep305.php:98
 msgid "Qty"
 msgstr ""
 
-#: reporting/rep304.php:112 sales/manage/customer_branches.php:240
-#: sales/manage/customers.php:259 sales/manage/customers.php.orig:256
-#: sales/manage/customers.php:260
+#: ../reporting/rep304.php:112
+#: ../sales/manage/customer_branches.php:241
+#: ../sales/manage/customers.php:260
+#: ../sales/manage/sav.customers.php:259
 msgid "Sales"
 msgstr ""
 
-#: reporting/rep304.php:112
+#: ../reporting/rep304.php:112
 msgid "Cost"
 msgstr ""
 
-#: reporting/rep304.php:112
+#: ../reporting/rep304.php:112
 msgid "Contribution"
 msgstr ""
 
-#: reporting/rep304.php:124
+#: ../reporting/rep304.php:124
 msgid "Inventory Sales Report"
 msgstr ""
 
-#: reporting/rep305.php:95 reporting/rep305.php:98
+#: ../reporting/rep305.php:98
 msgid "PO No"
 msgstr ""
 
-#: reporting/rep305.php:95 reporting/rep305.php:98
+#: ../reporting/rep305.php:98
 msgid "Inv"
 msgstr ""
 
-#: reporting/rep305.php:95 reporting/rep305.php:98
+#: ../reporting/rep305.php:98
 msgid "Inv Price"
 msgstr ""
 
-#: reporting/rep305.php:95 reporting/rep305.php:98
+#: ../reporting/rep305.php:98
 msgid "PO Price"
 msgstr ""
 
-#: reporting/rep305.php:102 reporting/rep305.php:105
+#: ../reporting/rep305.php:105
 msgid "GRN Valuation Report"
 msgstr ""
 
-#: reporting/rep401.php:69
+#: ../reporting/rep401.php:69
 msgid "Wrk Ctr"
 msgstr ""
 
-#: reporting/rep401.php:76
+#: ../reporting/rep401.php:76
 msgid "Bill of Material Listing"
 msgstr ""
 
-#: reporting/rep409.php:58 reporting/rep409.php:77 reporting/rep409.php:82
-#: reporting/includes/doctext.inc:192
+#: ../reporting/rep409.php:58
+#: ../reporting/rep409.php:77
+#: ../reporting/rep409.php:82
+#: ../reporting/includes/doctext.inc:214
 msgid "WORK ORDER"
 msgstr ""
 
-#: reporting/rep409.php:132
+#: ../reporting/rep409.php:132
 msgid "Insufficient stock"
 msgstr ""
 
-#: reporting/rep501.php:85
+#: ../reporting/rep501.php:85
 msgid "YTD"
 msgstr ""
 
-#: reporting/rep501.php:92
+#: ../reporting/rep501.php:92
 msgid "Dimension Summary"
 msgstr ""
 
-#: reporting/rep601.php:83 reporting/includes/doctext.inc:247
+#: ../reporting/rep601.php:83
+#: ../reporting/rep602.php:87
+#: ../reporting/includes/doctext.inc:260
 msgid "Bank Account"
 msgstr ""
 
-#: reporting/rep601.php:144
+#: ../reporting/rep601.php:144
+#: ../reporting/rep602.php:151
 msgid "Total Debit / Credit"
 msgstr ""
 
-#: reporting/rep601.php:161
+#: ../reporting/rep601.php:161
+#: ../reporting/rep602.php:167
 msgid "Net Change"
 msgstr ""
 
-#: reporting/rep702.php:51
+#: ../reporting/rep602.php:73
+msgid "Bank Statement w/Reconcile"
+msgstr ""
+
+#: ../reporting/rep602.php:81
+msgid "Reco Date"
+msgstr ""
+
+#: ../reporting/rep602.php:81
+msgid "Narration"
+msgstr ""
+
+#: ../reporting/rep602.php:195
+msgid "Bank Balance"
+msgstr ""
+
+#: ../reporting/rep702.php:51
 msgid "Type/Account"
 msgstr ""
 
-#: reporting/rep702.php:51
+#: ../reporting/rep702.php:51
 msgid "Date/Dim."
 msgstr ""
 
-#: reporting/rep702.php:52
+#: ../reporting/rep702.php:52
 msgid "Person/Item/Memo"
 msgstr ""
 
-#: reporting/rep702.php:62
+#: ../reporting/rep702.php:62
 msgid "List of Journal Entries"
 msgstr ""
 
-#: reporting/rep704.php:67
+#: ../reporting/rep704.php:67
 msgid "GL Account Transactions"
 msgstr ""
 
-#: 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
+#: ../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 ""
 
-#: reporting/rep705.php:249 reporting/rep705.php:260 reporting/rep705.php:269
-#: reporting/rep706.php:194 reporting/rep706.php:202 reporting/rep706.php:208
-#: reporting/rep707.php:218 reporting/rep707.php:226 reporting/rep707.php:232
+#: ../reporting/rep705.php: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 ""
 
-#: reporting/rep705.php:250 reporting/rep705.php:261 reporting/rep705.php:270
+#: ../reporting/rep705.php:250
+#: ../reporting/rep705.php:261
+#: ../reporting/rep705.php:270
 msgid "Amounts in thousands"
 msgstr ""
 
-#: reporting/rep705.php:274
+#: ../reporting/rep705.php:274
 msgid "Annual Expense Breakdown"
 msgstr ""
 
-#: reporting/rep706.php:182
+#: ../reporting/rep706.php:182
 msgid "Close Balance"
 msgstr ""
 
-#: reporting/rep707.php:254
+#: ../reporting/rep707.php:254
 msgid "Profit and Loss Statement"
 msgstr ""
 
-#: reporting/rep709.php:91
+#: ../reporting/rep709.php:91
 msgid "Tax Report"
 msgstr ""
 
-#: reporting/rep709.php:109
+#: ../reporting/rep709.php:109
 msgid "Branch Name"
 msgstr ""
 
-#: reporting/rep709.php:110
+#: ../reporting/rep709.php:110
 msgid "Net"
 msgstr ""
 
-#: reporting/rep709.php:110 taxes/item_tax_types.php:185
+#: ../reporting/rep709.php:110
+#: ../taxes/item_tax_types.php:185
 msgid "Rate"
 msgstr ""
 
-#: reporting/rep709.php:172 reporting/rep709.php:176
+#: ../reporting/rep709.php:176
 msgid "Tax Rate"
 msgstr ""
 
-#: reporting/rep709.php:172 reporting/rep709.php:176
+#: ../reporting/rep709.php:176
 msgid "Net Tax"
 msgstr ""
 
-#: reporting/rep710.php:75
+#: ../reporting/rep710.php:75
 msgid "Time"
 msgstr ""
 
-#: reporting/rep710.php:75
+#: ../reporting/rep710.php:75
 msgid "Trans Date"
 msgstr ""
 
-#: reporting/rep710.php:76
+#: ../reporting/rep710.php:76
 msgid "Action"
 msgstr ""
 
-#: reporting/rep710.php:87 reporting/reports_main.php:396
+#: ../reporting/rep710.php:87
+#: ../reporting/reports_main.php:396
 msgid "Audit Trail"
 msgstr ""
 
-#: reporting/rep710.php:107
+#: ../reporting/rep710.php:107
 msgid "Changed"
 msgstr ""
 
-#: reporting/reports_main.php:26
+#: ../reporting/reports_main.php:26
 msgid "Reports and Analysis"
 msgstr ""
 
-#: reporting/reports_main.php:33
+#: ../reporting/reports_main.php:33
 msgid "Customer &Balances"
 msgstr ""
 
-#: reporting/reports_main.php:37 reporting/reports_main.php:44
-#: reporting/reports_main.php:66 reporting/reports_main.php:90
-#: reporting/reports_main.php:97 reporting/reports_main.php:109
-#: reporting/reports_main.php:116 reporting/reports_main.php:123
-#: reporting/reports_main.php:129 reporting/reports_main.php:137
-#: reporting/reports_main.php:144 reporting/reports_main.php:154
-#: reporting/reports_main.php:165 reporting/reports_main.php:171
+#: ../reporting/reports_main.php: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 ""
 
-#: 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
+#: ../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 ""
 
-#: reporting/reports_main.php:41
+#: ../reporting/reports_main.php:41
 msgid "&Aged Customer Analysis"
 msgstr ""
 
-#: 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
+#: ../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 ""
 
-#: reporting/reports_main.php:51
+#: ../reporting/reports_main.php:51
 msgid "Customer &Detail Listing"
 msgstr ""
 
-#: reporting/reports_main.php:55
+#: ../reporting/reports_main.php:55
 msgid "Activity Greater Than"
 msgstr ""
 
-#: reporting/reports_main.php:56
+#: ../reporting/reports_main.php:56
 msgid "Activity Less Than"
 msgstr ""
 
-#: reporting/reports_main.php:59
+#: ../reporting/reports_main.php:59
 msgid "Sales &Summary Report"
 msgstr ""
 
-#: reporting/reports_main.php:65
+#: ../reporting/reports_main.php:65
 msgid "&Price Listing"
 msgstr ""
 
-#: 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
+#: ../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 ""
 
-#: reporting/reports_main.php:68 sales/manage/sales_types.php:16
+#: ../reporting/reports_main.php:68
+#: ../sales/manage/sales_types.php:16
 msgid "Sales Types"
 msgstr ""
 
-#: reporting/reports_main.php:69 reporting/reports_main.php:192
+#: ../reporting/reports_main.php:69
+#: ../reporting/reports_main.php:192
 msgid "Show Pictures"
 msgstr ""
 
-#: reporting/reports_main.php:73
+#: ../reporting/reports_main.php:73
 msgid "&Order Status Listing"
 msgstr ""
 
-#: reporting/reports_main.php:77
+#: ../reporting/reports_main.php:77
 msgid "Stock Location"
 msgstr ""
 
-#: reporting/reports_main.php:81
+#: ../reporting/reports_main.php:81
 msgid "&Salesman Listing"
 msgstr ""
 
-#: reporting/reports_main.php:87
+#: ../reporting/reports_main.php:87
 msgid "Print &Invoices"
 msgstr ""
 
-#: reporting/reports_main.php:91 reporting/reports_main.php:98
-#: reporting/reports_main.php:104
+#: ../reporting/reports_main.php:91
+#: ../reporting/reports_main.php:98
+#: ../reporting/reports_main.php:104
 msgid "email Customers"
 msgstr ""
 
-#: reporting/reports_main.php:92 reporting/reports_main.php:99
+#: ../reporting/reports_main.php:92
+#: ../reporting/reports_main.php:99
 msgid "Payment Link"
 msgstr ""
 
-#: reporting/reports_main.php:94
+#: ../reporting/reports_main.php:94
 msgid "Print &Credit Notes"
 msgstr ""
 
-#: reporting/reports_main.php:101
+#: ../reporting/reports_main.php:101
 msgid "Print &Deliveries"
 msgstr ""
 
-#: reporting/reports_main.php:105
+#: ../reporting/reports_main.php:105
 msgid "Print as Packing Slip"
 msgstr ""
 
-#: reporting/reports_main.php:107
+#: ../reporting/reports_main.php:107
 msgid "Print &Statements"
 msgstr ""
 
-#: reporting/reports_main.php:111 reporting/reports_main.php:117
-#: reporting/reports_main.php:124 reporting/reports_main.php:166
-#: reporting/reports_main.php:172
+#: ../reporting/reports_main.php: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 ""
 
-#: reporting/reports_main.php:113
+#: ../reporting/reports_main.php:113
 msgid "&Print Sales Orders"
 msgstr ""
 
-#: reporting/reports_main.php:118
+#: ../reporting/reports_main.php:118
 msgid "Print as Quote"
 msgstr ""
 
-#: reporting/reports_main.php:120
+#: ../reporting/reports_main.php:120
 msgid "&Print Sales Quotations"
 msgstr ""
 
-#: reporting/reports_main.php:126
+#: ../reporting/reports_main.php:126
 msgid "Print Receipts"
 msgstr ""
 
-#: reporting/reports_main.php:133
+#: ../reporting/reports_main.php:133
 msgid "Supplier &Balances"
 msgstr ""
 
-#: reporting/reports_main.php:141
+#: ../reporting/reports_main.php:141
 msgid "&Aged Supplier Analyses"
 msgstr ""
 
-#: reporting/reports_main.php:151
+#: ../reporting/reports_main.php:151
 msgid "&Payment Report"
 msgstr ""
 
-#: reporting/reports_main.php:158
+#: ../reporting/reports_main.php:158
 msgid "Outstanding &GRNs Report"
 msgstr ""
 
-#: reporting/reports_main.php:162
+#: ../reporting/reports_main.php:162
 msgid "Print Purchase &Orders"
 msgstr ""
 
-#: reporting/reports_main.php:168
-msgid "Print Remittances"
+#: ../reporting/reports_main.php:168
+msgid "Print Remi&ttances"
 msgstr ""
 
-#: reporting/reports_main.php:177
+#: ../reporting/reports_main.php:177
 msgid "Inventory &Valuation Report"
 msgstr ""
 
-#: reporting/reports_main.php:184
+#: ../reporting/reports_main.php:184
 msgid "Inventory &Planning Report"
 msgstr ""
 
-#: reporting/reports_main.php:189
+#: ../reporting/reports_main.php:189
 msgid "Stock &Check Sheets"
 msgstr ""
 
-#: reporting/reports_main.php:193
+#: ../reporting/reports_main.php:193
 msgid "Inventory Column"
 msgstr ""
 
-#: reporting/reports_main.php:194
+#: ../reporting/reports_main.php:194
 msgid "Show Shortage"
 msgstr ""
 
-#: reporting/reports_main.php:198
+#: ../reporting/reports_main.php:198
 msgid "Inventory &Sales Report"
 msgstr ""
 
-#: reporting/reports_main.php:206
+#: ../reporting/reports_main.php:206
 msgid "&GRN Valuation Report"
 msgstr ""
 
-#: reporting/reports_main.php:212
+#: ../reporting/reports_main.php:212
 msgid "Manufacturing"
 msgstr ""
 
-#: reporting/reports_main.php:213
+#: ../reporting/reports_main.php:213
 msgid "&Bill of Material Listing"
 msgstr ""
 
-#: reporting/reports_main.php:214
+#: ../reporting/reports_main.php:214
 msgid "From product"
 msgstr ""
 
-#: reporting/reports_main.php:215
+#: ../reporting/reports_main.php:215
 msgid "To product"
 msgstr ""
 
-#: reporting/reports_main.php:218
+#: ../reporting/reports_main.php:218
 msgid "Print &Work Orders"
 msgstr ""
 
-#: reporting/reports_main.php:221
+#: ../reporting/reports_main.php:221
 msgid "Email Locations"
 msgstr ""
 
-#: reporting/reports_main.php:226
+#: ../reporting/reports_main.php:226
 msgid "Dimension &Summary"
 msgstr ""
 
-#: reporting/reports_main.php:227
+#: ../reporting/reports_main.php:227
 msgid "From Dimension"
 msgstr ""
 
-#: reporting/reports_main.php:228
+#: ../reporting/reports_main.php:228
 msgid "To Dimension"
 msgstr ""
 
-#: reporting/reports_main.php:229
+#: ../reporting/reports_main.php:229
 msgid "Show Balance"
 msgstr ""
 
-#: reporting/reports_main.php:236
+#: ../reporting/reports_main.php:236
 msgid "Banking"
 msgstr ""
 
-#: reporting/reports_main.php:237
+#: ../reporting/reports_main.php:237
 msgid "Bank &Statement"
 msgstr ""
 
-#: reporting/reports_main.php:244
+#: ../reporting/reports_main.php:244
 msgid "General Ledger"
 msgstr ""
 
-#: reporting/reports_main.php:245
+#: ../reporting/reports_main.php:245
 msgid "Chart of &Accounts"
 msgstr ""
 
-#: reporting/reports_main.php:246
+#: ../reporting/reports_main.php:246
 msgid "Show Balances"
 msgstr ""
 
-#: reporting/reports_main.php:249
+#: ../reporting/reports_main.php:249
 msgid "List of &Journal Entries"
 msgstr ""
 
-#: reporting/reports_main.php:260 reporting/reports_main.php:309
-#: reporting/reports_main.php:353
+#: ../reporting/reports_main.php:260
+#: ../reporting/reports_main.php:309
+#: ../reporting/reports_main.php:353
 msgid "GL Account &Transactions"
 msgstr ""
 
-#: reporting/reports_main.php:263 reporting/reports_main.php:312
-#: reporting/reports_main.php:356
+#: ../reporting/reports_main.php:263
+#: ../reporting/reports_main.php:312
+#: ../reporting/reports_main.php:356
 msgid "From Account"
 msgstr ""
 
-#: reporting/reports_main.php:264 reporting/reports_main.php:313
-#: reporting/reports_main.php:357
+#: ../reporting/reports_main.php:264
+#: ../reporting/reports_main.php:313
+#: ../reporting/reports_main.php:357
 msgid "To Account"
 msgstr ""
 
-#: reporting/reports_main.php:269 reporting/reports_main.php:317
-#: reporting/reports_main.php:360
+#: ../reporting/reports_main.php:269
+#: ../reporting/reports_main.php:317
+#: ../reporting/reports_main.php:360
 msgid "Annual &Expense Breakdown"
 msgstr ""
 
-#: reporting/reports_main.php:276 reporting/reports_main.php:323
-#: reporting/reports_main.php:365
+#: ../reporting/reports_main.php:276
+#: ../reporting/reports_main.php:323
+#: ../reporting/reports_main.php:365
 msgid "&Balance Sheet"
 msgstr ""
 
-#: reporting/reports_main.php:282 reporting/reports_main.php:293
-#: reporting/reports_main.php:328 reporting/reports_main.php:338
-#: reporting/reports_main.php:369 reporting/reports_main.php:378
+#: ../reporting/reports_main.php: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 ""
 
-#: reporting/reports_main.php:286 reporting/reports_main.php:332
-#: reporting/reports_main.php:373
+#: ../reporting/reports_main.php:286
+#: ../reporting/reports_main.php:332
+#: ../reporting/reports_main.php:373
 msgid "&Profit and Loss Statement"
 msgstr ""
 
-#: reporting/reports_main.php:300 reporting/reports_main.php:345
-#: reporting/reports_main.php:385
+#: ../reporting/reports_main.php:300
+#: ../reporting/reports_main.php:345
+#: ../reporting/reports_main.php:385
 msgid "Zero values"
 msgstr ""
 
-#: reporting/reports_main.php:390
+#: ../reporting/reports_main.php:390
 msgid "Ta&x Report"
 msgstr ""
 
-#: reporting/includes/doctext.inc:18 reporting/includes/doctext.inc:134
-#: sales/view/view_dispatch.php:51 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 ""
 
-#: reporting/includes/doctext.inc:23 sales/view/view_dispatch.php:74
+#: ../reporting/includes/doctext.inc:23
+#: ../sales/view/view_dispatch.php:74
 msgid "Delivered To"
 msgstr ""
 
-#: 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:114 sales/includes/ui/sales_credit_ui.inc:168
-#: sales/includes/ui/sales_order_ui.inc:142
-#: sales/customer_credit_invoice.php:281
-#: sales/includes/ui/sales_order_ui.inc:146
+#: ../reporting/includes/doctext.inc:30
+#: ../sales/customer_credit_invoice.php:281
+#: ../sales/view/view_credit.php:91
+#: ../sales/view/view_dispatch.php:113
+#: ../sales/view/view_invoice.php:116
+#: ../sales/includes/ui/sales_credit_ui.inc:168
+#: ../sales/includes/ui/sales_order_ui.inc.orig:142
 msgid "Discount %"
 msgstr ""
 
-#: reporting/includes/doctext.inc:33
+#: ../reporting/includes/doctext.inc:33
 msgid "All amounts stated in"
 msgstr ""
 
-#: reporting/includes/doctext.inc:39
+#: ../reporting/includes/doctext.inc:51
 msgid "Quotation No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:44 reporting/includes/doctext.inc:61
-#: reporting/includes/doctext.inc:82 reporting/includes/doctext.inc:96
-#: reporting/includes/doctext.inc:118 reporting/includes/doctext.inc:139
-#: reporting/includes/doctext.inc:162 reporting/includes/doctext.inc:180
-#: reporting/includes/doctext.inc:218
+#: ../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 ""
 
-#: reporting/includes/doctext.inc:45 reporting/includes/doctext.inc:62
-#: reporting/includes/doctext.inc:83 reporting/includes/doctext.inc:97
-#: reporting/includes/doctext.inc:119 reporting/includes/doctext.inc:163
-#: reporting/includes/doctext.inc:219 sales/manage/customer_branches.php:296
+#: ../reporting/includes/doctext.inc:57
+#: ../reporting/includes/doctext.inc:74
+#: ../reporting/includes/doctext.inc:95
+#: ../reporting/includes/doctext.inc:109
+#: ../reporting/includes/doctext.inc:132
+#: ../reporting/includes/doctext.inc:185
+#: ../reporting/includes/doctext.inc:241
+#: ../sales/manage/customer_branches.php:298
 msgid "Sales Person"
 msgstr ""
 
-#: reporting/includes/doctext.inc:46 reporting/includes/doctext.inc:63
-#: reporting/includes/doctext.inc:84 reporting/includes/doctext.inc:98
-#: reporting/includes/doctext.inc:120 reporting/includes/doctext.inc:141
-#: reporting/includes/doctext.inc:164 reporting/includes/doctext.inc:182
-#: reporting/includes/doctext.inc:220
+#: ../reporting/includes/doctext.inc:58
+#: ../reporting/includes/doctext.inc:75
+#: ../reporting/includes/doctext.inc:96
+#: ../reporting/includes/doctext.inc:110
+#: ../reporting/includes/doctext.inc:133
+#: ../reporting/includes/doctext.inc:163
+#: ../reporting/includes/doctext.inc:186
+#: ../reporting/includes/doctext.inc:204
+#: ../reporting/includes/doctext.inc:242
 msgid "Your VAT no."
 msgstr ""
 
-#: reporting/includes/doctext.inc:47
+#: ../reporting/includes/doctext.inc:59
 msgid "Our Quotation No"
 msgstr ""
 
-#: reporting/includes/doctext.inc:48 sales/view/view_sales_order.php:69
-#: sales/inquiry/sales_orders_view.php:282
-#: sales/inquiry/sales_orders_view.php.orig:280
-#: sales/includes/ui/sales_order_ui.inc:606
-#: sales/includes/ui/sales_order_ui.inc:610
+#: ../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/includes/ui/sales_order_ui.inc.orig:606
 msgid "Valid until"
 msgstr ""
 
-#: reporting/includes/doctext.inc:54
+#: ../reporting/includes/doctext.inc:65
+msgid "PREPAYMENT ORDER"
+msgstr ""
+
+#: ../reporting/includes/doctext.inc:66
 msgid "Order No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:64 reporting/includes/doctext.inc:85
-#: reporting/includes/doctext.inc:99 reporting/includes/doctext.inc:142
-#: reporting/includes/doctext.inc:165 reporting/includes/doctext.inc:183
-#: reporting/includes/doctext.inc:221 sales/view/view_dispatch.php:87
-#: sales/view/view_invoice.php:86
+#: ../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 ""
 
-#: reporting/includes/doctext.inc:71 reporting/includes/doctext.inc:121
+#: ../reporting/includes/doctext.inc:83
 msgid "Delivery Note No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:86
+#: ../reporting/includes/doctext.inc:98
 msgid "To Be Invoiced Before"
 msgstr ""
 
-#: reporting/includes/doctext.inc:92
+#: ../reporting/includes/doctext.inc:104
 msgid "Credit No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:93
+#: ../reporting/includes/doctext.inc:105
 msgid "Please quote Credit no. when paying. All amounts stated in"
 msgstr ""
 
-#: reporting/includes/doctext.inc:106
+#: ../reporting/includes/doctext.inc:117
+msgid "PREPAYMENT INVOICE"
+msgstr ""
+
+#: ../reporting/includes/doctext.inc:118
+msgid "FINAL INVOICE"
+msgstr ""
+
+#: ../reporting/includes/doctext.inc:119
 msgid "Invoice No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:108
+#: ../reporting/includes/doctext.inc:121
 msgid "Please quote Invoice no. when paying. All amounts stated in"
 msgstr ""
 
-#: reporting/includes/doctext.inc:130
+#: ../reporting/includes/doctext.inc:137
+msgid "Date of Payment"
+msgstr ""
+
+#: ../reporting/includes/doctext.inc:143
+msgid "Date of Sale"
+msgstr ""
+
+#: ../reporting/includes/doctext.inc:152
 msgid "Remittance No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:131 reporting/includes/doctext.inc:151
+#: ../reporting/includes/doctext.inc:153
+#: ../reporting/includes/doctext.inc:173
 msgid "Order To"
 msgstr ""
 
-#: reporting/includes/doctext.inc:150
+#: ../reporting/includes/doctext.inc:172
 msgid "Purchase Order No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:154
+#: ../reporting/includes/doctext.inc:176
 msgid "Deliver To"
 msgstr ""
 
-#: reporting/includes/doctext.inc:177
+#: ../reporting/includes/doctext.inc:199
 msgid "Receipt No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:178
+#: ../reporting/includes/doctext.inc:200
 msgid "With thanks from"
 msgstr ""
 
-#: reporting/includes/doctext.inc:193
+#: ../reporting/includes/doctext.inc:215
 msgid "Work Order No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:224
+#: ../reporting/includes/doctext.inc:246
 msgid "DueDate"
 msgstr ""
 
-#: reporting/includes/doctext.inc:259 reporting/includes/pdf_report.inc:1013
-#: reporting/includes/pdf_report.inc:1014
+#: ../reporting/includes/doctext.inc:272
+#: ../reporting/includes/pdf_report.inc:1014
 msgid "You can pay through"
 msgstr ""
 
-#: reporting/includes/doctext.inc:263
+#: ../reporting/includes/doctext.inc:276
 msgid "* Subject to Realisation of the Cheque."
 msgstr ""
 
-#: reporting/includes/excel_report.inc:67 reporting/includes/pdf_report.inc:80
+#: ../reporting/includes/excel_report.inc:67
+#: ../reporting/includes/pdf_report.inc:80
 msgid ""
 "The security settings on your account do not permit you to print this report"
 msgstr ""
 
-#: reporting/includes/excel_report.inc:262
-#: reporting/includes/pdf_report.inc:316
+#: ../reporting/includes/excel_report.inc:262
+#: ../reporting/includes/pdf_report.inc:316
 msgid "Print Out Date"
 msgstr ""
 
-#: reporting/includes/excel_report.inc:268
-#: reporting/includes/pdf_report.inc:325
+#: ../reporting/includes/excel_report.inc:268
+#: ../reporting/includes/pdf_report.inc:325
 msgid "Fiscal Year"
 msgstr ""
 
-#: reporting/includes/excel_report.inc:396
+#: ../reporting/includes/excel_report.inc:396
 msgid "Report Date"
 msgstr ""
 
-#: reporting/includes/excel_report.inc:413
-#: reporting/includes/pdf_report.inc:600 reporting/includes/pdf_report.inc:601
+#: ../reporting/includes/excel_report.inc:413
+#: ../reporting/includes/pdf_report.inc:601
 msgid "Generated At"
 msgstr ""
 
-#: reporting/includes/excel_report.inc:419
-#: reporting/includes/pdf_report.inc:609 reporting/includes/pdf_report.inc:610
+#: ../reporting/includes/excel_report.inc:419
+#: ../reporting/includes/pdf_report.inc:610
 msgid "Generated By"
 msgstr ""
 
-#: reporting/includes/header2.inc:122
+#: ../reporting/includes/header2.inc:122
 msgid "Our VAT No."
 msgstr ""
 
-#: reporting/includes/header2.inc:128
+#: ../reporting/includes/header2.inc:128
 msgid "Domicile"
 msgstr ""
 
-#: reporting/includes/header2.inc:143 reporting/includes/pdf_report.inc:352
-#: reporting/includes/pdf_report.inc:500 reporting/includes/pdf_report.inc:628
-#: reporting/includes/pdf_report.inc:501 reporting/includes/pdf_report.inc:629
+#: ../reporting/includes/header2.inc:143
+#: ../reporting/includes/pdf_report.inc:352
+#: ../reporting/includes/pdf_report.inc:501
+#: ../reporting/includes/pdf_report.inc:629
 msgid "Page"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:583 reporting/includes/pdf_report.inc:584
+#: ../reporting/includes/pdf_report.inc:584
 msgid "Report Period"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:980 reporting/includes/pdf_report.inc:981
+#: ../reporting/includes/pdf_report.inc:981
 msgid "You have no email contact defined for this type of document"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:999
-#: reporting/includes/pdf_report.inc:1000
+#: ../reporting/includes/pdf_report.inc:1000
 msgid "Dear"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1000
-#: reporting/includes/pdf_report.inc:1001
+#: ../reporting/includes/pdf_report.inc:1001
 msgid "Attached you will find "
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1016
-#: reporting/includes/pdf_report.inc:1017
+#: ../reporting/includes/pdf_report.inc:1017
 msgid "Kindest regards"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1028
-#: reporting/includes/pdf_report.inc:1029
+#: ../reporting/includes/pdf_report.inc:1029
 msgid "There is no contact email set for this document type."
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1031
-#: reporting/includes/pdf_report.inc:1032
+#: ../reporting/includes/pdf_report.inc:1032
 msgid "Sending document by email failed"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1031
-#: reporting/includes/pdf_report.inc:1034
-#: reporting/includes/pdf_report.inc:1032
-#: reporting/includes/pdf_report.inc:1035
+#: ../reporting/includes/pdf_report.inc:1032
+#: ../reporting/includes/pdf_report.inc:1035
 msgid "Email:"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1034
-#: reporting/includes/pdf_report.inc:1035
+#: ../reporting/includes/pdf_report.inc:1035
 msgid "has been sent by email to destination."
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1064
-#: reporting/includes/pdf_report.inc:1065
+#: ../reporting/includes/pdf_report.inc:1065
 msgid "Report has been sent to network printer "
 msgstr ""
 
-#: reporting/includes/printer_class.inc:39
+#: ../reporting/includes/printer_class.inc:39
 msgid "Cannot open connection to printer"
 msgstr ""
 
-#: reporting/includes/printer_class.inc:50
+#: ../reporting/includes/printer_class.inc:50
 msgid "Printer does not acept the job"
 msgstr ""
 
-#: reporting/includes/printer_class.inc:61
+#: ../reporting/includes/printer_class.inc:61
 msgid "Error sending print job control file"
 msgstr ""
 
-#: reporting/includes/printer_class.inc:68
+#: ../reporting/includes/printer_class.inc:68
 msgid "Print control file not accepted"
 msgstr ""
 
-#: reporting/includes/printer_class.inc:76
+#: ../reporting/includes/printer_class.inc:76
 msgid "Cannot send report to printer"
 msgstr ""
 
-#: reporting/includes/printer_class.inc:86
+#: ../reporting/includes/printer_class.inc:86
 msgid "No ack after report printout"
 msgstr ""
 
-#: reporting/includes/printer_class.inc:100
+#: ../reporting/includes/printer_class.inc:100
 msgid "Cannot flush printing queue"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:61
+#: ../reporting/includes/reports_classes.inc:61
 msgid "Report Classes:"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:81
+#: ../reporting/includes/reports_classes.inc:81
 msgid "Reports For Class: "
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:101
+#: ../reporting/includes/reports_classes.inc:101
 msgid "Display: "
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:149
+#: ../reporting/includes/reports_classes.inc:149
 msgid "Unknown report parameter type:"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:175
+#: ../reporting/includes/reports_classes.inc:175
 msgid "No Currency Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:227
-#: reporting/includes/reports_classes.inc:231
+#: ../reporting/includes/reports_classes.inc:231
 msgid "PDF/Printer"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:238
-#: reporting/includes/reports_classes.inc:242
+#: ../reporting/includes/reports_classes.inc:242
 msgid "No Graphics"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:238
-#: reporting/includes/reports_classes.inc:242
+#: ../reporting/includes/reports_classes.inc:242
 msgid "Vertical bars"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:238
-#: reporting/includes/reports_classes.inc:242
+#: ../reporting/includes/reports_classes.inc:242
 msgid "Horizontal bars"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:239
-#: reporting/includes/reports_classes.inc:243
+#: ../reporting/includes/reports_classes.inc:243
 msgid "Dots"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:239
-#: reporting/includes/reports_classes.inc:243
+#: ../reporting/includes/reports_classes.inc:243
 msgid "Lines"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:239
-#: reporting/includes/reports_classes.inc:243
+#: ../reporting/includes/reports_classes.inc:243
 msgid "Pie"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:239
-#: reporting/includes/reports_classes.inc:243
+#: ../reporting/includes/reports_classes.inc:243
 msgid "Donut"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:243
-#: reporting/includes/reports_classes.inc:246
-#: reporting/includes/reports_classes.inc:247
-#: reporting/includes/reports_classes.inc:250
+#: ../reporting/includes/reports_classes.inc:247
+#: ../reporting/includes/reports_classes.inc:250
 msgid "No Type Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:256
-#: reporting/includes/reports_classes.inc:260
+#: ../reporting/includes/reports_classes.inc:260
 msgid "No Account Group Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:271
-#: reporting/includes/reports_classes.inc:277
-#: reporting/includes/reports_classes.inc:283
-#: reporting/includes/reports_classes.inc:275
-#: reporting/includes/reports_classes.inc:281
-#: reporting/includes/reports_classes.inc:287
+#: ../reporting/includes/reports_classes.inc:275
+#: ../reporting/includes/reports_classes.inc:281
+#: ../reporting/includes/reports_classes.inc:287
 msgid "No Dimension Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:289
-#: reporting/includes/reports_classes.inc:293
+#: ../reporting/includes/reports_classes.inc:293
 msgid "No Customer Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:297
-#: reporting/includes/reports_classes.inc:301
+#: ../reporting/includes/reports_classes.inc:301
 msgid "No Supplier Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:379
-#: reporting/includes/reports_classes.inc:383
+#: ../reporting/includes/reports_classes.inc:383
 msgid "No Location Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:382
-#: reporting/includes/reports_classes.inc:386
+#: ../reporting/includes/reports_classes.inc:386
 msgid "No Category Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:391
-#: reporting/includes/reports_classes.inc:395
+#: ../reporting/includes/reports_classes.inc:395
 msgid "No Sales Folk Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:398
-#: reporting/includes/reports_classes.inc:402
+#: ../reporting/includes/reports_classes.inc:402
 msgid "No Users Filter"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:24
-#: sales/create_recurrent_invoices.php:26
+#: ../sales/create_recurrent_invoices.php:26
 msgid "Create and Print Recurrent Invoices"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:40
-#: sales/create_recurrent_invoices.php:42
+#: ../sales/create_recurrent_invoices.php:42
 #, php-format
 msgid "Recurrent Invoice covers period %s - %s."
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:97
-#: sales/create_recurrent_invoices.php:108
+#: ../sales/create_recurrent_invoices.php:108
 #, php-format
 msgid "%s recurrent invoice(s) created, # %s - # %s."
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:102
-#: sales/create_recurrent_invoices.php:113
+#: ../sales/create_recurrent_invoices.php:113
 #, php-format
 msgid "&Print Recurrent Invoices # %s - # %s"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:104
-#: sales/create_recurrent_invoices.php:115
+#: ../sales/create_recurrent_invoices.php:115
 #, php-format
 msgid "&Email Recurrent Invoices # %s - # %s"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:115
-#: sales/manage/recurrent_invoices.php:102
-#: sales/create_recurrent_invoices.php:132
+#: ../sales/create_recurrent_invoices.php:127
+msgid "Invoice date:"
+msgstr ""
+
+#: ../sales/create_recurrent_invoices.php:132
+#: ../sales/manage/recurrent_invoices.php:102
 msgid "Template No"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:115
-#: sales/manage/recurrent_invoices.php:102
-#: sales/create_recurrent_invoices.php:132
+#: ../sales/create_recurrent_invoices.php:132
+#: ../sales/manage/recurrent_invoices.php:102
 msgid "Begin"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:115
-#: sales/manage/recurrent_invoices.php:102
-#: sales/create_recurrent_invoices.php:132
+#: ../sales/create_recurrent_invoices.php:132
+#: ../sales/manage/recurrent_invoices.php:102
 msgid "End"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:115
-#: sales/manage/recurrent_invoices.php:102
-#: sales/manage/recurrent_invoices.php:185
-#: sales/create_recurrent_invoices.php:132
+#: ../sales/create_recurrent_invoices.php:132
+#: ../sales/manage/recurrent_invoices.php:102
+#: ../sales/manage/recurrent_invoices.php:185
 msgid "Last Created"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:156
-#: sales/create_recurrent_invoices.php:173
+#: ../sales/create_recurrent_invoices.php:173
 msgid "Create Invoices"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:164
-#: sales/create_recurrent_invoices.php:181
+#: ../sales/create_recurrent_invoices.php:181
 msgid "Marked items are due."
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:166
-#: sales/create_recurrent_invoices.php:183
+#: ../sales/create_recurrent_invoices.php:183
 msgid "No recurrent invoices are due."
 msgstr ""
 
-#: sales/credit_note_entry.php:40
+#: ../sales/credit_note_entry.php:40
 #, php-format
 msgid "Modifying Customer Credit Note #%d"
 msgstr ""
 
-#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:661
-#: sales/sales_order_entry.php:665 sales/sales_order_entry.php:676
-#: sales/sales_order_entry.php.orig:675
+#: ../sales/credit_note_entry.php:51
+#: ../sales/sales_order_entry.php:692
 msgid ""
 "There are no customers, or there are no customers with branches. Please "
 "define customers and customer branches."
 msgstr ""
 
-#: sales/credit_note_entry.php:66
+#: ../sales/credit_note_entry.php:66
 #, php-format
 msgid "Credit Note # %d has been processed"
 msgstr ""
 
-#: sales/credit_note_entry.php:68
+#: ../sales/credit_note_entry.php:68
 msgid "&View this credit note"
 msgstr ""
 
-#: sales/credit_note_entry.php:70
+#: ../sales/credit_note_entry.php:70
 msgid "&Print This Credit Invoice"
 msgstr ""
 
-#: sales/credit_note_entry.php:71
+#: ../sales/credit_note_entry.php:71
 msgid "&Email This Credit Invoice"
 msgstr ""
 
-#: sales/credit_note_entry.php:73 sales/customer_credit_invoice.php:60
-#: sales/customer_credit_invoice.php:77
+#: ../sales/credit_note_entry.php:73
+#: ../sales/customer_credit_invoice.php:60
+#: ../sales/customer_credit_invoice.php:77
 msgid "View the GL &Journal Entries for this Credit Note"
 msgstr ""
 
-#: sales/credit_note_entry.php:75
+#: ../sales/credit_note_entry.php:75
 msgid "Enter Another &Credit Note"
 msgstr ""
 
-#: sales/credit_note_entry.php:157 sales/credit_note_entry.php:153
+#: ../sales/credit_note_entry.php:153
 msgid "The entered date for the credit note is invalid."
 msgstr ""
 
-#: sales/credit_note_entry.php:174 sales/credit_note_entry.php:170
+#: ../sales/credit_note_entry.php:170
 msgid ""
 "For credit notes created to write off the stock, a general ledger account is "
 "required to be selected."
 msgstr ""
 
-#: sales/credit_note_entry.php:175 sales/credit_note_entry.php:171
+#: ../sales/credit_note_entry.php:171
 msgid ""
 "Please select an account to write the cost of the stock off to, then click "
 "on Process again."
 msgstr ""
 
-#: sales/credit_note_entry.php:195 sales/credit_note_entry.php:197
+#: ../sales/credit_note_entry.php:197
 msgid "The quantity must be greater than zero."
 msgstr ""
 
-#: sales/credit_note_entry.php:200 sales/credit_note_entry.php:202
+#: ../sales/credit_note_entry.php:202
 msgid "The entered price is negative or invalid."
 msgstr ""
 
-#: sales/credit_note_entry.php:205 sales/credit_note_entry.php:207
+#: ../sales/credit_note_entry.php:207
 msgid "The entered discount percent is negative, greater than 100 or invalid."
 msgstr ""
 
-#: sales/credit_note_entry.php:273 sales/credit_note_entry.php:275
+#: ../sales/credit_note_entry.php:275
 msgid "Credit Note Items"
 msgstr ""
 
-#: sales/credit_note_entry.php:283 sales/customer_credit_invoice.php:384
-#: sales/credit_note_entry.php:285 sales/customer_credit_invoice.php:382
+#: ../sales/credit_note_entry.php:285
+#: ../sales/customer_credit_invoice.php:382
 msgid "Process Credit Note"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:38
+#: ../sales/customer_credit_invoice.php:38
 #, php-format
 msgid "Modifying Credit Invoice # %d."
 msgstr ""
 
-#: sales/customer_credit_invoice.php:42
+#: ../sales/customer_credit_invoice.php:42
 msgid "Credit all or part of an Invoice"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:53
+#: ../sales/customer_credit_invoice.php:53
 msgid "Credit Note has been processed"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:55 sales/customer_credit_invoice.php:72
+#: ../sales/customer_credit_invoice.php:55
+#: ../sales/customer_credit_invoice.php:72
 msgid "&View This Credit Note"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:57 sales/customer_credit_invoice.php:74
+#: ../sales/customer_credit_invoice.php:57
+#: ../sales/customer_credit_invoice.php:74
 msgid "&Print This Credit Note"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:58 sales/customer_credit_invoice.php:75
+#: ../sales/customer_credit_invoice.php:58
+#: ../sales/customer_credit_invoice.php:75
 msgid "&Email This Credit Note"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:70
+#: ../sales/customer_credit_invoice.php:70
 msgid "Credit Note has been updated"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:114 sales/customer_credit_invoice.php:109
+#: ../sales/customer_credit_invoice.php:109
 msgid "The entered shipping cost is invalid or less than zero."
 msgstr ""
 
-#: sales/customer_credit_invoice.php:119 sales/customer_credit_invoice.php:141
-#: sales/customer_credit_invoice.php:114 sales/customer_credit_invoice.php:136
+#: ../sales/customer_credit_invoice.php:114
+#: ../sales/customer_credit_invoice.php:136
 msgid ""
 "Selected quantity cannot be less than zero nor more than quantity not "
 "credited yet."
 msgstr ""
 
-#: sales/customer_credit_invoice.php:139 sales/customer_credit_invoice.php:134
+#: ../sales/customer_credit_invoice.php:134
 msgid ""
 "This page can only be opened if an invoice has been selected for crediting."
 msgstr ""
 
-#: sales/customer_credit_invoice.php:251 sales/customer_credit_invoice.php:249
+#: ../sales/customer_credit_invoice.php:249
 msgid "Crediting Invoice"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:272 sales/customer_credit_invoice.php:270
+#: ../sales/customer_credit_invoice.php:270
 msgid "Credit Note Date"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:282 sales/customer_credit_invoice.php:280
+#: ../sales/customer_credit_invoice.php:280
 msgid "Invoiced Quantity"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:283 sales/customer_credit_invoice.php:281
+#: ../sales/customer_credit_invoice.php:281
 msgid "Credit Quantity"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:317 sales/customer_credit_invoice.php:315
+#: ../sales/customer_credit_invoice.php:315
 msgid "Credit Shipping Cost"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:350
-#: sales/includes/ui/sales_credit_ui.inc:323
-#: sales/customer_credit_invoice.php:348
+#: ../sales/customer_credit_invoice.php:348
+#: ../sales/includes/ui/sales_credit_ui.inc:323
 msgid "Credit Note Type"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:358
-#: sales/includes/ui/sales_credit_ui.inc:331
-#: sales/customer_credit_invoice.php:356
+#: ../sales/customer_credit_invoice.php:356
+#: ../sales/includes/ui/sales_credit_ui.inc:331
 msgid "Items Returned to Location"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:363
-#: sales/includes/ui/sales_credit_ui.inc:336
-#: sales/customer_credit_invoice.php:361
+#: ../sales/customer_credit_invoice.php:361
+#: ../sales/includes/ui/sales_credit_ui.inc:336
 msgid "Write off the cost of the items to"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:382 sales/customer_credit_invoice.php:380
+#: ../sales/customer_credit_invoice.php:380
 msgid "Update credit value for quantities entered"
 msgstr ""
 
-#: sales/customer_delivery.php:37
+#: ../sales/customer_delivery.php:37
+#: ../sales/customer_delivery.php.orig:37
 #, php-format
 msgid "Modifying Delivery Note # %d."
 msgstr ""
 
-#: sales/customer_delivery.php:41
+#: ../sales/customer_delivery.php:41
+#: ../sales/customer_delivery.php.orig:41
 msgid "Deliver Items for a Sales Order"
 msgstr ""
 
-#: sales/customer_delivery.php:50 sales/sales_order_entry.php:175
-#: sales/sales_order_entry.php:183 sales/sales_order_entry.php.orig:183
+#: ../sales/customer_delivery.php:50
+#: ../sales/customer_delivery.php.orig:50
+#: ../sales/sales_order_entry.php:189
 #, php-format
 msgid "Delivery # %d has been entered."
 msgstr ""
 
-#: sales/customer_delivery.php:52 sales/sales_order_entry.php:177
-#: sales/sales_order_entry.php:185 sales/sales_order_entry.php.orig:185
+#: ../sales/customer_delivery.php:52
+#: ../sales/customer_delivery.php.orig:52
+#: ../sales/sales_order_entry.php:191
 msgid "&View This Delivery"
 msgstr ""
 
-#: sales/customer_delivery.php:54 sales/customer_delivery.php:75
-#: sales/sales_order_entry.php:179 sales/sales_order_entry.php:187
-#: sales/sales_order_entry.php.orig:187
+#: ../sales/customer_delivery.php:54
+#: ../sales/customer_delivery.php:76
+#: ../sales/customer_delivery.php.orig:54
+#: ../sales/customer_delivery.php.orig:76
+#: ../sales/sales_order_entry.php:193
 msgid "&Print Delivery Note"
 msgstr ""
 
-#: sales/customer_delivery.php:55 sales/customer_delivery.php:76
-#: sales/sales_order_entry.php:180 sales/sales_order_entry.php:188
-#: sales/sales_order_entry.php.orig:188
+#: ../sales/customer_delivery.php:55
+#: ../sales/customer_delivery.php:77
+#: ../sales/customer_delivery.php.orig:55
+#: ../sales/customer_delivery.php.orig:77
+#: ../sales/sales_order_entry.php:194
 msgid "&Email Delivery Note"
 msgstr ""
 
-#: sales/customer_delivery.php:56 sales/customer_delivery.php:77
-#: sales/sales_order_entry.php:181 sales/sales_order_entry.php:189
-#: sales/sales_order_entry.php.orig:189
+#: ../sales/customer_delivery.php:56
+#: ../sales/customer_delivery.php:78
+#: ../sales/customer_delivery.php.orig:56
+#: ../sales/customer_delivery.php.orig:78
+#: ../sales/sales_order_entry.php:195
 msgid "P&rint as Packing Slip"
 msgstr ""
 
-#: sales/customer_delivery.php:57 sales/customer_delivery.php:78
-#: sales/sales_order_entry.php:182 sales/sales_order_entry.php:190
-#: sales/sales_order_entry.php.orig:190
+#: ../sales/customer_delivery.php:57
+#: ../sales/customer_delivery.php:79
+#: ../sales/customer_delivery.php.orig:57
+#: ../sales/customer_delivery.php.orig:79
+#: ../sales/sales_order_entry.php:196
 msgid "E&mail as Packing Slip"
 msgstr ""
 
-#: sales/customer_delivery.php:59 sales/sales_order_entry.php:185
-#: sales/sales_order_entry.php:193 sales/sales_order_entry.php.orig:193
+#: ../sales/customer_delivery.php:59
+#: ../sales/customer_delivery.php.orig:59
+#: ../sales/sales_order_entry.php:199
 msgid "View the GL Journal Entries for this Dispatch"
 msgstr ""
 
-#: sales/customer_delivery.php:61
+#: ../sales/customer_delivery.php:62
+#: ../sales/customer_delivery.php.orig:62
 msgid "Invoice This Delivery"
 msgstr ""
 
-#: sales/customer_delivery.php:63
+#: ../sales/customer_delivery.php:64
+#: ../sales/customer_delivery.php.orig:64
 msgid "Select Another Order For Dispatch"
 msgstr ""
 
-#: sales/customer_delivery.php:71
+#: ../sales/customer_delivery.php:72
+#: ../sales/customer_delivery.php.orig:72
 #, php-format
 msgid "Delivery Note # %d has been updated."
 msgstr ""
 
-#: sales/customer_delivery.php:73
+#: ../sales/customer_delivery.php:74
+#: ../sales/customer_delivery.php.orig:74
 msgid "View this delivery"
 msgstr ""
 
-#: sales/customer_delivery.php:80
+#: ../sales/customer_delivery.php:82
+#: ../sales/customer_delivery.php.orig:82
 msgid "Confirm Delivery and Invoice"
 msgstr ""
 
-#: sales/customer_delivery.php:82
+#: ../sales/customer_delivery.php:84
+#: ../sales/customer_delivery.php.orig:84
 msgid "Select A Different Delivery"
 msgstr ""
 
-#: sales/customer_delivery.php:94
-msgid "Select a different sales order to delivery"
+#: ../sales/customer_delivery.php:94
+#: ../sales/customer_delivery.php.orig:94
+#: ../sales/customer_invoice.php:152
+msgid ""
+"You have to set Deferred Income Account in GL Setup to entry prepayment "
+"invoices."
 msgstr ""
 
-#: sales/customer_delivery.php:95
+#: ../sales/customer_delivery.php:97
+#: ../sales/customer_delivery.php.orig:97
 msgid "This order has no items. There is nothing to delivery."
 msgstr ""
 
-#: sales/customer_delivery.php:110
+#: ../sales/customer_delivery.php:100
+#: ../sales/customer_delivery.php:105
+#: ../sales/customer_delivery.php.orig:100
+#: ../sales/customer_delivery.php.orig:105
+msgid "Select a different sales order to delivery"
+msgstr ""
+
+#: ../sales/customer_delivery.php:103
+#: ../sales/customer_delivery.php.orig:103
+msgid ""
+"This prepayment order is not yet ready for delivery due to insufficient "
+"amount received."
+msgstr ""
+
+#: ../sales/customer_delivery.php:122
+#: ../sales/customer_delivery.php.orig:122
 msgid "Select a different delivery"
 msgstr ""
 
-#: sales/customer_delivery.php:111
+#: ../sales/customer_delivery.php:123
+#: ../sales/customer_delivery.php.orig:123
 msgid "This delivery has all items invoiced. There is nothing to modify."
 msgstr ""
 
-#: sales/customer_delivery.php:121
+#: ../sales/customer_delivery.php:133
+#: ../sales/customer_delivery.php.orig:133
 msgid ""
 "This page can only be opened if an order or delivery note has been selected. "
 "Please select it first."
 msgstr ""
 
-#: sales/customer_delivery.php:123
+#: ../sales/customer_delivery.php:135
+#: ../sales/customer_delivery.php.orig:135
 msgid "Select a Sales Order to Delivery"
 msgstr ""
 
-#: sales/customer_delivery.php:132
+#: ../sales/customer_delivery.php:144
+#: ../sales/customer_delivery.php.orig:144
 msgid ""
 "Selected quantity cannot be less than quantity invoiced nor more than "
 "quantity\tnot dispatched on sales order."
 msgstr ""
 
-#: sales/customer_delivery.php:135
+#: ../sales/customer_delivery.php:147
+#: ../sales/customer_delivery.php.orig:147
 msgid "Freight cost cannot be less than zero"
 msgstr ""
 
-#: sales/customer_delivery.php:147
+#: ../sales/customer_delivery.php:159
+#: ../sales/customer_delivery.php.orig:159
 msgid "The entered date of delivery is invalid."
 msgstr ""
 
-#: sales/customer_delivery.php:153
-msgid "The entered date of delivery is not in fiscal year."
-msgstr ""
-
-#: sales/customer_delivery.php:159
+#: ../sales/customer_delivery.php:171
+#: ../sales/customer_delivery.php.orig:171
 msgid "The entered dead-line for invoice is invalid."
 msgstr ""
 
-#: sales/customer_delivery.php:182 sales/customer_invoice.php:297
-#: sales/customer_delivery.php:176 sales/customer_invoice.php:291
+#: ../sales/customer_delivery.php:188
+#: ../sales/customer_delivery.php.orig:194
+#: ../sales/customer_invoice.php:345
 msgid "The entered shipping value is not numeric."
 msgstr ""
 
-#: sales/customer_delivery.php:188 sales/customer_delivery.php:182
+#: ../sales/customer_delivery.php:194
+#: ../sales/customer_delivery.php.orig:200
 msgid "There are no item quantities on this delivery note."
 msgstr ""
 
-#: sales/customer_delivery.php:291 sales/sales_order_entry.php:490
-#: sales/includes/ui/sales_order_ui.inc:244 sales/customer_delivery.php:285
-#: sales/sales_order_entry.php:494 sales/includes/ui/sales_order_ui.inc:248
-#: sales/sales_order_entry.php:505 sales/sales_order_entry.php.orig:504
+#: ../sales/customer_delivery.php:297
+#: ../sales/customer_delivery.php.orig:303
+#: ../sales/sales_order_entry.php:521
+#: ../sales/includes/ui/sales_order_ui.inc.orig:244
 msgid ""
 "The delivery cannot be processed because there is an insufficient quantity "
 "for item:"
 msgstr ""
 
-#: sales/customer_delivery.php:353
+#: ../sales/customer_delivery.php.orig:366
 msgid "For Sales Order"
 msgstr ""
 
-#: sales/customer_delivery.php:362
+#: ../sales/customer_delivery.php.orig:375
 msgid "Delivery From"
 msgstr ""
 
-#: sales/customer_delivery.php:411
+#: ../sales/customer_delivery.php.orig:424
 msgid "Invoice Dead-line"
 msgstr ""
 
-#: sales/customer_delivery.php:421 sales/customer_invoice.php:457
-#: sales/includes/ui/sales_order_ui.inc:82
-#: sales/includes/ui/sales_order_ui.inc:368 sales/customer_invoice.php:459
-#: sales/includes/ui/sales_order_ui.inc:84
-#: sales/includes/ui/sales_order_ui.inc:372
+#: ../sales/customer_delivery.php.orig:434
+#: ../sales/customer_invoice.php:530
+#: ../sales/includes/ui/sales_order_ui.inc:84
+#: ../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 ""
 
-#: sales/customer_delivery.php:426
+#: ../sales/customer_delivery.php.orig:439
 msgid "Delivery Items"
 msgstr ""
 
-#: sales/customer_delivery.php:432
+#: ../sales/customer_delivery.php.orig:445
 msgid "Max. delivery"
 msgstr ""
 
-#: sales/customer_delivery.php:432 sales/customer_invoice.php:467
-#: sales/includes/ui/sales_order_ui.inc:141 sales/customer_invoice.php:469
-#: sales/includes/ui/sales_order_ui.inc:145
+#: ../sales/customer_delivery.php.orig:445
+#: ../sales/customer_invoice.php:544
+#: ../sales/includes/ui/sales_order_ui.inc.orig:141
 msgid "Delivered"
 msgstr ""
 
-#: sales/customer_delivery.php:493 sales/customer_invoice.php:552
-#: sales/customer_invoice.php:554
+#: ../sales/customer_delivery.php.orig:506
+#: ../sales/customer_invoice.php:633
 msgid "Shipping Cost"
 msgstr ""
 
-#: sales/customer_delivery.php:513 sales/includes/ui/sales_order_ui.inc:242
-#: sales/includes/ui/sales_order_ui.inc:246
+#: ../sales/customer_delivery.php.orig:526
+#: ../sales/includes/ui/sales_order_ui.inc.orig:242
 msgid ""
 "Marked items have insufficient quantities in stock as on day of delivery."
 msgstr ""
 
-#: sales/customer_delivery.php:517
+#: ../sales/customer_delivery.php.orig:530
 msgid "Action For Balance"
 msgstr ""
 
-#: sales/customer_delivery.php:524 sales/customer_invoice.php:581
-#: sales/customer_invoice.php:583
+#: ../sales/customer_delivery.php.orig:537
+#: ../sales/customer_invoice.php:685
 msgid "Refresh document page"
 msgstr ""
 
-#: sales/customer_delivery.php:525
+#: ../sales/customer_delivery.php.orig:538
 msgid "Process Dispatch"
 msgstr ""
 
-#: sales/customer_delivery.php:526 sales/customer_invoice.php:583
-#: sales/sales_order_entry.php:709 sales/customer_invoice.php:585
-#: sales/sales_order_entry.php:713 sales/sales_order_entry.php:724
-#: sales/sales_order_entry.php.orig:723
+#: ../sales/customer_delivery.php.orig:539
+#: ../sales/customer_invoice.php:687
+#: ../sales/sales_order_entry.php:739
 msgid "Check entered data and save document"
 msgstr ""
 
-#: sales/customer_invoice.php:37
+#: ../sales/customer_invoice.php:38
 #, php-format
 msgid "Modifying Sales Invoice # %d."
 msgstr ""
 
-#: sales/customer_invoice.php:40
+#: ../sales/customer_invoice.php:41
 msgid "Issue an Invoice for Delivery Note"
 msgstr ""
 
-#: sales/customer_invoice.php:42
+#: ../sales/customer_invoice.php:43
 msgid "Issue Batch Invoice for Delivery Notes"
 msgstr ""
 
-#: sales/customer_invoice.php:55
+#: ../sales/customer_invoice.php:45
+msgid "Prepayment or Final Invoice Entry"
+msgstr ""
+
+#: ../sales/customer_invoice.php:58
 msgid "Selected deliveries has been processed"
 msgstr ""
 
-#: sales/customer_invoice.php:57 sales/customer_invoice.php:77
-#: sales/sales_order_entry.php:204 sales/sales_order_entry.php:212
-#: sales/sales_order_entry.php.orig:212
+#: ../sales/customer_invoice.php:60
+#: ../sales/customer_invoice.php:80
+#: ../sales/sales_order_entry.php:218
 msgid "&View This Invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:59 sales/customer_invoice.php:79
+#: ../sales/customer_invoice.php:62
+#: ../sales/customer_invoice.php:82
 msgid "&Print This Invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:60 sales/customer_invoice.php:80
+#: ../sales/customer_invoice.php:63
+#: ../sales/customer_invoice.php:83
 msgid "&Email This Invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:62 sales/sales_order_entry.php:217
-#: sales/sales_order_entry.php:225 sales/sales_order_entry.php.orig:225
+#: ../sales/customer_invoice.php:65
+#: ../sales/sales_order_entry.php:231
 msgid "View the GL &Journal Entries for this Invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:64
+#: ../sales/customer_invoice.php:67
 msgid "Select Another &Delivery For Invoicing"
 msgstr ""
 
-#: sales/customer_invoice.php:75
+#: ../sales/customer_invoice.php:78
 #, php-format
 msgid "Sales Invoice # %d has been updated."
 msgstr ""
 
-#: sales/customer_invoice.php:82
+#: ../sales/customer_invoice.php:85
 msgid "Select Another &Invoice to Modify"
 msgstr ""
 
-#: sales/customer_invoice.php:121
+#: ../sales/customer_invoice.php:124
 msgid "Select a different delivery to invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:122
+#: ../sales/customer_invoice.php:125
 msgid ""
 "There are no delivered items with a quantity left to invoice. There is "
 "nothing left to invoice."
 msgstr ""
 
-#: sales/customer_invoice.php:131
+#: ../sales/customer_invoice.php: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 ""
 
-#: sales/customer_invoice.php:140
+#: ../sales/customer_invoice.php:160
 msgid ""
-"All quantities on this invoice has been credited. There is nothing to modify "
-"on this invoice"
+"Please select correct Sales Order Prepayment to be invoiced and try again."
 msgstr ""
 
-#: sales/customer_invoice.php:146
+#: ../sales/customer_invoice.php:191
 msgid ""
 "This page can only be opened after delivery selection. Please select "
 "delivery to invoicing first."
 msgstr ""
 
-#: sales/customer_invoice.php:148
+#: ../sales/customer_invoice.php:193
 msgid "Select Delivery to Invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:153 sales/customer_invoice.php:308
-#: sales/customer_invoice.php:302
+#: ../sales/customer_invoice.php:198
+#: ../sales/customer_invoice.php:356
 msgid ""
 "Selected quantity cannot be less than quantity credited nor more than "
 "quantity not invoiced yet."
 msgstr ""
 
-#: sales/customer_invoice.php:261
+#: ../sales/customer_invoice.php:312
 msgid "The entered invoice date is invalid."
 msgstr ""
 
-#: sales/customer_invoice.php:267
-msgid "The entered invoice date is not in fiscal year."
-msgstr ""
-
-#: sales/customer_invoice.php:273
+#: ../sales/customer_invoice.php:325
 msgid "The entered invoice due date is invalid."
 msgstr ""
 
-#: sales/customer_invoice.php:303 sales/customer_invoice.php:297
+#: ../sales/customer_invoice.php:351
 msgid "There are no item quantities on this invoice."
 msgstr ""
 
-#: sales/customer_invoice.php:383 sales/customer_invoice.php:385
+#: ../sales/customer_invoice.php:361
+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:451
 msgid "Payment terms:"
 msgstr ""
 
-#: sales/customer_invoice.php:386 sales/includes/ui/sales_order_ui.inc:405
-#: sales/includes/ui/sales_order_ui.inc:409 sales/customer_invoice.php:388
-#: sales/includes/ui/sales_order_ui.inc:413
-msgid "Payment:"
+#: ../sales/customer_invoice.php:536
+#: ../sales/sales_order_entry.php:715
+msgid "Sales Order Items"
 msgstr ""
 
-#: sales/customer_invoice.php:463 sales/customer_invoice.php:465
+#: ../sales/customer_invoice.php:536
 msgid "Invoice Items"
 msgstr ""
 
-#: sales/customer_invoice.php:468 sales/customer_invoice.php:470
+#: ../sales/customer_invoice.php:545
 msgid "This Invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:476 sales/customer_invoice.php:478
+#: ../sales/customer_invoice.php:552
 msgid "Credited"
 msgstr ""
 
-#: sales/customer_invoice.php:570 sales/customer_invoice.php:572
+#: ../sales/customer_invoice.php:654
 msgid "Invoice Total"
 msgstr ""
 
-#: sales/customer_payments.php:33 sales/customer_payments.php.orig:33
+#: ../sales/customer_invoice.php:663
+msgid "Sales order:"
+msgstr ""
+
+#: ../sales/customer_invoice.php:675
+msgid "Payments received:"
+msgstr ""
+
+#: ../sales/customer_invoice.php:676
+msgid "Invoiced here:"
+msgstr ""
+
+#: ../sales/customer_invoice.php:677
+msgid "Left to be invoiced:"
+msgstr ""
+
+#: ../sales/customer_payments.php:33
 msgid "Customer Payment Entry"
 msgstr ""
 
-#: sales/customer_payments.php:37 sales/customer_payments.php.orig:37
+#: ../sales/customer_payments.php:37
 msgid "There are no customers defined in the system."
 msgstr ""
 
-#: sales/customer_payments.php:68 sales/customer_payments.php.orig:68
+#: ../sales/customer_payments.php:68
 msgid "Invalid sales invoice number."
 msgstr ""
 
-#: sales/customer_payments.php:92 sales/customer_payments.php.orig:92
+#: ../sales/customer_payments.php:92
 msgid "The customer payment has been successfully entered."
 msgstr ""
 
-#: sales/customer_payments.php:94 sales/customer_payments.php:109
-#: sales/customer_payments.php.orig:94 sales/customer_payments.php.orig:109
+#: ../sales/customer_payments.php:94
+#: ../sales/customer_payments.php:109
 msgid "&Print This Receipt"
 msgstr ""
 
-#: sales/customer_payments.php:96 sales/customer_payments.php:111
-#: sales/customer_payments.php.orig:96 sales/customer_payments.php.orig:111
+#: ../sales/customer_payments.php:96
+#: ../sales/customer_payments.php:111
 msgid "&View the GL Journal Entries for this Customer Payment"
 msgstr ""
 
-#: sales/customer_payments.php:100 sales/customer_payments.php:115
-#: sales/customer_payments.php.orig:100 sales/customer_payments.php.orig:115
+#: ../sales/customer_payments.php:100
+#: ../sales/customer_payments.php:115
 msgid "Enter Another &Customer Payment"
 msgstr ""
 
-#: sales/customer_payments.php:107 sales/customer_payments.php.orig:107
+#: ../sales/customer_payments.php:107
 msgid "The customer payment has been successfully updated."
 msgstr ""
 
-#: sales/customer_payments.php:128 sales/sales_order_entry.php:327
-#: sales/customer_payments.php.orig:128 sales/sales_order_entry.php:336
-#: sales/sales_order_entry.php.orig:335
+#: ../sales/customer_payments.php:128
+#: ../sales/sales_order_entry.php:346
 msgid "There is no customer selected."
 msgstr ""
 
-#: sales/customer_payments.php:135 sales/sales_order_entry.php:334
-#: sales/customer_payments.php.orig:135 sales/sales_order_entry.php:343
-#: sales/sales_order_entry.php.orig:342
+#: ../sales/customer_payments.php:135
+#: ../sales/sales_order_entry.php:353
 msgid "This customer has no branch defined."
 msgstr ""
 
-#: sales/customer_payments.php:141 sales/customer_payments.php.orig:141
+#: ../sales/customer_payments.php:141
 msgid "The entered date is invalid. Please enter a valid date for the payment."
 msgstr ""
 
-#: sales/customer_payments.php:171 sales/customer_payments.php:177
-#: sales/customer_payments.php.orig:171 sales/customer_payments.php.orig:177
+#: ../sales/customer_payments.php:171
+#: ../sales/customer_payments.php:177
 msgid "The entered amount is invalid or negative and cannot be processed."
 msgstr ""
 
-#: sales/customer_payments.php:203 sales/customer_payments.php.orig:203
+#: ../sales/customer_payments.php:203
 msgid "The entered discount is not a valid number."
 msgstr ""
 
-#: sales/customer_payments.php:210 sales/customer_payments.php.orig:210
+#: ../sales/customer_payments.php:210
 msgid ""
 "The balance of the amount and discout is zero or negative. Please enter "
 "valid amounts."
 msgstr ""
 
-#: sales/customer_payments.php:341 sales/customer_payments.php:343
-#: sales/customer_payments.php:338 sales/customer_payments.php:340
-#: sales/customer_payments.php.orig:343 sales/customer_payments.php.orig:345
+#: ../sales/customer_payments.php:338
+#: ../sales/customer_payments.php:340
 msgid "From Customer:"
 msgstr ""
 
-#: sales/customer_payments.php:378 sales/customer_payments.php:381
-#: sales/customer_payments.php.orig:380
+#: ../sales/customer_payments.php:381
 msgid "Into Bank Account:"
 msgstr ""
 
-#: sales/customer_payments.php:384 sales/customer_payments.php:387
-#: sales/customer_payments.php.orig:386
+#: ../sales/customer_payments.php:386
 msgid "Date of Deposit:"
 msgstr ""
 
-#: sales/customer_payments.php:406 sales/customer_payments.php:409
-#: sales/customer_payments.php.orig:408
+#: ../sales/customer_payments.php:408
 msgid "Customer prompt payment discount :"
 msgstr ""
 
-#: sales/customer_payments.php:415 sales/customer_payments.php:418
-#: sales/customer_payments.php.orig:417
+#: ../sales/customer_payments.php:417
 msgid "Amount and discount are in customer's currency."
 msgstr ""
 
-#: sales/customer_payments.php:420 sales/customer_payments.php:423
-#: sales/customer_payments.php.orig:422
+#: ../sales/customer_payments.php:422
 msgid "Update Payment"
 msgstr ""
 
-#: sales/customer_payments.php:422 sales/customer_payments.php:425
-#: sales/customer_payments.php.orig:424
+#: ../sales/customer_payments.php:424
 msgid "Add Payment"
 msgstr ""
 
-#: sales/sales_order_entry.php:56 sales/sales_order_entry.php:64
-#: sales/sales_order_entry.php.orig:64
+#: ../sales/sales_order_entry.php:64
 msgid "Direct Sales Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:61 sales/sales_order_entry.php:69
-#: sales/sales_order_entry.php.orig:69
+#: ../sales/sales_order_entry.php:69
 msgid "Direct Sales Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:67 sales/sales_order_entry.php:75
-#: sales/sales_order_entry.php.orig:75
+#: ../sales/sales_order_entry.php:75
 #, php-format
 msgid "Modifying Sales Order # %d"
 msgstr ""
 
-#: sales/sales_order_entry.php:73 sales/sales_order_entry.php:81
-#: sales/sales_order_entry.php.orig:81
+#: ../sales/sales_order_entry.php:81
 #, php-format
 msgid "Modifying Sales Quotation # %d"
 msgstr ""
 
-#: sales/sales_order_entry.php:78 sales/sales_order_entry.php:86
-#: sales/sales_order_entry.php.orig:86
+#: ../sales/sales_order_entry.php:86
 msgid "New Sales Order Entry"
 msgstr ""
 
-#: sales/sales_order_entry.php:82 sales/sales_order_entry.php:90
-#: sales/sales_order_entry.php.orig:90
+#: ../sales/sales_order_entry.php:90
 msgid "New Sales Quotation Entry"
 msgstr ""
 
-#: sales/sales_order_entry.php:85 sales/sales_order_entry.php:93
-#: sales/sales_order_entry.php.orig:93
+#: ../sales/sales_order_entry.php:93
 msgid "Sales Order Entry"
 msgstr ""
 
-#: sales/sales_order_entry.php:101 sales/sales_order_entry.php:109
-#: sales/sales_order_entry.php.orig:109
+#: ../sales/sales_order_entry.php:115
 #, php-format
 msgid "Order # %d has been entered."
 msgstr ""
 
-#: sales/sales_order_entry.php:103 sales/sales_order_entry.php:123
-#: sales/sales_order_entry.php:111 sales/sales_order_entry.php:131
-#: sales/sales_order_entry.php.orig:111 sales/sales_order_entry.php.orig:131
+#: ../sales/sales_order_entry.php:117
+#: ../sales/sales_order_entry.php:137
 msgid "&View This Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:109 sales/sales_order_entry.php:117
-#: sales/sales_order_entry.php.orig:117
+#: ../sales/sales_order_entry.php:123
 msgid "Make &Delivery Against This Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:114 sales/sales_order_entry.php:122
-#: sales/sales_order_entry.php.orig:122
+#: ../sales/sales_order_entry.php:128
 msgid "Enter a &New Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:121 sales/sales_order_entry.php:129
-#: sales/sales_order_entry.php.orig:129
+#: ../sales/sales_order_entry.php:135
 #, php-format
 msgid "Order # %d has been updated."
 msgstr ""
 
-#: sales/sales_order_entry.php:129 sales/sales_order_entry.php:137
-#: sales/sales_order_entry.php.orig:137
+#: ../sales/sales_order_entry.php:143
 msgid "Confirm Order Quantities and Make &Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:132 sales/sales_order_entry.php:140
-#: sales/sales_order_entry.php.orig:140
+#: ../sales/sales_order_entry.php:146
 msgid "Select A Different &Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:139 sales/sales_order_entry.php:147
-#: sales/sales_order_entry.php.orig:147
+#: ../sales/sales_order_entry.php:153
 #, php-format
 msgid "Quotation # %d has been entered."
 msgstr ""
 
-#: sales/sales_order_entry.php:141 sales/sales_order_entry.php:159
-#: sales/sales_order_entry.php:149 sales/sales_order_entry.php:167
-#: sales/sales_order_entry.php.orig:149 sales/sales_order_entry.php.orig:167
+#: ../sales/sales_order_entry.php:155
+#: ../sales/sales_order_entry.php:173
 msgid "&View This Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:143 sales/sales_order_entry.php:161
-#: sales/sales_order_entry.php:151 sales/sales_order_entry.php:169
-#: sales/sales_order_entry.php.orig:151 sales/sales_order_entry.php.orig:169
+#: ../sales/sales_order_entry.php:157
+#: ../sales/sales_order_entry.php:175
 msgid "&Print This Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:144 sales/sales_order_entry.php:162
-#: sales/sales_order_entry.php:152 sales/sales_order_entry.php:170
-#: sales/sales_order_entry.php.orig:152 sales/sales_order_entry.php.orig:170
+#: ../sales/sales_order_entry.php:158
+#: ../sales/sales_order_entry.php:176
 msgid "&Email This Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:147 sales/sales_order_entry.php:165
-#: sales/sales_order_entry.php:155 sales/sales_order_entry.php:173
-#: sales/sales_order_entry.php.orig:155 sales/sales_order_entry.php.orig:173
+#: ../sales/sales_order_entry.php:161
+#: ../sales/sales_order_entry.php:179
 msgid "Make &Sales Order Against This Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:150 sales/sales_order_entry.php:158
-#: sales/sales_order_entry.php.orig:158
+#: ../sales/sales_order_entry.php:164
 msgid "Enter a New &Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:157 sales/sales_order_entry.php:165
-#: sales/sales_order_entry.php.orig:165
+#: ../sales/sales_order_entry.php:171
 #, php-format
 msgid "Quotation # %d has been updated."
 msgstr ""
 
-#: sales/sales_order_entry.php:168 sales/sales_order_entry.php:176
-#: sales/sales_order_entry.php.orig:176
+#: ../sales/sales_order_entry.php:182
 msgid "Select A Different &Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:187 sales/sales_order_entry.php:195
-#: sales/sales_order_entry.php.orig:195
+#: ../sales/sales_order_entry.php:201
 msgid "Make &Invoice Against This Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:191 sales/sales_order_entry.php:199
-#: sales/sales_order_entry.php.orig:199
+#: ../sales/sales_order_entry.php:205
 msgid "Enter a New Template &Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:194 sales/sales_order_entry.php:202
-#: sales/sales_order_entry.php.orig:202
+#: ../sales/sales_order_entry.php:208
 msgid "Enter a &New Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:202 sales/sales_order_entry.php:210
-#: sales/sales_order_entry.php.orig:210
+#: ../sales/sales_order_entry.php:216
 #, php-format
 msgid "Invoice # %d has been entered."
 msgstr ""
 
-#: sales/sales_order_entry.php:206 sales/sales_order_entry.php:214
-#: sales/sales_order_entry.php.orig:214
+#: ../sales/sales_order_entry.php:220
 msgid "&Print Sales Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:207 sales/sales_order_entry.php:215
-#: sales/sales_order_entry.php.orig:215
+#: ../sales/sales_order_entry.php:221
 msgid "&Email Sales Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:215 sales/sales_order_entry.php:223
-#: sales/sales_order_entry.php.orig:223
+#: ../sales/sales_order_entry.php:229
 msgid "Print &Receipt"
 msgstr ""
 
-#: sales/sales_order_entry.php:220 sales/sales_order_entry.php:228
-#: sales/sales_order_entry.php.orig:228
+#: ../sales/sales_order_entry.php:234
 msgid "Enter a &New Template Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:223 sales/sales_order_entry.php:231
-#: sales/sales_order_entry.php.orig:231
+#: ../sales/sales_order_entry.php:237
 msgid "Enter a &New Direct Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:356 sales/sales_order_entry.php:365
-#: sales/sales_order_entry.php.orig:364
+#: ../sales/sales_order_entry.php:376
+msgid "Pre-payment required have to be positive and less than total amount."
+msgstr ""
+
+#: ../sales/sales_order_entry.php:381
 msgid ""
 "You must enter the person or company to whom delivery should be made to."
 msgstr ""
 
-#: sales/sales_order_entry.php:363 sales/sales_order_entry.php:372
-#: sales/sales_order_entry.php.orig:371
+#: ../sales/sales_order_entry.php:388
 msgid ""
 "You should enter the street address in the box provided. Orders cannot be "
 "accepted without a valid street address."
 msgstr ""
 
-#: sales/sales_order_entry.php:372 sales/sales_order_entry.php:381
-#: sales/sales_order_entry.php.orig:380
+#: ../sales/sales_order_entry.php:397
 msgid "The shipping cost entered is expected to be numeric."
 msgstr ""
 
-#: sales/sales_order_entry.php:378 sales/sales_order_entry.php:387
-#: sales/sales_order_entry.php.orig:386
+#: ../sales/sales_order_entry.php:403
 msgid "The Valid date is invalid."
 msgstr ""
 
-#: sales/sales_order_entry.php:380 sales/sales_order_entry.php:389
-#: sales/sales_order_entry.php.orig:388
+#: ../sales/sales_order_entry.php:405
 msgid "The delivery date is invalid."
 msgstr ""
 
-#: sales/sales_order_entry.php:387 sales/sales_order_entry.php:396
-#: sales/sales_order_entry.php.orig:395
+#: ../sales/sales_order_entry.php:412
 msgid "The requested valid date is before the date of the quotation."
 msgstr ""
 
-#: sales/sales_order_entry.php:389 sales/sales_order_entry.php:398
-#: sales/sales_order_entry.php.orig:397
+#: ../sales/sales_order_entry.php:414
 msgid "The requested delivery date is before the date of the order."
 msgstr ""
 
-#: sales/sales_order_entry.php:398 sales/sales_order_entry.php:407
-#: sales/sales_order_entry.php.orig:406
+#: ../sales/sales_order_entry.php:423
 msgid "You need to define a cash account for your Sales Point."
 msgstr ""
 
-#: sales/sales_order_entry.php:469 sales/sales_order_entry.php:473
-#: sales/sales_order_entry.php:484 sales/sales_order_entry.php.orig:483
+#: ../sales/sales_order_entry.php:500
 msgid ""
 "The item could not be updated because you are attempting to set the quantity "
 "ordered to less than 0, or the discount percent to more than 100."
 msgstr ""
 
-#: sales/sales_order_entry.php:473 sales/sales_order_entry.php:477
-#: sales/sales_order_entry.php:488 sales/sales_order_entry.php.orig:487
+#: ../sales/sales_order_entry.php:504
 msgid "Price for inventory item must be entered and can not be less than 0"
 msgstr ""
 
-#: sales/sales_order_entry.php:480 sales/sales_order_entry.php:484
-#: sales/sales_order_entry.php:495 sales/sales_order_entry.php.orig:494
+#: ../sales/sales_order_entry.php:511
 msgid ""
 "You attempting to make the quantity ordered a quantity less than has already "
 "been delivered. The quantity delivered cannot be modified retrospectively."
 msgstr ""
 
-#: sales/sales_order_entry.php:511 sales/sales_order_entry.php:515
-#: sales/sales_order_entry.php:526 sales/sales_order_entry.php.orig:525
+#: ../sales/sales_order_entry.php:542
 #, php-format
 msgid "Price %s is below Standard Cost %s"
 msgstr ""
 
-#: sales/sales_order_entry.php:536 sales/sales_order_entry.php:540
-#: sales/sales_order_entry.php:551 sales/sales_order_entry.php.orig:550
+#: ../sales/sales_order_entry.php:567
 msgid ""
 "This item cannot be deleted because some of it has already been delivered."
 msgstr ""
 
-#: sales/sales_order_entry.php:565 sales/sales_order_entry.php:569
-#: sales/sales_order_entry.php:580 sales/sales_order_entry.php.orig:579
+#: ../sales/sales_order_entry.php:596
 msgid "Direct delivery entry has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:566 sales/sales_order_entry.php:570
-#: sales/sales_order_entry.php:581 sales/sales_order_entry.php.orig:580
+#: ../sales/sales_order_entry.php:597
 msgid "Enter a New Sales Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:569 sales/sales_order_entry.php:573
-#: sales/sales_order_entry.php:584 sales/sales_order_entry.php.orig:583
+#: ../sales/sales_order_entry.php:600
 msgid "Direct invoice entry has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:570 sales/sales_order_entry.php:574
-#: sales/sales_order_entry.php:585 sales/sales_order_entry.php.orig:584
+#: ../sales/sales_order_entry.php:601
 msgid "Enter a New Sales Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:575 sales/sales_order_entry.php:579
-#: sales/sales_order_entry.php:590 sales/sales_order_entry.php.orig:589
+#: ../sales/sales_order_entry.php:606
 msgid ""
 "This order cannot be cancelled because some of it has already been invoiced "
 "or dispatched. However, the line item quantities may be modified."
 msgstr ""
 
-#: sales/sales_order_entry.php:580 sales/sales_order_entry.php:584
-#: sales/sales_order_entry.php:595 sales/sales_order_entry.php.orig:594
+#: ../sales/sales_order_entry.php:611
 msgid "This sales quotation has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:581 sales/sales_order_entry.php:585
-#: sales/sales_order_entry.php:596 sales/sales_order_entry.php.orig:595
+#: ../sales/sales_order_entry.php:612
 msgid "Enter a New Sales Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:585 sales/sales_order_entry.php:589
-#: sales/sales_order_entry.php:600 sales/sales_order_entry.php.orig:599
+#: ../sales/sales_order_entry.php:616
 msgid "This sales order has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:586 sales/sales_order_entry.php:590
-#: sales/sales_order_entry.php:601 sales/sales_order_entry.php.orig:600
+#: ../sales/sales_order_entry.php:617
 msgid "Enter a New Sales Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:665 sales/sales_order_entry.php:669
-#: sales/sales_order_entry.php:680 sales/sales_order_entry.php.orig:679
+#: ../sales/sales_order_entry.php:696
 msgid "Sales Invoice Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:666 sales/sales_order_entry.php:670
-#: sales/sales_order_entry.php:681 sales/sales_order_entry.php.orig:680
+#: ../sales/sales_order_entry.php:697
 msgid "Enter Delivery Details and Confirm Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:668 sales/sales_order_entry.php:672
-#: sales/sales_order_entry.php:683 sales/sales_order_entry.php.orig:682
+#: ../sales/sales_order_entry.php:699
 msgid "Place Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:671 sales/sales_order_entry.php:675
-#: sales/sales_order_entry.php:686 sales/sales_order_entry.php.orig:685
+#: ../sales/sales_order_entry.php:702
 msgid "Delivery Note Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:672 sales/sales_order_entry.php:676
-#: sales/sales_order_entry.php:687 sales/sales_order_entry.php.orig:686
+#: ../sales/sales_order_entry.php:703
 msgid "Enter Delivery Details and Confirm Dispatch"
 msgstr ""
 
-#: sales/sales_order_entry.php:673 sales/sales_order_entry.php:677
-#: sales/sales_order_entry.php:688 sales/sales_order_entry.php.orig:687
+#: ../sales/sales_order_entry.php:704
 msgid "Cancel Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:674 sales/sales_order_entry.php:678
-#: sales/sales_order_entry.php:689 sales/sales_order_entry.php.orig:688
+#: ../sales/sales_order_entry.php:705
 msgid "Place Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:676 sales/sales_order_entry.php:680
-#: sales/sales_order_entry.php:691 sales/sales_order_entry.php.orig:690
+#: ../sales/sales_order_entry.php:707
 msgid "Quotation Date:"
 msgstr ""
 
-#: sales/sales_order_entry.php:677 sales/sales_order_entry.php:681
-#: sales/sales_order_entry.php:692 sales/sales_order_entry.php.orig:691
+#: ../sales/sales_order_entry.php:708
 msgid "Sales Quotation Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:678 sales/sales_order_entry.php:682
-#: sales/sales_order_entry.php:693 sales/sales_order_entry.php.orig:692
+#: ../sales/sales_order_entry.php:709
 msgid "Enter Delivery Details and Confirm Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:679 sales/sales_order_entry.php:683
-#: sales/sales_order_entry.php:694 sales/sales_order_entry.php.orig:693
+#: ../sales/sales_order_entry.php:710
 msgid "Cancel Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:680 sales/sales_order_entry.php:684
-#: sales/sales_order_entry.php:695 sales/sales_order_entry.php.orig:694
+#: ../sales/sales_order_entry.php:711
 msgid "Place Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:681 sales/sales_order_entry.php:685
-#: sales/sales_order_entry.php:696 sales/sales_order_entry.php.orig:695
+#: ../sales/sales_order_entry.php:712
 msgid "Commit Quotations Changes"
 msgstr ""
 
-#: sales/sales_order_entry.php:684 sales/sales_order_entry.php:688
-#: sales/sales_order_entry.php:699 sales/sales_order_entry.php.orig:698
-msgid "Sales Order Items"
-msgstr ""
-
-#: sales/sales_order_entry.php:685 sales/sales_order_entry.php:689
-#: sales/sales_order_entry.php:700 sales/sales_order_entry.php.orig:699
+#: ../sales/sales_order_entry.php:716
 msgid "Enter Delivery Details and Confirm Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:688 sales/sales_order_entry.php:692
-#: sales/sales_order_entry.php:703 sales/sales_order_entry.php.orig:702
+#: ../sales/sales_order_entry.php:719
 msgid "Commit Order Changes"
 msgstr ""
 
-#: sales/sales_order_entry.php:710 sales/sales_order_entry.php:714
-#: sales/sales_order_entry.php:725 sales/sales_order_entry.php.orig:724
+#: ../sales/sales_order_entry.php:740
 msgid "You are about to void this Document.\\nDo you want to continue?"
 msgstr ""
 
-#: sales/sales_order_entry.php:713 sales/sales_order_entry.php:717
-#: sales/sales_order_entry.php:728 sales/sales_order_entry.php.orig:727
+#: ../sales/sales_order_entry.php:743
 msgid "Validate changes and update document"
 msgstr ""
 
-#: sales/sales_order_entry.php:717 sales/sales_order_entry.php:721
-#: sales/sales_order_entry.php:732 sales/sales_order_entry.php.orig:731
+#: ../sales/sales_order_entry.php:747
 msgid ""
 "Cancels document entry or removes sales order when editing an old document"
 msgstr ""
 
-#: sales/allocations/customer_allocate.php:28
+#: ../sales/allocations/customer_allocate.php:28
 msgid "Allocate Customer Payment or Credit Note"
 msgstr ""
 
-#: sales/allocations/customer_allocate.php:48
+#: ../sales/allocations/customer_allocate.php:48
 #, php-format
 msgid "Allocation of %s # %d"
 msgstr ""
 
-#: sales/allocations/customer_allocation_main.php:22
+#: ../sales/allocations/customer_allocation_main.php:22
 msgid "Customer Allocations"
 msgstr ""
 
-#: sales/allocations/customer_allocation_main.php:32
-#: sales/manage/customer_branches.php:280 sales/manage/customers.php:322
-#: sales/manage/customers.php.orig:319
-#: sales/inquiry/customer_allocation_inquiry.php:42
-#: sales/inquiry/customer_inquiry.php:48
-#: sales/inquiry/customer_inquiry.php.orig:48
-#: sales/inquiry/sales_orders_view.php:243
-#: sales/inquiry/sales_orders_view.php.orig:241 sales/manage/customers.php:324
+#: ../sales/allocations/customer_allocation_main.php:32
+#: ../sales/manage/customer_branches.php:282
+#: ../sales/manage/customers.php:324
+#: ../sales/manage/sav.customers.php:322
+#: ../sales/inquiry/customer_allocation_inquiry.php:42
+#: ../sales/inquiry/customer_inquiry.php:44
+#: ../sales/inquiry/sales_orders_view.php:265
 msgid "Select a customer: "
 msgstr ""
 
-#: sales/manage/credit_status.php:16
+#: ../sales/manage/credit_status.php:16
 msgid "Credit Status"
 msgstr ""
 
-#: sales/manage/credit_status.php:30
+#: ../sales/manage/credit_status.php:30
 msgid "The credit status description cannot be empty."
 msgstr ""
 
-#: sales/manage/credit_status.php:44
+#: ../sales/manage/credit_status.php:44
 msgid "New credit status has been added"
 msgstr ""
 
-#: sales/manage/credit_status.php:52
+#: ../sales/manage/credit_status.php:52
 msgid "Selected credit status has been updated"
 msgstr ""
 
-#: 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 ""
 
-#: sales/manage/credit_status.php:79
+#: ../sales/manage/credit_status.php:79
 msgid "Selected credit status has been deleted"
 msgstr ""
 
-#: sales/manage/credit_status.php:97
+#: ../sales/manage/credit_status.php:97
 msgid "Dissallow Invoices"
 msgstr ""
 
-#: sales/manage/credit_status.php:109
+#: ../sales/manage/credit_status.php:109
 msgid "Invoice OK"
 msgstr ""
 
-#: sales/manage/credit_status.php:113
+#: ../sales/manage/credit_status.php:113
 msgid "NO INVOICING"
 msgstr ""
 
-#: sales/manage/credit_status.php:147
+#: ../sales/manage/credit_status.php:147
 msgid "Dissallow invoicing ?"
 msgstr ""
 
-#: sales/manage/customer_branches.php:18
+#: ../sales/manage/customer_branches.php:18
 msgid "Customer Branches"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: sales/manage/customer_branches.php:63
+#: ../sales/manage/customer_branches.php:63
 msgid "The Branch name cannot be empty."
 msgstr ""
 
-#: sales/manage/customer_branches.php:70
+#: ../sales/manage/customer_branches.php:70
 msgid "The Branch short name cannot be empty."
 msgstr ""
 
-#: sales/manage/customer_branches.php:88
+#: ../sales/manage/customer_branches.php:88
 msgid "Selected customer branch has been updated"
 msgstr ""
 
-#: sales/manage/customer_branches.php:106
+#: ../sales/manage/customer_branches.php:106
 msgid "New customer branch has been added"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: sales/manage/customer_branches.php:137
+#: ../sales/manage/customer_branches.php:137
 msgid "Selected customer branch has been deleted"
 msgstr ""
 
-#: sales/manage/customer_branches.php:217
+#: ../sales/manage/customer_branches.php:218
 msgid "Main Branch"
 msgstr ""
 
-#: sales/manage/customer_branches.php:236
+#: ../sales/manage/customer_branches.php:237
 msgid "Name and Contact"
 msgstr ""
 
-#: sales/manage/customer_branches.php:237
+#: ../sales/manage/customer_branches.php:238
 msgid "Branch Name:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:238
+#: ../sales/manage/customer_branches.php:239
 msgid "Branch Short Name:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:241 sales/manage/customers.php:290
-#: sales/manage/customers.php.orig:287 sales/manage/customers.php:256
+#: ../sales/manage/customer_branches.php:242
+#: ../sales/manage/customers.php:256
+#: ../sales/manage/sav.customers.php:290
 msgid "Sales Person:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:242 sales/manage/customers.php:291
-#: sales/manage/customers.php.orig:288 sales/manage/customers.php:293
+#: ../sales/manage/customer_branches.php:243
+#: ../sales/manage/customers.php:293
+#: ../sales/manage/sav.customers.php:291
 msgid "Sales Area:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:243
-#: sales/manage/recurrent_invoices.php:174
+#: ../sales/manage/customer_branches.php:244
+#: ../sales/manage/recurrent_invoices.php:174
 msgid "Sales Group:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:244 sales/manage/customers.php:291
+#: ../sales/manage/customer_branches.php:245
+#: ../sales/manage/customers.php:291
 msgid "Default Inventory Location:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:245 sales/manage/customers.php:292
+#: ../sales/manage/customer_branches.php:246
+#: ../sales/manage/customers.php:292
 msgid "Default Shipping Company:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:252
+#: ../sales/manage/customer_branches.php:253
 msgid "Accounts Receivable Account:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:258
+#: ../sales/manage/customer_branches.php:260
 msgid "General contact data"
 msgstr ""
 
-#: sales/manage/customer_branches.php:268
+#: ../sales/manage/customer_branches.php:270
 msgid "Billing Address:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:272
+#: ../sales/manage/customer_branches.php:274
 msgid "Disable this Branch:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:295
-#: sales/inquiry/sales_deliveries_view.php:183
+#: ../sales/manage/customer_branches.php:297
+#: ../sales/inquiry/sales_deliveries_view.php:183
 msgid "Contact"
 msgstr ""
 
-#: sales/manage/customer_branches.php:297
+#: ../sales/manage/customer_branches.php:299
 msgid "Area"
 msgstr ""
 
-#: sales/manage/customer_branches.php:298
+#: ../sales/manage/customer_branches.php:300
 msgid "Phone No"
 msgstr ""
 
-#: sales/manage/customer_branches.php:299
+#: ../sales/manage/customer_branches.php:301
 msgid "Fax No"
 msgstr ""
 
-#: sales/manage/customer_branches.php:301
+#: ../sales/manage/customer_branches.php:303
 msgid "Tax Group"
 msgstr ""
 
-#: sales/manage/customer_branches.php:319
-#: sales/includes/ui/sales_order_ui.inc:299
-#: sales/includes/ui/sales_order_ui.inc:303
+#: ../sales/manage/customer_branches.php:321
+#: ../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 ""
 
-#: sales/manage/customers.php:42 sales/manage/customers.php.orig:39
+#: ../sales/manage/customers.php:42
+#: ../sales/manage/sav.customers.php:42
 msgid "The customer name cannot be empty."
 msgstr ""
 
-#: sales/manage/customers.php:49 sales/manage/customers.php.orig:46
+#: ../sales/manage/customers.php:49
+#: ../sales/manage/sav.customers.php:49
 msgid "The customer short name cannot be empty."
 msgstr ""
 
-#: sales/manage/customers.php:56 sales/manage/customers.php.orig:53
+#: ../sales/manage/customers.php:56
+#: ../sales/manage/sav.customers.php:56
 msgid "The credit limit must be numeric and not less than zero."
 msgstr ""
 
-#: sales/manage/customers.php:63 sales/manage/customers.php.orig:60
+#: ../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 ""
 
-#: sales/manage/customers.php:70 sales/manage/customers.php.orig:67
+#: ../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 ""
 
-#: sales/manage/customers.php:98 sales/manage/customers.php.orig:95
+#: ../sales/manage/customers.php:98
+#: ../sales/manage/sav.customers.php:98
 msgid "Customer has been updated."
 msgstr ""
 
-#: sales/manage/customers.php:127 sales/manage/customers.php.orig:124
+#: ../sales/manage/customers.php:127
+#: ../sales/manage/sav.customers.php:127
 msgid "A new customer has been added."
 msgstr ""
 
-#: sales/manage/customers.php:130 sales/manage/customers.php.orig: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/customers.php.orig:150
+#: ../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 ""
 
-#: sales/manage/customers.php:160 sales/manage/customers.php.orig:157
+#: ../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 ""
 
-#: sales/manage/customers.php:167 sales/manage/customers.php.orig:164
+#: ../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 ""
 
-#: sales/manage/customers.php:178 sales/manage/customers.php.orig:175
+#: ../sales/manage/customers.php:178
+#: ../sales/manage/sav.customers.php:178
 msgid "Selected customer has been deleted."
 msgstr ""
 
-#: sales/manage/customers.php:227 sales/manage/customers.php.orig:224
+#: ../sales/manage/customers.php:227
+#: ../sales/manage/sav.customers.php:227
 msgid "Name and Address"
 msgstr ""
 
-#: sales/manage/customers.php:229 sales/manage/customers.php.orig:226
+#: ../sales/manage/customers.php:229
+#: ../sales/manage/sav.customers.php:229
 msgid "Customer Name:"
 msgstr ""
 
-#: sales/manage/customers.php:230 sales/manage/customers.php.orig:227
+#: ../sales/manage/customers.php:230
+#: ../sales/manage/sav.customers.php:230
 msgid "Customer Short Name:"
 msgstr ""
 
-#: sales/manage/customers.php:238 sales/manage/customers.php:242
-#: sales/manage/customers.php.orig:235 sales/manage/customers.php.orig:239
+#: ../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 ""
 
-#: sales/manage/customers.php:245 sales/manage/customers.php.orig:242
+#: ../sales/manage/customers.php:245
+#: ../sales/manage/sav.customers.php:245
 msgid "Sales Type/Price List:"
 msgstr ""
 
-#: sales/manage/customers.php:248 sales/manage/customers.php.orig:245
+#: ../sales/manage/customers.php:248
+#: ../sales/manage/sav.customers.php:248
 msgid "Customer status:"
 msgstr ""
 
-#: sales/manage/customers.php:261 sales/manage/customers.php.orig:258
-#: sales/manage/customers.php:262
+#: ../sales/manage/customers.php:262
+#: ../sales/manage/sav.customers.php:261
 msgid "Discount Percent:"
 msgstr ""
 
-#: sales/manage/customers.php:262 sales/manage/customers.php.orig:259
-#: sales/manage/customers.php:263
+#: ../sales/manage/customers.php:263
+#: ../sales/manage/sav.customers.php:262
 msgid "Prompt Payment Discount Percent:"
 msgstr ""
 
-#: sales/manage/customers.php:266 sales/manage/customers.php.orig:263
-#: sales/manage/customers.php:267
+#: ../sales/manage/customers.php:267
+#: ../sales/manage/sav.customers.php:266
 msgid "Credit Status:"
 msgstr ""
 
-#: sales/manage/customers.php:279 sales/manage/customers.php.orig:276
-#: sales/manage/customers.php:280
+#: ../sales/manage/customers.php:280
+#: ../sales/manage/sav.customers.php:279
 msgid "Customer branches"
 msgstr ""
 
-#: sales/manage/customers.php:281 sales/manage/customers.php.orig:278
-#: sales/manage/customers.php:282
+#: ../sales/manage/customers.php:282
+#: ../sales/manage/sav.customers.php:281
 msgid "Select or &Add"
 msgstr ""
 
-#: sales/manage/customers.php:281 sales/manage/customers.php.orig:278
-#: sales/manage/customers.php:282
+#: ../sales/manage/customers.php:282
+#: ../sales/manage/sav.customers.php:281
 msgid "&Add or Edit "
 msgstr ""
 
-#: sales/manage/customers.php:299 sales/manage/customers.php.orig:296
-#: sales/manage/customers.php:301
+#: ../sales/manage/customers.php:301
+#: ../sales/manage/sav.customers.php:299
 msgid "Add New Customer"
 msgstr ""
 
-#: sales/manage/customers.php:303 sales/manage/customers.php.orig:300
-#: sales/manage/customers.php:305
+#: ../sales/manage/customers.php:305
+#: ../sales/manage/sav.customers.php:303
 msgid "Update Customer"
 msgstr ""
 
-#: sales/manage/customers.php:304 sales/manage/customers.php.orig:301
-#: sales/manage/customers.php:306
+#: ../sales/manage/customers.php:306
+#: ../sales/manage/sav.customers.php:304
 msgid "Update customer data"
 msgstr ""
 
-#: sales/manage/customers.php:305 sales/manage/customers.php.orig:302
-#: sales/manage/customers.php:307
+#: ../sales/manage/customers.php:307
+#: ../sales/manage/sav.customers.php:305
 msgid "Select this customer and return to document entry."
 msgstr ""
 
-#: sales/manage/customers.php:306 sales/manage/customers.php.orig:303
-#: sales/manage/customers.php:308
+#: ../sales/manage/customers.php:308
+#: ../sales/manage/sav.customers.php:306
 msgid "Delete Customer"
 msgstr ""
 
-#: sales/manage/customers.php:307 sales/manage/customers.php.orig:304
-#: sales/manage/customers.php:309
+#: ../sales/manage/customers.php:309
+#: ../sales/manage/sav.customers.php:307
 msgid "Delete customer data if have been never used"
 msgstr ""
 
-#: sales/manage/customers.php:314 sales/manage/customers.php.orig:311
-#: sales/manage/customers.php:316
+#: ../sales/manage/customers.php:316
+#: ../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 ""
 
-#: sales/manage/customers.php:323 sales/manage/customers.php.orig:320
-#: sales/manage/customers.php:325
+#: ../sales/manage/customers.php:325
+#: ../sales/manage/sav.customers.php:323
 msgid "New customer"
 msgstr ""
 
-#: sales/manage/customers.php:345 sales/manage/customers.php.orig:342
-#: sales/manage/customers.php:347
+#: ../sales/manage/customers.php:347
+#: ../sales/manage/sav.customers.php:345
 msgid "Sales &Orders"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:24
+#: ../sales/manage/recurrent_invoices.php:24
 msgid "Recurrent Invoices"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:36 sales/manage/sales_areas.php:30
-#: sales/manage/sales_groups.php:30
+#: ../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 ""
 
-#: sales/manage/recurrent_invoices.php:63
+#: ../sales/manage/recurrent_invoices.php:63
 msgid "Selected recurrent invoice has been updated"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:69
+#: ../sales/manage/recurrent_invoices.php:69
 msgid "New recurrent invoice has been added"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:86
+#: ../sales/manage/recurrent_invoices.php:86
 msgid "Selected recurrent invoice has been deleted"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:167
+#: ../sales/manage/recurrent_invoices.php:167
 msgid "Template:"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:176
+#: ../sales/manage/recurrent_invoices.php:176
 msgid "Days:"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:178
+#: ../sales/manage/recurrent_invoices.php:178
 msgid "Monthly:"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:180
+#: ../sales/manage/recurrent_invoices.php:180
 msgid "Begin:"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:182
+#: ../sales/manage/recurrent_invoices.php:182
 msgid "End:"
 msgstr ""
 
-#: sales/manage/sales_areas.php:39
+#: ../sales/manage/sales_areas.php:39
 msgid "Selected sales area has been updated"
 msgstr ""
 
-#: sales/manage/sales_areas.php:44
+#: ../sales/manage/sales_areas.php:44
 msgid "New sales area has been added"
 msgstr ""
 
-#: 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 ""
 
-#: sales/manage/sales_areas.php:68
+#: ../sales/manage/sales_areas.php:68
 msgid "Selected sales area has been deleted"
 msgstr ""
 
-#: sales/manage/sales_areas.php:88
+#: ../sales/manage/sales_areas.php:88
 msgid "Area Name"
 msgstr ""
 
-#: sales/manage/sales_areas.php:127
+#: ../sales/manage/sales_areas.php:127
 msgid "Area Name:"
 msgstr ""
 
-#: sales/manage/sales_groups.php:16
+#: ../sales/manage/sales_groups.php:16
 msgid "Sales Groups"
 msgstr ""
 
-#: sales/manage/sales_groups.php:39
+#: ../sales/manage/sales_groups.php:39
 msgid "Selected sales group has been updated"
 msgstr ""
 
-#: sales/manage/sales_groups.php:44
+#: ../sales/manage/sales_groups.php:44
 msgid "New sales group has been added"
 msgstr ""
 
-#: 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 ""
 
-#: sales/manage/sales_groups.php:67
+#: ../sales/manage/sales_groups.php:67
 msgid "Selected sales group has been deleted"
 msgstr ""
 
-#: sales/manage/sales_groups.php:85 sales/manage/sales_groups.php:120
+#: ../sales/manage/sales_groups.php:85
+#: ../sales/manage/sales_groups.php:120
 msgid "ID"
 msgstr ""
 
-#: sales/manage/sales_groups.php:123
+#: ../sales/manage/sales_groups.php:123
 msgid "Group Name:"
 msgstr ""
 
-#: sales/manage/sales_people.php:16
+#: ../sales/manage/sales_people.php:16
 msgid "Sales Persons"
 msgstr ""
 
-#: sales/manage/sales_people.php:32
+#: ../sales/manage/sales_people.php:32
 msgid "The sales person name cannot be empty."
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: sales/manage/sales_people.php:62
+#: ../sales/manage/sales_people.php:62
 msgid "Selected sales person data have been updated"
 msgstr ""
 
-#: sales/manage/sales_people.php:64
+#: ../sales/manage/sales_people.php:64
 msgid "New sales person data have been added"
 msgstr ""
 
-#: sales/manage/sales_people.php:76
+#: ../sales/manage/sales_people.php:76
 msgid ""
 "Cannot delete this sales-person because branches are set up referring to "
 "this sales-person - first alter the branches concerned."
 msgstr ""
 
-#: sales/manage/sales_people.php:81
+#: ../sales/manage/sales_people.php:81
 msgid "Selected sales person data have been deleted"
 msgstr ""
 
-#: sales/manage/sales_people.php:155
+#: ../sales/manage/sales_people.php:155
 msgid "Sales person name:"
 msgstr ""
 
-#: sales/manage/sales_people.php:156
+#: ../sales/manage/sales_people.php:156
 msgid "Telephone number:"
 msgstr ""
 
-#: sales/manage/sales_people.php:157
+#: ../sales/manage/sales_people.php:157
 msgid "Fax number:"
 msgstr ""
 
-#: sales/manage/sales_people.php:160
+#: ../sales/manage/sales_people.php:160
 msgid "Break Pt.:"
 msgstr ""
 
-#: sales/manage/sales_points.php:16
+#: ../sales/manage/sales_points.php:16
 msgid "POS settings"
 msgstr ""
 
-#: sales/manage/sales_points.php:28
+#: ../sales/manage/sales_points.php:28
 msgid "The POS name cannot be empty."
 msgstr ""
 
-#: sales/manage/sales_points.php:41
+#: ../sales/manage/sales_points.php:41
 msgid "New point of sale has been added"
 msgstr ""
 
-#: sales/manage/sales_points.php:52
+#: ../sales/manage/sales_points.php:52
 msgid "Selected point of sale has been updated"
 msgstr ""
 
-#: 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 ""
 
-#: sales/manage/sales_points.php:65
+#: ../sales/manage/sales_points.php:65
 msgid "Selected point of sale has been deleted"
 msgstr ""
 
-#: sales/manage/sales_points.php:84
+#: ../sales/manage/sales_points.php:84
 msgid "POS Name"
 msgstr ""
 
-#: sales/manage/sales_points.php:84
+#: ../sales/manage/sales_points.php:84
 msgid "Credit sale"
 msgstr ""
 
-#: sales/manage/sales_points.php:84
+#: ../sales/manage/sales_points.php:84
 msgid "Cash sale"
 msgstr ""
 
-#: sales/manage/sales_points.php:84
+#: ../sales/manage/sales_points.php:84
 msgid "Default account"
 msgstr ""
 
-#: 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 ""
 
-#: sales/manage/sales_points.php:129
+#: ../sales/manage/sales_points.php:129
 msgid "Point of Sale Name"
 msgstr ""
 
-#: sales/manage/sales_points.php:131
+#: ../sales/manage/sales_points.php:131
 msgid "Allowed credit sale terms selection:"
 msgstr ""
 
-#: sales/manage/sales_points.php:132
+#: ../sales/manage/sales_points.php:132
 msgid "Allowed cash sale terms selection:"
 msgstr ""
 
-#: sales/manage/sales_points.php:133
+#: ../sales/manage/sales_points.php:133
 msgid "Default cash account"
 msgstr ""
 
-#: sales/manage/sales_points.php:139
+#: ../sales/manage/sales_points.php:139
 msgid "POS location"
 msgstr ""
 
-#: sales/manage/sales_types.php:28
+#: ../sales/manage/sales_types.php:28
 msgid "The sales type description cannot be empty."
 msgstr ""
 
-#: sales/manage/sales_types.php:35
+#: ../sales/manage/sales_types.php:35
 msgid "Calculation factor must be valid positive number."
 msgstr ""
 
-#: sales/manage/sales_types.php:48
+#: ../sales/manage/sales_types.php:48
 msgid "New sales type has been added"
 msgstr ""
 
-#: sales/manage/sales_types.php:59
+#: ../sales/manage/sales_types.php:59
 msgid "Selected sales type has been updated"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: sales/manage/sales_types.php:83
+#: ../sales/manage/sales_types.php:83
 msgid "Selected sales type has been deleted"
 msgstr ""
 
-#: sales/manage/sales_types.php:103
+#: ../sales/manage/sales_types.php:103
 msgid "Type Name"
 msgstr ""
 
-#: sales/manage/sales_types.php:103
+#: ../sales/manage/sales_types.php:103
 msgid "Factor"
 msgstr ""
 
-#: sales/manage/sales_types.php:103
+#: ../sales/manage/sales_types.php:103
 msgid "Tax Incl"
 msgstr ""
 
-#: sales/manage/sales_types.php:117
+#: ../sales/manage/sales_types.php:117
 msgid "Base"
 msgstr ""
 
-#: 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 ""
 
-#: sales/manage/sales_types.php:154
+#: ../sales/manage/sales_types.php:154
 msgid "Sales Type Name"
 msgstr ""
 
-#: sales/manage/sales_types.php:155
+#: ../sales/manage/sales_types.php:155
 msgid "Calculation factor"
 msgstr ""
 
-#: sales/manage/sales_types.php:156
+#: ../sales/manage/sales_types.php:156
 msgid "Tax included"
 msgstr ""
 
-#: sales/view/view_credit.php:24
+#: ../sales/view/view_credit.php:24
 msgid "View Credit Note"
 msgstr ""
 
-#: sales/view/view_credit.php:39
+#: ../sales/view/view_credit.php:39
 #, php-format
 msgid "CREDIT NOTE #%d"
 msgstr ""
 
-#: sales/view/view_credit.php:126
+#: ../sales/view/view_credit.php:126
 msgid "There are no line items on this credit note."
 msgstr ""
 
-#: sales/view/view_dispatch.php:23
+#: ../sales/view/view_dispatch.php:23
 msgid "View Sales Dispatch"
 msgstr ""
 
-#: sales/view/view_dispatch.php:43
+#: ../sales/view/view_dispatch.php:43
 #, php-format
 msgid "DISPATCH NOTE #%d"
 msgstr ""
 
-#: sales/view/view_dispatch.php:65 sales/view/view_invoice.php:65
+#: ../sales/view/view_dispatch.php:65
+#: ../sales/view/view_invoice.php:67
 msgid "Charge Branch"
 msgstr ""
 
-#: sales/view/view_dispatch.php:91 sales/view/view_invoice.php:90
-#: sales/view/view_sales_order.php:63
+#: ../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 ""
 
-#: sales/view/view_dispatch.php:96
+#: ../sales/view/view_dispatch.php:96
 msgid "Dispatch Date"
 msgstr ""
 
-#: sales/view/view_dispatch.php:151
+#: ../sales/view/view_dispatch.php:151
 msgid "There are no line items on this dispatch."
 msgstr ""
 
-#: sales/view/view_dispatch.php:162
+#: ../sales/view/view_dispatch.php:162
 msgid "TOTAL VALUE"
 msgstr ""
 
-#: sales/view/view_dispatch.php:166
+#: ../sales/view/view_dispatch.php:166
 msgid "This dispatch has been voided."
 msgstr ""
 
-#: sales/view/view_invoice.php:23
+#: ../sales/view/view_invoice.php:23
 msgid "View Sales Invoice"
 msgstr ""
 
-#: sales/view/view_invoice.php:43
+#: ../sales/view/view_invoice.php:45
+#, php-format
+msgid "FINAL INVOICE #%d"
+msgstr ""
+
+#: ../sales/view/view_invoice.php:45
+#, php-format
+msgid "PREPAYMENT INVOICE #%d"
+msgstr ""
+
+#: ../sales/view/view_invoice.php:45
 #, php-format
 msgid "SALES INVOICE #%d"
 msgstr ""
 
-#: sales/view/view_invoice.php:152
+#: ../sales/view/view_invoice.php:154
 msgid "There are no line items on this invoice."
 msgstr ""
 
-#: sales/view/view_receipt.php:24
+#: ../sales/view/view_receipt.php:24
 msgid "View Customer Payment"
 msgstr ""
 
-#: sales/view/view_receipt.php:33
+#: ../sales/view/view_receipt.php:33
 #, php-format
 msgid "Customer Payment #%d"
 msgstr ""
 
-#: sales/view/view_receipt.php:38
+#: ../sales/view/view_receipt.php:38
 msgid "From Customer"
 msgstr ""
 
-#: sales/view/view_receipt.php:39
+#: ../sales/view/view_receipt.php:39
 msgid "Into Bank Account"
 msgstr ""
 
-#: sales/view/view_receipt.php:40
+#: ../sales/view/view_receipt.php:40
 msgid "Date of Deposit"
 msgstr ""
 
-#: sales/view/view_receipt.php:56
+#: ../sales/view/view_receipt.php:56
 msgid "This customer payment has been voided."
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: sales/view/view_sales_order.php:49
+#: ../sales/view/view_sales_order.php:49
+#: ../sales/view/view_sales_order.php.orig:49
 msgid "Order Information"
 msgstr ""
 
-#: sales/view/view_sales_order.php:60
+#: ../sales/view/view_sales_order.php:60
+#: ../sales/view/view_sales_order.php.orig:60
 msgid "Customer Name"
 msgstr ""
 
-#: sales/view/view_sales_order.php:64
+#: ../sales/view/view_sales_order.php:64
+#: ../sales/view/view_sales_order.php.orig:64
 msgid "Deliver To Branch"
 msgstr ""
 
-#: sales/view/view_sales_order.php:71
+#: ../sales/view/view_sales_order.php:71
+#: ../sales/view/view_sales_order.php.orig:71
 msgid "Requested Delivery"
 msgstr ""
 
-#: sales/view/view_sales_order.php:75
+#: ../sales/view/view_sales_order.php:75
+#: ../sales/view/view_sales_order.php.orig:75
 msgid "Deliver From Location"
 msgstr ""
 
-#: sales/view/view_sales_order.php:82
+#: ../sales/view/view_sales_order.php:86
+msgid "Non-Invoiced Prepayments"
+msgstr ""
+
+#: ../sales/view/view_sales_order.php:87
+msgid "All Payments Allocated"
+msgstr ""
+
+#: ../sales/view/view_sales_order.php:95
+#: ../sales/view/view_sales_order.php.orig:82
 msgid "Telephone"
 msgstr ""
 
-#: sales/view/view_sales_order.php:197
+#: ../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 ""
 
-#: sales/view/view_sales_order.php:202
+#: ../sales/view/view_sales_order.php:220
+#: ../sales/view/view_sales_order.php.orig:202
 msgid "Quantity Delivered"
 msgstr ""
 
-#: sales/inquiry/customer_allocation_inquiry.php:25
+#: ../sales/inquiry/customer_allocation_inquiry.php:25
 msgid "Customer Allocation Inquiry"
 msgstr ""
 
-#: sales/inquiry/customer_allocation_inquiry.php:96
+#: ../sales/inquiry/customer_allocation_inquiry.php:96
 msgid "Allocation"
 msgstr ""
 
-#: sales/inquiry/customer_allocation_inquiry.php:116
+#: ../sales/inquiry/customer_allocation_inquiry.php:116
 msgid "Payment"
 msgstr ""
 
-#: sales/inquiry/customer_inquiry.php:28
-#: sales/inquiry/customer_inquiry.php.orig:28
+#: ../sales/inquiry/customer_inquiry.php:26
 msgid "Customer Transactions"
 msgstr ""
 
-#: sales/inquiry/customer_inquiry.php:72
-#: sales/inquiry/customer_inquiry.php.orig:72
+#: ../sales/inquiry/customer_inquiry.php:68
 msgid "CUSTOMER ACCOUNT IS ON HOLD"
 msgstr ""
 
-#: sales/inquiry/customer_inquiry.php:205
-#: sales/inquiry/customer_inquiry.php.orig:205
+#: ../sales/inquiry/customer_inquiry.php:181
 msgid "Print Receipt"
 msgstr ""
 
-#: sales/inquiry/customer_inquiry.php:235
-#: sales/inquiry/customer_inquiry.php:248
-#: sales/inquiry/customer_inquiry.php.orig:235
-#: sales/inquiry/customer_inquiry.php.orig:248
+#: ../sales/inquiry/customer_inquiry.php:211
+#: ../sales/inquiry/customer_inquiry.php:224
 msgid "RB"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:29
+#: ../sales/inquiry/sales_deliveries_view.php:29
 msgid "Search Not Invoiced Deliveries"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:34
+#: ../sales/inquiry/sales_deliveries_view.php:34
 msgid "Search All Deliveries"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:70
+#: ../sales/inquiry/sales_deliveries_view.php: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 ""
 
-#: sales/inquiry/sales_deliveries_view.php:179
+#: ../sales/inquiry/sales_deliveries_view.php:179
 msgid "Delivery #"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:185
+#: ../sales/inquiry/sales_deliveries_view.php:185
 msgid "Cust Ref"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:187
+#: ../sales/inquiry/sales_deliveries_view.php:187
 msgid "Due By"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:188
+#: ../sales/inquiry/sales_deliveries_view.php:188
 msgid "Delivery Total"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:190
+#: ../sales/inquiry/sales_deliveries_view.php:190
 msgid "Batch"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:190
+#: ../sales/inquiry/sales_deliveries_view.php:190
 msgid "Batch Invoicing"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:40
-#: sales/inquiry/sales_orders_view.php.orig:48
+#: ../sales/inquiry/sales_orders_view.php:44
 msgid "Search Outstanding Sales Orders"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:45
-#: sales/inquiry/sales_orders_view.php.orig:53
+#: ../sales/inquiry/sales_orders_view.php:49
 msgid "Search Template for Invoicing"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:50
-#: sales/inquiry/sales_orders_view.php.orig:58
+#: ../sales/inquiry/sales_orders_view.php:54
 msgid "Select Template for Delivery"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:55
-#: sales/inquiry/sales_orders_view.php.orig:63
+#: ../sales/inquiry/sales_orders_view.php:59
+msgid "Invoicing Prepayment Orders"
+msgstr ""
+
+#: ../sales/inquiry/sales_orders_view.php:64
 msgid "Search All Sales Orders"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:61
-#: sales/inquiry/sales_orders_view.php.orig:69
+#: ../sales/inquiry/sales_orders_view.php:70
 msgid "Search All Sales Quotations"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:136
-#: sales/inquiry/sales_orders_view.php.orig:134
+#: ../sales/inquiry/sales_orders_view.php:148
 msgid "Dispatch"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:178
-#: sales/inquiry/sales_orders_view.php.orig:176
+#: ../sales/inquiry/sales_orders_view.php:191
 msgid "Set this order as a template for direct deliveries/invoices"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:245
-#: sales/inquiry/sales_orders_view.php.orig:243
+#: ../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
 msgid "Show All:"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:262
-#: sales/inquiry/sales_orders_view.php.orig:260
+#: ../sales/inquiry/sales_orders_view.php:284
 msgid "Order #"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:266
-#: sales/inquiry/sales_orders_view.php:280
-#: sales/inquiry/sales_orders_view.php.orig:264
-#: sales/inquiry/sales_orders_view.php.orig:278
+#: ../sales/inquiry/sales_orders_view.php:288
+#: ../sales/inquiry/sales_orders_view.php:302
 msgid "Cust Order Ref"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:269
-#: sales/inquiry/sales_orders_view.php:283
-#: sales/inquiry/sales_orders_view.php.orig:267
-#: sales/inquiry/sales_orders_view.php.orig:281
+#: ../sales/inquiry/sales_orders_view.php:291
+#: ../sales/inquiry/sales_orders_view.php:305
 msgid "Delivery To"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:276
-#: sales/inquiry/sales_orders_view.php.orig:274
+#: ../sales/inquiry/sales_orders_view.php:298
 msgid "Quote #"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:281
-#: sales/inquiry/sales_orders_view.php.orig:279
+#: ../sales/inquiry/sales_orders_view.php:303
 msgid "Quote Date"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:284
-#: sales/inquiry/sales_orders_view.php.orig:282
+#: ../sales/inquiry/sales_orders_view.php:306
 msgid "Quote Total"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:311
-#: sales/inquiry/sales_orders_view.php.orig:309
+#: ../sales/inquiry/sales_orders_view.php:337
 msgid "Tmpl"
 msgstr ""
 
-#: sales/includes/cart_class.inc:347 sales/includes/cart_class.inc:352
-msgid "You have to enter valid stock code or nonempty description"
-msgstr ""
-
-#: sales/includes/sales_ui.inc:50
+#: ../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 ""
 
-#: sales/includes/db/custalloc_db.inc:292
+#: ../sales/includes/db/custalloc_db.inc:351
 msgid ""
 "Unsuspected overallocation happened due to sparse credit notes exists for "
 "this invoice.\n"
@@ -13696,384 +15403,378 @@ msgid ""
 "charges."
 msgstr ""
 
-#: sales/includes/db/sales_invoice_db.inc:173
-#: sales/includes/db/sales_invoice_db.inc.orig:176
-#: sales/includes/db/sales_invoice_db.inc:174
-msgid "Cash invoice"
-msgstr ""
-
-#: sales/includes/db/sales_order_db.inc:107
-#: sales/includes/db/sales_order_db.inc:259
-#: sales/includes/db/sales_order_db.inc.orig:107
-#: sales/includes/db/sales_order_db.inc.orig:259
+#: ../sales/includes/db/old.sales_order_db.inc:107
+#: ../sales/includes/db/old.sales_order_db.inc:259
+#: ../sales/includes/db/sales_order_db.inc:109
+#: ../sales/includes/db/sales_order_db.inc:271
+#: ../sales/includes/db/sales_order_db.inc.orig:109
+#: ../sales/includes/db/sales_order_db.inc.orig:271
 msgid "Stocks below Re-Order Level at "
 msgstr ""
 
-#: sales/includes/db/sales_order_db.inc:110
-#: sales/includes/db/sales_order_db.inc:264
-#: sales/includes/db/sales_order_db.inc.orig:110
-#: sales/includes/db/sales_order_db.inc.orig:264
+#: ../sales/includes/db/old.sales_order_db.inc:110
+#: ../sales/includes/db/old.sales_order_db.inc:264
+#: ../sales/includes/db/sales_order_db.inc:112
+#: ../sales/includes/db/sales_order_db.inc:276
+#: ../sales/includes/db/sales_order_db.inc.orig:112
+#: ../sales/includes/db/sales_order_db.inc.orig:276
 msgid "Below"
 msgstr ""
 
-#: sales/includes/db/sales_order_db.inc:111
-#: sales/includes/db/sales_order_db.inc:265
-#: sales/includes/db/sales_order_db.inc.orig:111
-#: sales/includes/db/sales_order_db.inc.orig:265
+#: ../sales/includes/db/old.sales_order_db.inc:111
+#: ../sales/includes/db/old.sales_order_db.inc:265
+#: ../sales/includes/db/sales_order_db.inc:113
+#: ../sales/includes/db/sales_order_db.inc:277
+#: ../sales/includes/db/sales_order_db.inc.orig:113
+#: ../sales/includes/db/sales_order_db.inc.orig:277
 msgid "Please reorder"
 msgstr ""
 
-#: sales/includes/db/sales_order_db.inc:139
-#: sales/includes/db/sales_order_db.inc.orig:139
+#: ../sales/includes/db/old.sales_order_db.inc:139
+#: ../sales/includes/db/sales_order_db.inc:141
+#: ../sales/includes/db/sales_order_db.inc.orig:141
 msgid "Deleted."
 msgstr ""
 
-#: sales/includes/ui/sales_credit_ui.inc:94
-#: sales/includes/ui/sales_order_ui.inc:379
-#: sales/includes/ui/sales_order_ui.inc:383
+#: ../sales/includes/db/sales_invoice_db.inc.orig:196
+msgid "Cash invoice"
+msgstr ""
+
+#: ../sales/includes/ui/sales_credit_ui.inc:94
+#: ../sales/includes/ui/sales_order_ui.inc.orig:379
 msgid "Customer Currency:"
 msgstr ""
 
-#: sales/includes/ui/sales_credit_ui.inc:112
-#: sales/includes/ui/sales_order_ui.inc:639
-#: sales/includes/ui/sales_order_ui.inc:643
+#: ../sales/includes/ui/sales_credit_ui.inc:112
+#: ../sales/includes/ui/sales_order_ui.inc.orig:647
 msgid "Shipping Company:"
 msgstr ""
 
-#: sales/includes/ui/sales_credit_ui.inc:114
-#: sales/includes/ui/sales_order_ui.inc:386
-#: sales/includes/ui/sales_order_ui.inc:390
+#: ../sales/includes/ui/sales_credit_ui.inc:114
+#: ../sales/includes/ui/sales_order_ui.inc.orig:386
 msgid "Customer Discount:"
 msgstr ""
 
-#: 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 ""
 
-#: sales/includes/ui/sales_order_ui.inc:104
-#: sales/includes/ui/sales_order_ui.inc:106
+#: ../sales/includes/ui/sales_order_ui.inc:106
+#: ../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 ""
 
-#: sales/includes/ui/sales_order_ui.inc:224
-#: sales/includes/ui/sales_order_ui.inc:228
+#: ../sales/includes/ui/sales_order_ui.inc.orig:224
 msgid "Shipping Charge"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:297
-#: sales/includes/ui/sales_order_ui.inc:301
+#: ../sales/includes/ui/sales_order_ui.inc.orig:297
 msgid "No customer found for entered text."
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:323
-#: sales/includes/ui/sales_order_ui.inc:327
+#: ../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:377
+#: ../sales/includes/ui/sales_order_ui.inc.orig:373
 msgid "Reference number unique for this document type"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:413
-#: sales/includes/ui/sales_order_ui.inc:415
-#: sales/includes/ui/sales_order_ui.inc:417
-#: sales/includes/ui/sales_order_ui.inc:419
+#: ../sales/includes/ui/sales_order_ui.inc.orig:413
+#: ../sales/includes/ui/sales_order_ui.inc.orig:415
 msgid "Price List:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:432
-#: sales/includes/ui/sales_order_ui.inc:436
+#: ../sales/includes/ui/sales_order_ui.inc.orig:432
 msgid "Date of order receive"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:582
-#: sales/includes/ui/sales_order_ui.inc:586
+#: ../sales/includes/ui/sales_order_ui.inc.orig:582
 msgid "Cash payment"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:585
-#: sales/includes/ui/sales_order_ui.inc:617
-#: sales/includes/ui/sales_order_ui.inc:589
-#: sales/includes/ui/sales_order_ui.inc:621
+#: ../sales/includes/ui/sales_order_ui.inc.orig:585
+#: ../sales/includes/ui/sales_order_ui.inc.orig:617
 msgid "Deliver from Location:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:588
-#: sales/includes/ui/sales_order_ui.inc:592
+#: ../sales/includes/ui/sales_order_ui.inc.orig:588
 msgid "Cash account:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:595
-#: sales/includes/ui/sales_order_ui.inc:599
+#: ../sales/includes/ui/sales_order_ui.inc.orig:595
 msgid "Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:600
-#: sales/includes/ui/sales_order_ui.inc:604
+#: ../sales/includes/ui/sales_order_ui.inc.orig:600
 msgid "Invoice Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:601
-#: sales/includes/ui/sales_order_ui.inc:605
+#: ../sales/includes/ui/sales_order_ui.inc.orig:601
 msgid "Invoice before"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:605
-#: sales/includes/ui/sales_order_ui.inc:609
+#: ../sales/includes/ui/sales_order_ui.inc.orig:605
 msgid "Quotation Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:610
-#: sales/includes/ui/sales_order_ui.inc:614
+#: ../sales/includes/ui/sales_order_ui.inc.orig:610
 msgid "Order Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:623
-#: sales/includes/ui/sales_order_ui.inc:627
+#: ../sales/includes/ui/sales_order_ui.inc.orig:631
 msgid "Enter requested day of delivery"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:624
-#: sales/includes/ui/sales_order_ui.inc:628
+#: ../sales/includes/ui/sales_order_ui.inc.orig:632
 msgid "Enter Valid until Date"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:625
-#: sales/includes/ui/sales_order_ui.inc:629
+#: ../sales/includes/ui/sales_order_ui.inc.orig:633
 msgid "Deliver To:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:626
-#: sales/includes/ui/sales_order_ui.inc:630
+#: ../sales/includes/ui/sales_order_ui.inc.orig:634
 msgid "Additional identifier for delivery e.g. name of receiving person"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:629
-#: sales/includes/ui/sales_order_ui.inc:633
+#: ../sales/includes/ui/sales_order_ui.inc.orig:637
 msgid "Delivery address. Default is address of customer branch"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:633
-#: sales/includes/ui/sales_order_ui.inc:637
+#: ../sales/includes/ui/sales_order_ui.inc.orig:641
 msgid "Contact Phone Number:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:634
-#: sales/includes/ui/sales_order_ui.inc:638
+#: ../sales/includes/ui/sales_order_ui.inc.orig:642
 msgid "Phone number of ordering person. Defaults to branch phone number"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:635
-#: sales/includes/ui/sales_order_ui.inc:639
+#: ../sales/includes/ui/sales_order_ui.inc.orig:643
 msgid "Customer Reference:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:636
-#: sales/includes/ui/sales_order_ui.inc:640
+#: ../sales/includes/ui/sales_order_ui.inc.orig:644
 msgid "Customer reference number for this order (if any)"
 msgstr ""
 
-#: taxes/item_tax_types.php:17
+#: ../taxes/item_tax_types.php:17
 msgid "Item Tax Types"
 msgstr ""
 
-#: taxes/item_tax_types.php:35
+#: ../taxes/item_tax_types.php:35
 msgid "The item tax type description cannot be empty."
 msgstr ""
 
-#: taxes/item_tax_types.php:60
+#: ../taxes/item_tax_types.php:60
 msgid "Selected item tax type has been updated"
 msgstr ""
 
-#: taxes/item_tax_types.php:65
+#: ../taxes/item_tax_types.php:65
 msgid "New item tax type has been added"
 msgstr ""
 
-#: 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 ""
 
-#: taxes/item_tax_types.php:82
+#: ../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
+#: ../taxes/item_tax_types.php:98
 msgid "Selected item tax type has been deleted"
 msgstr ""
 
-#: taxes/item_tax_types.php:117
+#: ../taxes/item_tax_types.php:117
 msgid "Tax exempt"
 msgstr ""
 
-#: taxes/item_tax_types.php:175
+#: ../taxes/item_tax_types.php:175
 msgid "Is Fully Tax-exempt:"
 msgstr ""
 
-#: taxes/item_tax_types.php:182
+#: ../taxes/item_tax_types.php:182
 msgid "Select which taxes this item tax type is exempt from."
 msgstr ""
 
-#: taxes/item_tax_types.php:185
+#: ../taxes/item_tax_types.php:185
 msgid "Tax Name"
 msgstr ""
 
-#: taxes/item_tax_types.php:185
+#: ../taxes/item_tax_types.php:185
 msgid "Is exempt"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: taxes/tax_groups.php:61
+#: ../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 ""
 
-#: taxes/tax_groups.php:66
+#: ../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 ""
 
-#: taxes/tax_groups.php:81
+#: ../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 ""
 
-#: taxes/tax_groups.php:87
+#: ../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 ""
 
-#: taxes/tax_groups.php:104
+#: ../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 ""
 
-#: taxes/tax_groups.php:124
-msgid "Shipping Tax"
-msgstr ""
-
-#: taxes/tax_groups.php:168
-msgid "Tax applied to Shipping:"
+#: ../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 ""
 
-#: taxes/tax_groups.php:172
-msgid "Select the taxes that are included in this group."
+#: ../taxes/tax_groups.php:171
+#: ../taxes/tax_groups.php.orig:173
+#: ../taxes/tax_groups.php.sav:173
+msgid "Shipping Tax"
 msgstr ""
 
-#: taxes/tax_types.php:16
+#: ../taxes/tax_types.php:16
 msgid "Tax Types"
 msgstr ""
 
-#: taxes/tax_types.php:30
+#: ../taxes/tax_types.php:30
 msgid "The tax type name cannot be empty."
 msgstr ""
 
-#: taxes/tax_types.php:36
+#: ../taxes/tax_types.php:36
 msgid "The default tax rate must be numeric and not less than zero."
 msgstr ""
 
-#: taxes/tax_types.php:42
+#: ../taxes/tax_types.php:42
 msgid "Selected GL Accounts cannot be used by another tax type."
 msgstr ""
 
-#: taxes/tax_types.php:56
+#: ../taxes/tax_types.php:56
 msgid "New tax type has been added"
 msgstr ""
 
-#: taxes/tax_types.php:67
+#: ../taxes/tax_types.php:67
 msgid "Selected tax type has been updated"
 msgstr ""
 
-#: 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 ""
 
-#: taxes/tax_types.php:94
+#: ../taxes/tax_types.php:94
 msgid "Selected tax type has been deleted"
 msgstr ""
 
-#: 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 ""
 
-#: taxes/tax_types.php:115
+#: ../taxes/tax_types.php:115
 msgid "Default Rate (%)"
 msgstr ""
 
-#: taxes/tax_types.php:116
+#: ../taxes/tax_types.php:116
 msgid "Sales GL Account"
 msgstr ""
 
-#: taxes/tax_types.php:116
+#: ../taxes/tax_types.php:116
 msgid "Purchasing GL Account"
 msgstr ""
 
-#: taxes/tax_types.php:159
+#: ../taxes/tax_types.php:159
 msgid "Default Rate:"
 msgstr ""
 
-#: taxes/tax_types.php:161
+#: ../taxes/tax_types.php:161
 msgid "Sales GL Account:"
 msgstr ""
 
-#: taxes/tax_types.php:162
+#: ../taxes/tax_types.php:162
 msgid "Purchasing GL Account:"
 msgstr ""
 
-#: themes/default/renderer.php:27 themes/default/renderer.php:28
+#: ../themes/default/renderer.php:28
 msgid "Main Menu"
 msgstr ""
 
-#: themes/default/renderer.php:53 themes/default/renderer.php:76
-#: themes/default/renderer.php:54 themes/default/renderer.php:80
+#: ../themes/default/renderer.php:54
+#: ../themes/default/renderer.php:80
 msgid "Help"
 msgstr ""
 
-#: themes/default/renderer.php:71 themes/default/renderer.php:75
+#: ../themes/default/renderer.php:75
 msgid "Preferences"
 msgstr ""
 
-#: sql/alter2.1.php:18
+#: ../sql/alter2.1.php:18
 msgid "Upgrade from version 2.0 to 2.1"
 msgstr ""
 
-#: sql/alter2.1.php:35
+#: ../sql/alter2.1.php:36
 msgid "Cannot retrieve bank accounts codes"
 msgstr ""
 
-#: sql/alter2.1.php:43
+#: ../sql/alter2.1.php:44
 msgid "Cannot update bank transactions"
 msgstr ""
 
-#: sql/alter2.1.php:52
+#: ../sql/alter2.1.php:53
 msgid "Cannot select stock identificators"
 msgstr ""
 
-#: sql/alter2.1.php:63
+#: ../sql/alter2.1.php:64
 msgid "Cannot insert stock id into item_codes"
 msgstr ""
 
-#: sql/alter2.1.php:139
+#: ../sql/alter2.1.php:140
 msgid ""
 "Seems that system upgrade to version 2.1 has \n"
 "\t\t\tbeen performed for this company already.<br> If something has gone \n"
@@ -14081,57 +15782,28 @@ msgid ""
 "\t\t\tdatabase restore from last backup file first."
 msgstr ""
 
-#: sql/alter2.2.php:23
+#: ../sql/alter2.2.php:23
 msgid "Upgrade from version 2.1/2.2beta to 2.2"
 msgstr ""
 
-#: sql/alter2.2.php:84
+#: ../sql/alter2.2.php:85
 msgid "Cannot query max sales order number."
 msgstr ""
 
-#: sql/alter2.2.php:95
+#: ../sql/alter2.2.php:96
 msgid "Cannot store next sales order reference."
 msgstr ""
 
-#: sql/alter2.2.php:250
+#: ../sql/alter2.2.php:251
 msgid ""
 "Cannot upgrade extensions system: file /modules/installed_modules.php is not "
 "writeable"
 msgstr ""
 
-#: sql/alter2.3.php:20
+#: ../sql/alter2.3.php:20
 msgid "Upgrade from version 2.2 to 2.3"
 msgstr ""
 
-#: admin/attachments.php:84
-msgid "No transaction has been selected."
-msgstr ""
-
-#: admin/attachments.php:86
-msgid "Select attachment file."
-msgstr ""
-
-#: sales/create_recurrent_invoices.php:127
-msgid "Invoice date:"
-msgstr ""
-
-#: access/login.php:36
-msgid "Too many failed login attempts.<br>Please wait a while or try later."
-msgstr ""
-
-#: admin/create_coy.php:293
-msgid ""
-"If no Admin Password is entered, the new Admin Password will be "
-"'<b>password</b>' by default "
-msgstr ""
-
-#: gl/manage/gl_accounts.php:102
-msgid "Account not added, possible duplicate Account Code."
-msgstr ""
-
-#: includes/session.inc:185
-#, php-format
-msgid ""
-"Brute force attack on account '%s' detected. Access for non-logged users "
-"temporarily blocked."
+#: ../sql/alter2.4.php:19
+msgid "Upgrade from version 2.3 to 2.4"
 msgstr ""