Updated gettext template.
authorJanusz Dobrowolski <janusz@frontaccouting.eu>
Thu, 9 Jun 2011 13:27:13 +0000 (15:27 +0200)
committerJanusz Dobrowolski <janusz@frontaccouting.eu>
Thu, 9 Jun 2011 13:27:13 +0000 (15:27 +0200)
lang/new_language_template/LC_MESSAGES/empty.po

index 5f15b799a5a1291307857593432a09093a2b599e..0c07a25d6d8a26c76069a891fca838aa8ab289c5 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-27 12:23+0200\n"
+"POT-Creation-Date: 2011-06-09 15:26+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"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -59,7 +59,7 @@ msgstr ""
 msgid "Password:"
 msgstr ""
 
 msgid "Password:"
 msgstr ""
 
-#: access/login.php:92 admin/create_coy.php:249 admin/create_coy.php:329
+#: access/login.php:92 admin/create_coy.php:249 admin/create_coy.php:331
 msgid "Company"
 msgstr ""
 
 msgid "Company"
 msgstr ""
 
@@ -101,8 +101,8 @@ msgstr ""
 #: inventory/includes/item_adjustments_ui.inc:47
 #: manufacturing/work_order_add_finished.php:203
 #: manufacturing/work_order_costs.php:150
 #: 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:378
-#: manufacturing/work_order_entry.php:386
+#: 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:"
 #: manufacturing/includes/work_order_issue_ui.inc:161
 #: sales/inquiry/customer_allocation_inquiry.php:47
 msgid "Type:"
@@ -127,6 +127,7 @@ msgstr ""
 #: purchasing/inquiry/po_search.php:130
 #: purchasing/inquiry/supplier_allocation_inquiry.php:126
 #: purchasing/inquiry/supplier_inquiry.php:163
 #: purchasing/inquiry/po_search.php:130
 #: purchasing/inquiry/supplier_allocation_inquiry.php:126
 #: purchasing/inquiry/supplier_inquiry.php:163
+#: purchasing/inquiry/supplier_inquiry.php.orig:163
 #: purchasing/allocations/supplier_allocation_main.php:95
 #: reporting/rep101.php:130 reporting/rep201.php:118 reporting/rep203.php:91
 #: reporting/rep601.php:76 reporting/rep704.php:78 reporting/rep704.php:81
 #: purchasing/allocations/supplier_allocation_main.php:95
 #: reporting/rep101.php:130 reporting/rep201.php:118 reporting/rep203.php:91
 #: reporting/rep601.php:76 reporting/rep704.php:78 reporting/rep704.php:81
@@ -155,10 +156,10 @@ msgstr ""
 #: purchasing/po_receive_items.php:62 reporting/rep104.php:109
 #: reporting/rep105.php:112 reporting/rep204.php:82 reporting/rep303.php:109
 #: reporting/rep303.php:115 reporting/rep304.php:114 reporting/rep305.php:95
 #: purchasing/po_receive_items.php:62 reporting/rep104.php:109
 #: reporting/rep105.php:112 reporting/rep204.php:82 reporting/rep303.php:109
 #: reporting/rep303.php:115 reporting/rep304.php:114 reporting/rep305.php:95
-#: reporting/rep401.php:69 sales/create_recurrent_invoices.php:98
-#: sales/manage/credit_status.php:97 sales/manage/recurrent_invoices.php:85
-#: sales/inquiry/sales_orders_view.php:284
-#: sales/inquiry/sales_orders_view.php:288 taxes/tax_groups.php:124
+#: reporting/rep401.php:69 sales/create_recurrent_invoices.php:115
+#: sales/manage/credit_status.php:97 sales/manage/recurrent_invoices.php:102
+#: sales/inquiry/sales_orders_view.php:286
+#: sales/inquiry/sales_orders_view.php:290 taxes/tax_groups.php:124
 #: taxes/tax_types.php:115
 msgid "Description"
 msgstr ""
 #: taxes/tax_types.php:115
 msgid "Description"
 msgstr ""
@@ -187,8 +188,8 @@ msgstr ""
 #: gl/inquiry/journal_inquiry.php:111 gl/manage/bank_accounts.php:126
 #: gl/manage/currencies.php:166 gl/manage/exchange_rates.php:94
 #: gl/manage/gl_account_classes.php:132 gl/manage/gl_account_types.php:155
 #: gl/inquiry/journal_inquiry.php:111 gl/manage/bank_accounts.php:126
 #: gl/manage/currencies.php:166 gl/manage/exchange_rates.php:94
 #: gl/manage/gl_account_classes.php:132 gl/manage/gl_account_types.php:155
-#: gl/manage/gl_account_types.php.orig:148 gl/manage/gl_quick_entries.php:196
-#: gl/manage/gl_quick_entries.php:295 gl/includes/ui/gl_bank_ui.inc:158
+#: gl/manage/gl_quick_entries.php:196 gl/manage/gl_quick_entries.php:295
+#: gl/includes/ui/gl_bank_ui.inc:166 gl/includes/ui/gl_bank_ui.inc.orig:166
 #: gl/includes/ui/gl_journal_ui.inc:122 includes/ui/contacts_view.inc:64
 #: includes/ui/simple_crud_class.inc:52 inventory/prices.php:145
 #: inventory/purchasing_data.php:146
 #: 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
@@ -206,7 +207,7 @@ msgstr ""
 #: purchasing/inquiry/po_search_completed.php:101
 #: purchasing/inquiry/po_search.php:87 sales/manage/credit_status.php:119
 #: sales/manage/customer_branches.php:159
 #: purchasing/inquiry/po_search_completed.php:101
 #: purchasing/inquiry/po_search.php:87 sales/manage/credit_status.php:119
 #: sales/manage/customer_branches.php:159
-#: sales/manage/recurrent_invoices.php:113 sales/manage/sales_areas.php:103
+#: sales/manage/recurrent_invoices.php:130 sales/manage/sales_areas.php:103
 #: sales/manage/sales_groups.php:99 sales/manage/sales_people.php:119
 #: sales/manage/sales_points.php:99 sales/manage/sales_types.php:121
 #: sales/inquiry/customer_inquiry.php:186
 #: sales/manage/sales_groups.php:99 sales/manage/sales_people.php:119
 #: sales/manage/sales_points.php:99 sales/manage/sales_types.php:121
 #: sales/inquiry/customer_inquiry.php:186
@@ -234,8 +235,8 @@ msgstr ""
 #: gl/gl_budget.php:137 gl/manage/bank_accounts.php:127
 #: gl/manage/currencies.php:168 gl/manage/exchange_rates.php:99
 #: gl/manage/gl_account_classes.php:133 gl/manage/gl_account_types.php:156
 #: gl/gl_budget.php:137 gl/manage/bank_accounts.php:127
 #: gl/manage/currencies.php:168 gl/manage/exchange_rates.php:99
 #: gl/manage/gl_account_classes.php:133 gl/manage/gl_account_types.php:156
-#: gl/manage/gl_account_types.php.orig:149 gl/manage/gl_quick_entries.php:197
-#: gl/manage/gl_quick_entries.php:296 gl/includes/ui/gl_bank_ui.inc:160
+#: gl/manage/gl_quick_entries.php:197 gl/manage/gl_quick_entries.php:296
+#: gl/includes/ui/gl_bank_ui.inc:168 gl/includes/ui/gl_bank_ui.inc.orig:168
 #: gl/includes/ui/gl_journal_ui.inc:124 includes/ui/contacts_view.inc:67
 #: includes/ui/simple_crud_class.inc:54 includes/ui/ui_input.inc:281
 #: inventory/prices.php:146 inventory/purchasing_data.php:147
 #: gl/includes/ui/gl_journal_ui.inc:124 includes/ui/contacts_view.inc:67
 #: includes/ui/simple_crud_class.inc:54 includes/ui/ui_input.inc:281
 #: inventory/prices.php:146 inventory/purchasing_data.php:147
@@ -250,7 +251,7 @@ msgstr ""
 #: 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
 #: 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:114 sales/manage/sales_areas.php:104
+#: 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/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
@@ -303,12 +304,13 @@ msgstr ""
 #: includes/system_tests.inc:38 includes/system_tests.inc:113
 #: includes/system_tests.inc:126 includes/ui/ui_lists.inc:1638
 #: purchasing/manage/suppliers.php:123 reporting/rep101.php:126
 #: includes/system_tests.inc:38 includes/system_tests.inc:113
 #: includes/system_tests.inc:126 includes/ui/ui_lists.inc:1638
 #: purchasing/manage/suppliers.php:123 reporting/rep101.php:126
-#: reporting/rep102.php:106 reporting/rep104.php:103 reporting/rep106.php:73
-#: reporting/rep114.php:73 reporting/rep201.php:114 reporting/rep202.php:108
-#: reporting/rep203.php:87 reporting/rep303.php:101 reporting/rep303.php:105
-#: reporting/rep501.php:109 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
+#: reporting/rep102.php:114 reporting/rep102.php:116 reporting/rep104.php:103
+#: reporting/rep106.php:73 reporting/rep114.php:73 reporting/rep201.php:114
+#: reporting/rep202.php:116 reporting/rep202.php:118 reporting/rep203.php:87
+#: reporting/rep303.php:101 reporting/rep303.php:105 reporting/rep501.php:109
+#: sales/manage/sales_points.php:94 sales/manage/sales_points.php:95
+#: sales/manage/sales_types.php:119 taxes/item_tax_types.php:129
+#: taxes/tax_groups.php:139
 msgid "No"
 msgstr ""
 
 msgid "No"
 msgstr ""
 
@@ -592,21 +594,21 @@ msgstr ""
 #: admin/forms_setup.php:61 admin/gl_setup.php:221 admin/inst_chart.php:74
 #: admin/inst_lang.php:103 admin/inst_module.php:138 admin/inst_module.php:156
 #: admin/inst_module.php:199 admin/inst_theme.php:96
 #: admin/forms_setup.php:61 admin/gl_setup.php:221 admin/inst_chart.php:74
 #: admin/inst_lang.php:103 admin/inst_module.php:138 admin/inst_module.php:156
 #: admin/inst_module.php:199 admin/inst_theme.php:96
-#: dimensions/dimension_entry.php:293 gl/gl_bank.php:390 gl/gl_budget.php:135
-#: gl/manage/gl_quick_entries.php:60 gl/includes/ui/gl_bank_ui.inc:249
-#: gl/includes/ui/gl_journal_ui.inc:221 includes/ui/db_pager_view.inc:174
-#: includes/ui/simple_crud_class.inc:56 includes/ui/simple_crud_class.inc:227
-#: includes/ui/ui_input.inc:203 includes/ui/ui_input.inc:894
-#: inventory/adjustments.php:233 inventory/cost_update.php:119
-#: inventory/reorder_level.php:97 inventory/transfers.php:236
-#: inventory/includes/item_adjustments_ui.inc:157
+#: dimensions/dimension_entry.php:293 gl/gl_bank.php:400 gl/gl_budget.php:135
+#: gl/manage/gl_quick_entries.php:60 gl/includes/ui/gl_bank_ui.inc:257
+#: gl/includes/ui/gl_bank_ui.inc.orig:257 gl/includes/ui/gl_journal_ui.inc:221
+#: includes/ui/db_pager_view.inc:174 includes/ui/simple_crud_class.inc:56
+#: includes/ui/simple_crud_class.inc:227 includes/ui/ui_input.inc:203
+#: includes/ui/ui_input.inc:894 inventory/adjustments.php:235
+#: inventory/cost_update.php:119 inventory/reorder_level.php:97
+#: inventory/transfers.php:236 inventory/includes/item_adjustments_ui.inc:157
 #: inventory/includes/stock_transfers_ui.inc:137
 #: inventory/includes/stock_transfers_ui.inc:137
-#: inventory/manage/sales_kits.php:208 manufacturing/work_order_entry.php:458
+#: 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
 #: 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:280
-#: sales/customer_credit_invoice.php:380 sales/customer_delivery.php:520
-#: sales/customer_invoice.php:559 sales/inquiry/sales_orders_view.php:312
+#: purchasing/po_receive_items.php:333 sales/credit_note_entry.php:282
+#: sales/customer_credit_invoice.php:382 sales/customer_delivery.php:520
+#: sales/customer_invoice.php:561 sales/inquiry/sales_orders_view.php:314
 #: sales/includes/ui/sales_credit_ui.inc:293
 #: sales/includes/ui/sales_order_ui.inc:237
 #: sales/includes/ui/sales_order_ui.inc:555
 #: sales/includes/ui/sales_credit_ui.inc:293
 #: sales/includes/ui/sales_order_ui.inc:237
 #: sales/includes/ui/sales_order_ui.inc:555
@@ -707,19 +709,19 @@ msgstr ""
 msgid "Database Host"
 msgstr ""
 
 msgid "Database Host"
 msgstr ""
 
-#: admin/create_coy.php:249 admin/create_coy.php:334 admin/create_coy.php:340
+#: admin/create_coy.php:249 admin/create_coy.php:336 admin/create_coy.php:342
 msgid "Database User"
 msgstr ""
 
 msgid "Database User"
 msgstr ""
 
-#: admin/create_coy.php:250 admin/create_coy.php:336 admin/create_coy.php:341
+#: admin/create_coy.php:250 admin/create_coy.php:338 admin/create_coy.php:343
 msgid "Database Name"
 msgstr ""
 
 msgid "Database Name"
 msgstr ""
 
-#: admin/create_coy.php:250 admin/create_coy.php:337 admin/create_coy.php:342
+#: admin/create_coy.php:250 admin/create_coy.php:339 admin/create_coy.php:344
 msgid "Table Pref"
 msgstr ""
 
 msgid "Table Pref"
 msgstr ""
 
-#: admin/create_coy.php:250 admin/create_coy.php:344 admin/inst_lang.php:36
+#: admin/create_coy.php:250 admin/create_coy.php:346 admin/inst_lang.php:36
 #: admin/print_profiles.php:162
 msgid "Default"
 msgstr ""
 #: admin/print_profiles.php:162
 msgid "Default"
 msgstr ""
@@ -731,48 +733,48 @@ msgstr ""
 #: includes/system_tests.inc:38 includes/system_tests.inc:113
 #: includes/system_tests.inc:126 includes/ui/ui_lists.inc:1639
 #: purchasing/manage/suppliers.php:123 reporting/rep101.php:125
 #: includes/system_tests.inc:38 includes/system_tests.inc:113
 #: includes/system_tests.inc:126 includes/ui/ui_lists.inc:1639
 #: purchasing/manage/suppliers.php:123 reporting/rep101.php:125
-#: reporting/rep102.php:105 reporting/rep104.php:105 reporting/rep106.php:75
-#: reporting/rep114.php:75 reporting/rep201.php:113 reporting/rep202.php:107
-#: reporting/rep203.php:86 reporting/rep303.php:96 reporting/rep303.php:104
-#: reporting/rep501.php:107 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
+#: reporting/rep102.php:113 reporting/rep102.php:115 reporting/rep104.php:105
+#: reporting/rep106.php:75 reporting/rep114.php:75 reporting/rep201.php:113
+#: reporting/rep202.php:115 reporting/rep202.php:117 reporting/rep203.php:86
+#: reporting/rep303.php:96 reporting/rep303.php:104 reporting/rep501.php:107
+#: sales/manage/sales_points.php:94 sales/manage/sales_points.php:95
+#: sales/manage/sales_types.php:119 taxes/item_tax_types.php:133
+#: taxes/tax_groups.php:137
 msgid "Yes"
 msgstr ""
 
 msgid "Yes"
 msgstr ""
 
-#: admin/create_coy.php:287
+#: admin/create_coy.php:288
 msgid "The marked company is the current company which cannot be deleted."
 msgstr ""
 
 msgid "The marked company is the current company which cannot be deleted."
 msgstr ""
 
-#: admin/create_coy.php:333 admin/create_coy.php:339 admin/printers.php:84
+#: admin/create_coy.php:335 admin/create_coy.php:341 admin/printers.php:84
 msgid "Host"
 msgstr ""
 
 msgid "Host"
 msgstr ""
 
-#: admin/create_coy.php:335
+#: admin/create_coy.php:337
 msgid "Database Password"
 msgstr ""
 
 msgid "Database Password"
 msgstr ""
 
-#: admin/create_coy.php:337 admin/inst_chart.php:68 admin/inst_chart.php:70
+#: admin/create_coy.php:339 admin/inst_chart.php:68 admin/inst_chart.php:70
 #: admin/inst_lang.php:87 admin/inst_lang.php:90 admin/inst_module.php:127
 #: admin/inst_theme.php:91 admin/inst_theme.php:93 admin/inst_upgrade.php:149
 #: admin/inst_lang.php:87 admin/inst_lang.php:90 admin/inst_module.php:127
 #: admin/inst_theme.php:91 admin/inst_theme.php:93 admin/inst_upgrade.php:149
-#: gl/manage/gl_account_types.php:191 gl/manage/gl_account_types.php.orig:184
-#: includes/ui/allocation_cart.inc:286
+#: gl/manage/gl_account_types.php:191 includes/ui/allocation_cart.inc:286
 msgid "None"
 msgstr ""
 
 msgid "None"
 msgstr ""
 
-#: admin/create_coy.php:348
+#: admin/create_coy.php:350
 msgid "Database Script"
 msgstr ""
 
 msgid "Database Script"
 msgstr ""
 
-#: admin/create_coy.php:349
+#: admin/create_coy.php:351
 msgid "New script Admin Password"
 msgstr ""
 
 msgid "New script Admin Password"
 msgstr ""
 
-#: admin/create_coy.php:353 gl/gl_budget.php:136
+#: admin/create_coy.php:355 gl/gl_budget.php:136
 msgid "Save"
 msgstr ""
 
 msgid "Save"
 msgstr ""
 
-#: admin/create_coy.php:375
+#: admin/create_coy.php:377
 msgid "Create a new company"
 msgstr ""
 
 msgid "Create a new company"
 msgstr ""
 
@@ -1203,7 +1205,7 @@ msgstr ""
 msgid "No postings on GRN"
 msgstr ""
 
 msgid "No postings on GRN"
 msgstr ""
 
-#: admin/gl_setup.php:194 reporting/reports_main.php:173
+#: admin/gl_setup.php:194 reporting/reports_main.php:175
 msgid "Inventory"
 msgstr ""
 
 msgid "Inventory"
 msgstr ""
 
@@ -1548,8 +1550,9 @@ msgstr ""
 #: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:125
 #: gl/inquiry/journal_inquiry.php:122 gl/inquiry/tax_inquiry.php:82
 #: gl/manage/bank_accounts.php:102 gl/manage/gl_quick_entries.php:186
 #: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:125
 #: gl/inquiry/journal_inquiry.php:122 gl/inquiry/tax_inquiry.php:82
 #: gl/manage/bank_accounts.php:102 gl/manage/gl_quick_entries.php:186
-#: gl/view/accrual_trans.php:52 gl/includes/ui/gl_bank_ui.inc:83
-#: includes/ui/ui_view.inc:488 inventory/inquiry/stock_movements.php:76
+#: gl/view/accrual_trans.php:52 gl/includes/ui/gl_bank_ui.inc:80
+#: gl/includes/ui/gl_bank_ui.inc.orig:80 includes/ui/ui_view.inc:488
+#: inventory/inquiry/stock_movements.php:76
 #: inventory/manage/item_categories.php:98
 #: manufacturing/search_work_orders.php:161
 #: manufacturing/includes/manufacturing_ui.inc:236
 #: inventory/manage/item_categories.php:98
 #: manufacturing/search_work_orders.php:161
 #: manufacturing/includes/manufacturing_ui.inc:236
@@ -1557,12 +1560,13 @@ msgstr ""
 #: manufacturing/includes/manufacturing_ui.inc:280
 #: manufacturing/includes/manufacturing_ui.inc:331
 #: purchasing/inquiry/supplier_allocation_inquiry.php:125
 #: manufacturing/includes/manufacturing_ui.inc:280
 #: manufacturing/includes/manufacturing_ui.inc:331
 #: purchasing/inquiry/supplier_allocation_inquiry.php:125
-#: purchasing/inquiry/supplier_inquiry.php:162 reporting/rep102.php:124
-#: reporting/rep202.php:127 reporting/rep501.php:85 reporting/rep601.php:76
+#: purchasing/inquiry/supplier_inquiry.php:162
+#: purchasing/inquiry/supplier_inquiry.php.orig:162 reporting/rep102.php:134
+#: reporting/rep202.php:137 reporting/rep501.php:85 reporting/rep601.php:76
 #: reporting/rep702.php:58 reporting/rep704.php:78 reporting/rep704.php:81
 #: reporting/rep704.php:84 reporting/rep709.php:105 reporting/rep710.php:76
 #: reporting/rep702.php:58 reporting/rep704.php:78 reporting/rep704.php:81
 #: reporting/rep704.php:84 reporting/rep709.php:105 reporting/rep710.php:76
-#: reporting/rep710.php:84 reporting/reports_main.php:249
-#: reporting/reports_main.php:396 reporting/includes/doctext.inc:44
+#: reporting/rep710.php:84 reporting/reports_main.php:251
+#: reporting/reports_main.php:398 reporting/includes/doctext.inc:44
 #: reporting/includes/doctext.inc:54
 #: sales/inquiry/customer_allocation_inquiry.php:141
 #: sales/inquiry/customer_inquiry.php:212
 #: reporting/includes/doctext.inc:54
 #: sales/inquiry/customer_allocation_inquiry.php:141
 #: sales/inquiry/customer_inquiry.php:212
@@ -1758,8 +1762,8 @@ msgid "Role:"
 msgstr ""
 
 #: admin/security_roles.php:180 gl/manage/gl_accounts.php:199
 msgstr ""
 
 #: admin/security_roles.php:180 gl/manage/gl_accounts.php:199
-#: gl/manage/gl_accounts.php.orig:199 inventory/manage/items.php:253
-#: purchasing/manage/suppliers.php:281 sales/manage/customers.php:282
+#: inventory/manage/items.php:253 purchasing/manage/suppliers.php:281
+#: sales/manage/customers.php:282
 msgid "Show inactive:"
 msgstr ""
 
 msgid "Show inactive:"
 msgstr ""
 
@@ -1800,10 +1804,11 @@ msgid "Delete This Role"
 msgstr ""
 
 #: admin/security_roles.php:249 admin/void_transaction.php:223
 msgstr ""
 
 #: admin/security_roles.php:249 admin/void_transaction.php:223
-#: gl/manage/gl_quick_entries.php:61 gl/includes/ui/gl_bank_ui.inc:251
-#: gl/includes/ui/gl_journal_ui.inc:223 includes/ui/simple_crud_class.inc:58
-#: includes/ui/simple_crud_class.inc:231 includes/ui/ui_controls.inc:562
-#: includes/ui/ui_input.inc:206 inventory/includes/item_adjustments_ui.inc:159
+#: gl/manage/gl_quick_entries.php:61 gl/includes/ui/gl_bank_ui.inc:259
+#: gl/includes/ui/gl_bank_ui.inc.orig:259 gl/includes/ui/gl_journal_ui.inc:223
+#: includes/ui/simple_crud_class.inc:58 includes/ui/simple_crud_class.inc:231
+#: includes/ui/ui_controls.inc:587 includes/ui/ui_input.inc:206
+#: inventory/includes/item_adjustments_ui.inc:159
 #: inventory/includes/stock_transfers_ui.inc:139
 #: inventory/manage/items.php:426
 #: manufacturing/includes/work_order_issue_ui.inc:133
 #: inventory/includes/stock_transfers_ui.inc:139
 #: inventory/manage/items.php:426
 #: manufacturing/includes/work_order_issue_ui.inc:133
@@ -1818,8 +1823,8 @@ msgid "Cancel Edition"
 msgstr ""
 
 #: admin/shipping_companies.php:15 reporting/includes/doctext.inc:32
 msgstr ""
 
 #: admin/shipping_companies.php:15 reporting/includes/doctext.inc:32
-#: sales/customer_credit_invoice.php:254 sales/customer_delivery.php:365
-#: sales/customer_invoice.php:407 sales/view/view_credit.php:74
+#: sales/customer_credit_invoice.php:256 sales/customer_delivery.php:365
+#: sales/customer_invoice.php:409 sales/view/view_credit.php:74
 #: sales/view/view_dispatch.php:92 sales/view/view_invoice.php:91
 msgid "Shipping Company"
 msgstr ""
 #: sales/view/view_dispatch.php:92 sales/view/view_invoice.php:91
 msgid "Shipping Company"
 msgstr ""
@@ -1870,7 +1875,7 @@ msgid "Address"
 msgstr ""
 
 #: admin/shipping_companies.php:134 gl/manage/gl_account_types.php:189
 msgstr ""
 
 #: admin/shipping_companies.php:134 gl/manage/gl_account_types.php:189
-#: gl/manage/gl_account_types.php.orig:182 gl/includes/ui/gl_bank_ui.inc:58
+#: gl/includes/ui/gl_bank_ui.inc:55 gl/includes/ui/gl_bank_ui.inc.orig:55
 #: inventory/manage/items.php:309 manufacturing/manage/work_centres.php:137
 msgid "Name:"
 msgstr ""
 #: inventory/manage/items.php:309 manufacturing/manage/work_centres.php:137
 msgid "Name:"
 msgstr ""
@@ -1894,11 +1899,11 @@ msgstr ""
 msgid "Unspecified tag type"
 msgstr ""
 
 msgid "Unspecified tag type"
 msgstr ""
 
-#: admin/tags.php:40 reporting/reports_main.php:270
-#: reporting/reports_main.php:278 reporting/reports_main.php:289
-#: reporting/reports_main.php:317 reporting/reports_main.php:324
-#: reporting/reports_main.php:334 reporting/reports_main.php:359
-#: reporting/reports_main.php:365 reporting/reports_main.php:374
+#: admin/tags.php:40 reporting/reports_main.php:272
+#: reporting/reports_main.php:280 reporting/reports_main.php:291
+#: reporting/reports_main.php:319 reporting/reports_main.php:326
+#: reporting/reports_main.php:336 reporting/reports_main.php:361
+#: reporting/reports_main.php:367 reporting/reports_main.php:376
 msgid "Account Tags"
 msgstr ""
 
 msgid "Account Tags"
 msgstr ""
 
@@ -2019,7 +2024,7 @@ msgid "View or Print Transactions"
 msgstr ""
 
 #: admin/view_print_transaction.php:43 admin/view_print_transaction.php:45
 msgstr ""
 
 #: admin/view_print_transaction.php:43 admin/view_print_transaction.php:45
-#: admin/view_print_transaction.php:129 includes/ui/ui_controls.inc:172
+#: admin/view_print_transaction.php:129 includes/ui/ui_controls.inc:188
 #: purchasing/inquiry/po_search_completed.php:108
 #: purchasing/inquiry/po_search.php:93 sales/inquiry/customer_inquiry.php:197
 #: sales/inquiry/sales_deliveries_view.php:160
 #: purchasing/inquiry/po_search_completed.php:108
 #: purchasing/inquiry/po_search.php:93 sales/inquiry/customer_inquiry.php:197
 #: sales/inquiry/sales_deliveries_view.php:160
@@ -2047,6 +2052,7 @@ msgstr ""
 #: purchasing/inquiry/po_search.php:76
 #: purchasing/inquiry/supplier_allocation_inquiry.php:57
 #: purchasing/inquiry/supplier_inquiry.php:54
 #: purchasing/inquiry/po_search.php:76
 #: purchasing/inquiry/supplier_allocation_inquiry.php:57
 #: purchasing/inquiry/supplier_inquiry.php:54
+#: purchasing/inquiry/supplier_inquiry.php.orig:54
 #: sales/inquiry/customer_allocation_inquiry.php:51
 #: sales/inquiry/customer_inquiry.php:54
 #: sales/inquiry/sales_deliveries_view.php:116
 #: sales/inquiry/customer_allocation_inquiry.php:51
 #: sales/inquiry/customer_inquiry.php:54
 #: sales/inquiry/sales_deliveries_view.php:116
@@ -2091,12 +2097,13 @@ msgstr ""
 #: purchasing/inquiry/po_search.php:131
 #: purchasing/inquiry/supplier_allocation_inquiry.php:127
 #: purchasing/inquiry/supplier_inquiry.php:164
 #: purchasing/inquiry/po_search.php:131
 #: purchasing/inquiry/supplier_allocation_inquiry.php:127
 #: purchasing/inquiry/supplier_inquiry.php:164
+#: purchasing/inquiry/supplier_inquiry.php.orig:164
 #: purchasing/allocations/supplier_allocation_main.php:96
 #: reporting/rep501.php:85 reporting/rep601.php:76 reporting/rep702.php:51
 #: purchasing/allocations/supplier_allocation_main.php:96
 #: reporting/rep501.php:85 reporting/rep601.php:76 reporting/rep702.php:51
-#: reporting/includes/doctext.inc:47 sales/customer_credit_invoice.php:245
-#: sales/customer_credit_invoice.php:247 sales/customer_delivery.php:345
-#: sales/customer_delivery.php:347 sales/customer_invoice.php:386
-#: sales/customer_invoice.php:388
+#: reporting/includes/doctext.inc:47 sales/customer_credit_invoice.php:247
+#: sales/customer_credit_invoice.php:249 sales/customer_delivery.php:345
+#: sales/customer_delivery.php:347 sales/customer_invoice.php:388
+#: sales/customer_invoice.php:390
 #: sales/allocations/customer_allocation_main.php:95
 #: sales/view/view_dispatch.php:85 sales/view/view_invoice.php:84
 #: sales/view/view_receipt.php:50 sales/view/view_sales_order.php:81
 #: sales/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
@@ -2121,8 +2128,8 @@ msgstr ""
 #: inventory/inquiry/stock_movements.php:76
 #: inventory/view/view_adjustment.php:45 inventory/view/view_transfer.php:47
 #: manufacturing/search_work_orders.php:166
 #: inventory/inquiry/stock_movements.php:76
 #: inventory/view/view_adjustment.php:45 inventory/view/view_transfer.php:47
 #: manufacturing/search_work_orders.php:166
-#: manufacturing/work_order_entry.php:418
-#: manufacturing/work_order_entry.php:424
+#: 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/view/wo_production_view.php:45
 #: manufacturing/includes/manufacturing_ui.inc:157
 #: manufacturing/includes/manufacturing_ui.inc:200
@@ -2134,13 +2141,14 @@ msgstr ""
 #: purchasing/includes/ui/po_ui.inc:328 purchasing/view/view_po.php:140
 #: purchasing/inquiry/supplier_allocation_inquiry.php:130
 #: purchasing/inquiry/supplier_inquiry.php:167
 #: purchasing/includes/ui/po_ui.inc:328 purchasing/view/view_po.php:140
 #: purchasing/inquiry/supplier_allocation_inquiry.php:130
 #: purchasing/inquiry/supplier_inquiry.php:167
+#: purchasing/inquiry/supplier_inquiry.php.orig:167
 #: purchasing/allocations/supplier_allocation_main.php:97
 #: reporting/rep101.php:130 reporting/rep201.php:118 reporting/rep501.php:85
 #: reporting/rep601.php:76 reporting/rep704.php:78 reporting/rep704.php:81
 #: reporting/rep704.php:84 reporting/rep709.php:109 reporting/rep710.php:75
 #: reporting/includes/doctext.inc:15 reporting/includes/doctext.inc:110
 #: reporting/includes/doctext.inc:118 sales/customer_delivery.php:375
 #: purchasing/allocations/supplier_allocation_main.php:97
 #: reporting/rep101.php:130 reporting/rep201.php:118 reporting/rep501.php:85
 #: reporting/rep601.php:76 reporting/rep704.php:78 reporting/rep704.php:81
 #: reporting/rep704.php:84 reporting/rep709.php:109 reporting/rep710.php:75
 #: reporting/includes/doctext.inc:15 reporting/includes/doctext.inc:110
 #: reporting/includes/doctext.inc:118 sales/customer_delivery.php:375
-#: sales/customer_invoice.php:417
+#: sales/customer_invoice.php:419
 #: sales/allocations/customer_allocation_main.php:96
 #: sales/view/view_credit.php:69 sales/view/view_sales_order.php:96
 #: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161
 #: sales/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
@@ -2174,12 +2182,14 @@ msgstr ""
 
 #: admin/void_transaction.php:202 dimensions/dimension_entry.php:283
 #: gl/bank_transfer.php:93 gl/inquiry/journal_inquiry.php:56
 
 #: admin/void_transaction.php:202 dimensions/dimension_entry.php:283
 #: gl/bank_transfer.php:93 gl/inquiry/journal_inquiry.php:56
-#: gl/manage/revaluate_currencies.php:103 includes/ui/ui_view.inc:308
+#: gl/manage/revaluate_currencies.php:106 includes/ui/ui_view.inc:308
 #: manufacturing/work_order_add_finished.php:210
 #: manufacturing/work_order_add_finished.php:210
-#: manufacturing/work_order_entry.php:450
+#: manufacturing/work_order_entry.php:451
 #: manufacturing/work_order_release.php:100
 #: purchasing/includes/ui/invoice_ui.inc:161 purchasing/po_entry_items.php:511
 #: manufacturing/work_order_release.php:100
 #: purchasing/includes/ui/invoice_ui.inc:161 purchasing/po_entry_items.php:511
-#: purchasing/supplier_payment.php:310 sales/customer_payments.php:291
+#: purchasing/supplier_payment.php:313
+#: purchasing/supplier_payment.php.orig:314 sales/customer_payments.php:292
+#: sales/customer_payments.php.orig:293
 msgid "Memo:"
 msgstr ""
 
 msgid "Memo:"
 msgstr ""
 
@@ -2197,7 +2207,7 @@ msgid ""
 "undone."
 msgstr ""
 
 "undone."
 msgstr ""
 
-#: admin/void_transaction.php:222 includes/ui/ui_controls.inc:561
+#: admin/void_transaction.php:222 includes/ui/ui_controls.inc:586
 msgid "Proceed"
 msgstr ""
 
 msgid "Proceed"
 msgstr ""
 
@@ -2206,25 +2216,31 @@ msgid "The selected transaction was closed for edition and cannot be voided."
 msgstr ""
 
 #: admin/void_transaction.php:242 gl/accruals.php:32 gl/bank_transfer.php:110
 msgstr ""
 
 #: admin/void_transaction.php:242 gl/accruals.php:32 gl/bank_transfer.php:110
-#: gl/gl_journal.php:154 gl/manage/exchange_rates.php:33
-#: gl/manage/revaluate_currencies.php:50
+#: 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
 #: 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:89
-#: sales/sales_order_entry.php:340
+#: purchasing/supplier_payment.php:178
+#: purchasing/supplier_payment.php.orig:175
+#: sales/customer_credit_invoice.php:91 sales/sales_order_entry.php:342
+#: sales/manage/recurrent_invoices.php:41
+#: sales/manage/recurrent_invoices.php:46
+#: sales/manage/recurrent_invoices.php:51
 msgid "The entered date is invalid."
 msgstr ""
 
 #: admin/void_transaction.php:248 gl/accruals.php:38 gl/bank_transfer.php:116
 msgid "The entered date is invalid."
 msgstr ""
 
 #: admin/void_transaction.php:248 gl/accruals.php:38 gl/bank_transfer.php:116
-#: gl/gl_bank.php:256 gl/gl_journal.php:160
-#: gl/manage/revaluate_currencies.php:56 inventory/adjustments.php:114
+#: gl/gl_bank.php:266 gl/gl_journal.php:162
+#: gl/manage/revaluate_currencies.php:59 inventory/adjustments.php:116
 #: inventory/transfers.php:111 manufacturing/work_order_add_finished.php:104
 #: manufacturing/work_order_costs.php:89
 #: inventory/transfers.php:111 manufacturing/work_order_add_finished.php:104
 #: manufacturing/work_order_costs.php:89
-#: manufacturing/work_order_entry.php:159
+#: manufacturing/work_order_entry.php:160
 #: manufacturing/work_order_issue.php:85 purchasing/supplier_credit.php:176
 #: manufacturing/work_order_issue.php:85 purchasing/supplier_credit.php:176
-#: purchasing/supplier_invoice.php:174 purchasing/supplier_payment.php:185
-#: sales/create_recurrent_invoices.php:92 sales/credit_note_entry.php:159
-#: sales/customer_credit_invoice.php:93 sales/customer_payments.php:100
+#: purchasing/supplier_invoice.php:174 purchasing/supplier_payment.php:184
+#: purchasing/supplier_payment.php.orig:181
+#: sales/create_recurrent_invoices.php:108 sales/credit_note_entry.php:161
+#: sales/customer_credit_invoice.php:95 sales/customer_payments.php:100
+#: sales/customer_payments.php.orig:100
 msgid "The entered date is not in fiscal year."
 msgstr ""
 
 msgid "The entered date is not in fiscal year."
 msgstr ""
 
@@ -2293,7 +2309,7 @@ msgstr ""
 msgid "The language files folder "
 msgstr ""
 
 msgid "The language files folder "
 msgstr ""
 
-#: admin/db/maintenance_db.inc:385
+#: admin/db/maintenance_db.inc:387
 #, php-format
 msgid "SQL script execution failed in line %d: %s"
 msgstr ""
 #, php-format
 msgid "SQL script execution failed in line %d: %s"
 msgstr ""
@@ -2306,9 +2322,9 @@ msgstr ""
 msgid "users online"
 msgstr ""
 
 msgid "users online"
 msgstr ""
 
-#: admin/db/voiding_db.inc:107
-#: manufacturing/includes/db/work_orders_db.inc:494
-#: manufacturing/includes/db/work_orders_db.inc:519
+#: admin/db/voiding_db.inc:111
+#: manufacturing/includes/db/work_orders_db.inc:446
+#: manufacturing/includes/db/work_orders_db.inc:462
 #: sales/includes/db/sales_invoice_db.inc:205
 msgid "Voided."
 msgstr ""
 #: sales/includes/db/sales_invoice_db.inc:205
 msgid "Voided."
 msgstr ""
@@ -2508,8 +2524,8 @@ msgstr ""
 msgid "Ta&x Inquiry"
 msgstr ""
 
 msgid "Ta&x Inquiry"
 msgstr ""
 
-#: applications/generalledger.php:44 reporting/reports_main.php:294
-#: reporting/reports_main.php:339 reporting/reports_main.php:379
+#: applications/generalledger.php:44 reporting/reports_main.php:296
+#: reporting/reports_main.php:341 reporting/reports_main.php:381
 msgid "Trial &Balance"
 msgstr ""
 
 msgid "Trial &Balance"
 msgstr ""
 
@@ -2874,17 +2890,18 @@ msgstr ""
 msgid "The dimension reference must be entered."
 msgstr ""
 
 msgid "The dimension reference must be entered."
 msgstr ""
 
-#: dimensions/dimension_entry.php:123 gl/bank_transfer.php:162
-#: gl/gl_bank.php:244 gl/gl_journal.php:174
-#: gl/manage/revaluate_currencies.php:69 inventory/adjustments.php:101
+#: dimensions/dimension_entry.php:123 gl/bank_transfer.php:171
+#: gl/gl_bank.php:254 gl/gl_journal.php:176
+#: gl/manage/revaluate_currencies.php:72 inventory/adjustments.php:103
 #: inventory/transfers.php:99 manufacturing/work_order_add_finished.php:84
 #: inventory/transfers.php:99 manufacturing/work_order_add_finished.php:84
-#: manufacturing/work_order_entry.php:138
+#: 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
 #: 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:149 sales/customer_credit_invoice.php:106
-#: sales/customer_delivery.php:169 sales/customer_invoice.php:280
-#: sales/customer_payments.php:112 sales/sales_order_entry.php:409
+#: purchasing/supplier_invoice.php:154 purchasing/supplier_payment.php:207
+#: purchasing/supplier_payment.php.orig:204 sales/credit_note_entry.php:151
+#: sales/customer_credit_invoice.php:108 sales/customer_delivery.php:169
+#: sales/customer_invoice.php:282 sales/customer_payments.php:112
+#: sales/customer_payments.php.orig:112 sales/sales_order_entry.php:411
 msgid "The entered reference is already in use."
 msgstr ""
 
 msgid "The entered reference is already in use."
 msgstr ""
 
@@ -2892,8 +2909,8 @@ msgstr ""
 msgid "The dimension name must be entered."
 msgstr ""
 
 msgid "The dimension name must be entered."
 msgstr ""
 
-#: dimensions/dimension_entry.php:138 manufacturing/work_order_entry.php:153
-#: manufacturing/work_order_entry.php:233 purchasing/po_entry_items.php:235
+#: dimensions/dimension_entry.php:138 manufacturing/work_order_entry.php:154
+#: manufacturing/work_order_entry.php:234 purchasing/po_entry_items.php:235
 msgid "The date entered is in an invalid format."
 msgstr ""
 
 msgid "The date entered is in an invalid format."
 msgstr ""
 
@@ -2914,21 +2931,21 @@ msgid "Dimension Reference:"
 msgstr ""
 
 #: dimensions/dimension_entry.php:277 reporting/reports_main.php:34
 msgstr ""
 
 #: dimensions/dimension_entry.php:277 reporting/reports_main.php:34
-#: reporting/reports_main.php:59 reporting/reports_main.php:73
-#: reporting/reports_main.php:81 reporting/reports_main.php:133
-#: reporting/reports_main.php:196 reporting/reports_main.php:204
-#: reporting/reports_main.php:236 reporting/reports_main.php:247
-#: reporting/reports_main.php:258 reporting/reports_main.php:274
-#: reporting/reports_main.php:284 reporting/reports_main.php:295
-#: reporting/reports_main.php:307 reporting/reports_main.php:321
-#: reporting/reports_main.php:330 reporting/reports_main.php:340
-#: reporting/reports_main.php:351 reporting/reports_main.php:363
-#: reporting/reports_main.php:371 reporting/reports_main.php:380
-#: reporting/reports_main.php:388 reporting/reports_main.php:394
+#: reporting/reports_main.php:60 reporting/reports_main.php:74
+#: reporting/reports_main.php:82 reporting/reports_main.php:134
+#: reporting/reports_main.php:198 reporting/reports_main.php:206
+#: reporting/reports_main.php:238 reporting/reports_main.php:249
+#: reporting/reports_main.php:260 reporting/reports_main.php:276
+#: reporting/reports_main.php:286 reporting/reports_main.php:297
+#: reporting/reports_main.php:309 reporting/reports_main.php:323
+#: reporting/reports_main.php:332 reporting/reports_main.php:342
+#: reporting/reports_main.php:353 reporting/reports_main.php:365
+#: reporting/reports_main.php:373 reporting/reports_main.php:382
+#: reporting/reports_main.php:390 reporting/reports_main.php:396
 msgid "Start Date"
 msgstr ""
 
 msgid "Start Date"
 msgstr ""
 
-#: dimensions/dimension_entry.php:279 manufacturing/work_order_entry.php:419
+#: dimensions/dimension_entry.php:279 manufacturing/work_order_entry.php:420
 msgid "Date Required By"
 msgstr ""
 
 msgid "Date Required By"
 msgstr ""
 
@@ -3003,7 +3020,8 @@ msgstr ""
 #: gl/view/gl_trans_view.php:70 gl/includes/ui/gl_journal_ui.inc:84
 #: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90
 #: purchasing/inquiry/supplier_allocation_inquiry.php:133
 #: gl/view/gl_trans_view.php:70 gl/includes/ui/gl_journal_ui.inc:84
 #: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90
 #: purchasing/inquiry/supplier_allocation_inquiry.php:133
-#: purchasing/inquiry/supplier_inquiry.php:170 reporting/rep601.php:77
+#: purchasing/inquiry/supplier_inquiry.php:170
+#: purchasing/inquiry/supplier_inquiry.php.orig:170 reporting/rep601.php:77
 #: reporting/rep702.php:52 reporting/rep704.php:79 reporting/rep704.php:82
 #: reporting/rep704.php:85 reporting/rep708.php:178 reporting/rep708.php:179
 #: sales/inquiry/customer_allocation_inquiry.php:149
 #: reporting/rep702.php:52 reporting/rep704.php:79 reporting/rep704.php:82
 #: reporting/rep704.php:85 reporting/rep708.php:178 reporting/rep708.php:179
 #: sales/inquiry/customer_allocation_inquiry.php:149
@@ -3021,7 +3039,8 @@ msgstr ""
 #: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90
 #: includes/sysnames.inc:85
 #: purchasing/inquiry/supplier_allocation_inquiry.php:134
 #: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90
 #: includes/sysnames.inc:85
 #: purchasing/inquiry/supplier_allocation_inquiry.php:134
-#: purchasing/inquiry/supplier_inquiry.php:171 reporting/rep601.php:77
+#: purchasing/inquiry/supplier_inquiry.php:171
+#: purchasing/inquiry/supplier_inquiry.php.orig:171 reporting/rep601.php:77
 #: reporting/rep702.php:52 reporting/rep704.php:79 reporting/rep704.php:82
 #: reporting/rep704.php:85 reporting/rep708.php:178 reporting/rep708.php:179
 #: sales/inquiry/customer_allocation_inquiry.php:150
 #: reporting/rep702.php:52 reporting/rep704.php:79 reporting/rep704.php:82
 #: reporting/rep704.php:85 reporting/rep708.php:178 reporting/rep708.php:179
 #: sales/inquiry/customer_allocation_inquiry.php:150
@@ -3049,27 +3068,29 @@ msgid "Search Dimensions"
 msgstr ""
 
 #: dimensions/inquiry/search_dimensions.php:73 gl/bank_transfer.php:91
 msgstr ""
 
 #: dimensions/inquiry/search_dimensions.php:73 gl/bank_transfer.php:91
-#: gl/inquiry/journal_inquiry.php:45 gl/manage/revaluate_currencies.php:102
-#: gl/includes/ui/gl_bank_ui.inc:104 gl/includes/ui/gl_journal_ui.inc:30
-#: includes/ui/contacts_view.inc:94
+#: gl/inquiry/journal_inquiry.php:45 gl/manage/revaluate_currencies.php:105
+#: gl/includes/ui/gl_bank_ui.inc:25 gl/includes/ui/gl_bank_ui.inc.orig:25
+#: gl/includes/ui/gl_journal_ui.inc:30 includes/ui/contacts_view.inc:94
 #: inventory/includes/item_adjustments_ui.inc:35
 #: inventory/includes/stock_transfers_ui.inc:40
 #: manufacturing/search_work_orders.php:67
 #: manufacturing/work_order_add_finished.php:198
 #: 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:377
-#: manufacturing/work_order_entry.php:384
+#: 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
 #: 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:283 sales/customer_payments.php:258
+#: purchasing/supplier_payment.php:285
+#: purchasing/supplier_payment.php.orig:287 sales/customer_payments.php:258
+#: sales/customer_payments.php.orig:260
 msgid "Reference:"
 msgstr ""
 
 #: dimensions/inquiry/search_dimensions.php:75
 #: includes/ui/allocation_cart.inc:284 includes/ui/ui_lists.inc:1887
 msgid "Reference:"
 msgstr ""
 
 #: dimensions/inquiry/search_dimensions.php:75
 #: includes/ui/allocation_cart.inc:284 includes/ui/ui_lists.inc:1887
-#: reporting/rep101.php:112 reporting/rep102.php:88 reporting/rep104.php:95
+#: reporting/rep101.php:112 reporting/rep102.php:96 reporting/rep104.php:95
 #: reporting/rep104.php:99 reporting/rep105.php:93 reporting/rep105.php:97
 #: reporting/rep104.php:99 reporting/rep105.php:93 reporting/rep105.php:97
-#: reporting/rep201.php:100 reporting/rep202.php:90 reporting/rep203.php:72
+#: reporting/rep201.php:100 reporting/rep202.php:98 reporting/rep203.php:72
 #: reporting/rep204.php:75 reporting/rep301.php:87 reporting/rep301.php:94
 #: reporting/rep302.php:103 reporting/rep302.php:110 reporting/rep303.php:84
 #: reporting/rep303.php:91 reporting/rep304.php:96 reporting/rep304.php:103
 #: reporting/rep204.php:75 reporting/rep301.php:87 reporting/rep301.php:94
 #: reporting/rep302.php:103 reporting/rep302.php:110 reporting/rep303.php:84
 #: reporting/rep303.php:91 reporting/rep304.php:96 reporting/rep304.php:103
@@ -3080,20 +3101,25 @@ 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
 
 #: 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:23
-#: gl/includes/ui/gl_bank_ui.inc:53 inventory/inquiry/stock_movements.php:58
+#: gl/inquiry/profit_loss.php:163 gl/includes/ui/gl_bank_ui.inc:50
+#: gl/includes/ui/gl_bank_ui.inc:105 gl/includes/ui/gl_bank_ui.inc.orig:50
+#: gl/includes/ui/gl_bank_ui.inc.orig:105
+#: inventory/inquiry/stock_movements.php:58
 #: purchasing/inquiry/supplier_allocation_inquiry.php:50
 #: purchasing/inquiry/supplier_inquiry.php:49
 #: purchasing/inquiry/supplier_allocation_inquiry.php:50
 #: purchasing/inquiry/supplier_inquiry.php:49
+#: purchasing/inquiry/supplier_inquiry.php.orig:49
 #: sales/inquiry/customer_inquiry.php:46
 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
 #: 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:23
+#: gl/inquiry/profit_loss.php:164 gl/includes/ui/gl_bank_ui.inc:105
+#: gl/includes/ui/gl_bank_ui.inc.orig:105
 #: inventory/inquiry/stock_movements.php:59
 #: purchasing/inquiry/supplier_allocation_inquiry.php:51
 #: purchasing/inquiry/supplier_inquiry.php:50
 #: inventory/inquiry/stock_movements.php:59
 #: purchasing/inquiry/supplier_allocation_inquiry.php:51
 #: purchasing/inquiry/supplier_inquiry.php:50
+#: purchasing/inquiry/supplier_inquiry.php.orig:50
 #: sales/inquiry/customer_inquiry.php:47
 msgid "To:"
 msgstr ""
 #: sales/inquiry/customer_inquiry.php:47
 msgid "To:"
 msgstr ""
@@ -3114,10 +3140,11 @@ msgstr ""
 #: purchasing/view/view_supp_credit.php:48
 #: purchasing/view/view_supp_invoice.php:51
 #: purchasing/inquiry/supplier_allocation_inquiry.php:131
 #: purchasing/view/view_supp_credit.php:48
 #: purchasing/view/view_supp_invoice.php:51
 #: purchasing/inquiry/supplier_allocation_inquiry.php:131
-#: purchasing/inquiry/supplier_inquiry.php:168 reporting/rep101.php:130
+#: purchasing/inquiry/supplier_inquiry.php:168
+#: purchasing/inquiry/supplier_inquiry.php.orig:168 reporting/rep101.php:130
 #: reporting/rep201.php:118 reporting/rep203.php:91 reporting/rep501.php:85
 #: reporting/includes/doctext.inc:40 reporting/includes/doctext.inc:110
 #: reporting/rep201.php:118 reporting/rep203.php:91 reporting/rep501.php:85
 #: reporting/includes/doctext.inc:40 reporting/includes/doctext.inc:110
-#: sales/customer_invoice.php:424 sales/view/view_dispatch.php:97
+#: sales/customer_invoice.php:426 sales/view/view_dispatch.php:97
 #: sales/view/view_invoice.php:96
 #: sales/inquiry/customer_allocation_inquiry.php:146
 #: sales/inquiry/customer_inquiry.php:217
 #: sales/view/view_invoice.php:96
 #: sales/inquiry/customer_allocation_inquiry.php:146
 #: sales/inquiry/customer_inquiry.php:217
@@ -3159,7 +3186,7 @@ msgstr ""
 msgid "to:"
 msgstr ""
 
 msgid "to:"
 msgstr ""
 
-#: dimensions/view/view_dimension.php:86 gl/inquiry/balance_sheet.php:132
+#: dimensions/view/view_dimension.php:86 gl/inquiry/balance_sheet.php:131
 #: gl/inquiry/bank_inquiry.php:52 gl/inquiry/gl_account_inquiry.php:84
 #: gl/inquiry/gl_trial_balance.php:58 gl/inquiry/profit_loss.php:178
 #: gl/inquiry/tax_inquiry.php:63
 #: gl/inquiry/bank_inquiry.php:52 gl/inquiry/gl_account_inquiry.php:84
 #: gl/inquiry/gl_trial_balance.php:58 gl/inquiry/profit_loss.php:178
 #: gl/inquiry/tax_inquiry.php:63
@@ -3191,8 +3218,8 @@ 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/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:129
-#: gl/inquiry/balance_sheet.php:131 gl/inquiry/gl_account_inquiry.php:78
+#: gl/gl_budget.php:76 gl/inquiry/balance_sheet.php:128
+#: gl/inquiry/balance_sheet.php:130 gl/inquiry/gl_account_inquiry.php:78
 #: gl/inquiry/gl_account_inquiry.php:80 gl/inquiry/gl_account_inquiry.php:133
 #: gl/inquiry/gl_account_inquiry.php:135 gl/inquiry/gl_trial_balance.php:52
 #: gl/inquiry/gl_trial_balance.php:54 gl/inquiry/profit_loss.php:174
 #: gl/inquiry/gl_account_inquiry.php:80 gl/inquiry/gl_account_inquiry.php:133
 #: gl/inquiry/gl_account_inquiry.php:135 gl/inquiry/gl_trial_balance.php:52
 #: gl/inquiry/gl_trial_balance.php:54 gl/inquiry/profit_loss.php:174
@@ -3202,11 +3229,14 @@ msgstr ""
 #: 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/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:124
-#: gl/includes/ui/gl_bank_ui.inc:125 gl/includes/ui/gl_bank_ui.inc:127
-#: 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
+#: gl/view/gl_trans_view.php:66 gl/includes/ui/gl_bank_ui.inc:132
+#: gl/includes/ui/gl_bank_ui.inc:133 gl/includes/ui/gl_bank_ui.inc:135
+#: gl/includes/ui/gl_bank_ui.inc.orig:132
+#: gl/includes/ui/gl_bank_ui.inc.orig:133
+#: gl/includes/ui/gl_bank_ui.inc.orig:135 gl/includes/ui/gl_journal_ui.inc:83
+#: gl/includes/ui/gl_journal_ui.inc:84 gl/includes/ui/gl_journal_ui.inc:86
+#: includes/sysnames.inc:43 includes/sysnames.inc:165
+#: inventory/manage/item_categories.php:216
 #: inventory/manage/item_categories.php:218 inventory/manage/items.php:353
 #: inventory/manage/items.php:355 purchasing/includes/ui/invoice_ui.inc:245
 #: purchasing/includes/ui/invoice_ui.inc:247
 #: inventory/manage/item_categories.php:218 inventory/manage/items.php:353
 #: inventory/manage/items.php:355 purchasing/includes/ui/invoice_ui.inc:245
 #: purchasing/includes/ui/invoice_ui.inc:247
@@ -3218,16 +3248,16 @@ msgstr ""
 #: reporting/rep706.php:192 reporting/rep706.php:200 reporting/rep707.php:214
 #: reporting/rep707.php:216 reporting/rep707.php:224 reporting/rep708.php:187
 #: reporting/rep708.php:189 reporting/rep708.php:196
 #: reporting/rep706.php:192 reporting/rep706.php:200 reporting/rep707.php:214
 #: reporting/rep707.php:216 reporting/rep707.php:224 reporting/rep708.php:187
 #: reporting/rep708.php:189 reporting/rep708.php:196
-#: reporting/reports_main.php:262 reporting/reports_main.php:263
-#: reporting/reports_main.php:268 reporting/reports_main.php:269
-#: reporting/reports_main.php:276 reporting/reports_main.php:277
-#: reporting/reports_main.php:287 reporting/reports_main.php:288
-#: reporting/reports_main.php:299 reporting/reports_main.php:300
-#: reporting/reports_main.php:311 reporting/reports_main.php:316
-#: reporting/reports_main.php:323 reporting/reports_main.php:333
-#: reporting/reports_main.php:344 sales/customer_delivery.php:392
-#: sales/customer_delivery.php:400 sales/customer_invoice.php:399
-#: sales/customer_invoice.php:426 sales/manage/customers.php:234
+#: reporting/reports_main.php:264 reporting/reports_main.php:265
+#: reporting/reports_main.php:270 reporting/reports_main.php:271
+#: reporting/reports_main.php:278 reporting/reports_main.php:279
+#: reporting/reports_main.php:289 reporting/reports_main.php:290
+#: reporting/reports_main.php:301 reporting/reports_main.php:302
+#: reporting/reports_main.php:313 reporting/reports_main.php:318
+#: reporting/reports_main.php:325 reporting/reports_main.php:335
+#: reporting/reports_main.php:346 sales/customer_delivery.php:392
+#: sales/customer_delivery.php:400 sales/customer_invoice.php:401
+#: sales/customer_invoice.php:428 sales/manage/customers.php:234
 #: sales/manage/customers.php:236 sales/includes/ui/sales_credit_ui.inc:132
 #: sales/includes/ui/sales_credit_ui.inc:137
 #: sales/includes/ui/sales_order_ui.inc:451
 #: sales/manage/customers.php:236 sales/includes/ui/sales_credit_ui.inc:132
 #: sales/includes/ui/sales_credit_ui.inc:137
 #: sales/includes/ui/sales_order_ui.inc:451
@@ -3242,9 +3272,12 @@ msgstr ""
 #: 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_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:125
-#: gl/includes/ui/gl_bank_ui.inc:128 gl/includes/ui/gl_bank_ui.inc:131
-#: gl/includes/ui/gl_bank_ui.inc:271 gl/includes/ui/gl_journal_ui.inc:84
+#: gl/view/gl_trans_view.php:70 gl/includes/ui/gl_bank_ui.inc:133
+#: gl/includes/ui/gl_bank_ui.inc:136 gl/includes/ui/gl_bank_ui.inc:139
+#: gl/includes/ui/gl_bank_ui.inc:279 gl/includes/ui/gl_bank_ui.inc.orig:133
+#: gl/includes/ui/gl_bank_ui.inc.orig:136
+#: gl/includes/ui/gl_bank_ui.inc.orig:139
+#: gl/includes/ui/gl_bank_ui.inc.orig:279 gl/includes/ui/gl_journal_ui.inc:84
 #: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90
 #: gl/includes/ui/gl_journal_ui.inc:240
 #: inventory/includes/item_adjustments_ui.inc:181
 #: 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
@@ -3253,8 +3286,8 @@ msgstr ""
 #: purchasing/includes/ui/invoice_ui.inc:245
 #: purchasing/includes/ui/invoice_ui.inc:247
 #: purchasing/includes/ui/invoice_ui.inc:249
 #: purchasing/includes/ui/invoice_ui.inc:245
 #: purchasing/includes/ui/invoice_ui.inc:247
 #: purchasing/includes/ui/invoice_ui.inc:249
-#: sales/customer_credit_invoice.php:364 sales/customer_delivery.php:516
-#: sales/customer_invoice.php:555 sales/includes/ui/sales_credit_ui.inc:339
+#: sales/customer_credit_invoice.php:366 sales/customer_delivery.php:516
+#: sales/customer_invoice.php:557 sales/includes/ui/sales_credit_ui.inc:339
 msgid "Memo"
 msgstr ""
 
 msgid "Memo"
 msgstr ""
 
@@ -3275,8 +3308,8 @@ msgid "Bi-weekly"
 msgstr ""
 
 #: gl/accruals.php:182 gl/manage/gl_quick_entries.php:240
 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:98
-#: sales/manage/recurrent_invoices.php:85
+#: gl/includes/ui/gl_journal_ui.inc:57 sales/create_recurrent_invoices.php:115
+#: sales/manage/recurrent_invoices.php:102
 msgid "Monthly"
 msgstr ""
 
 msgid "Monthly"
 msgstr ""
 
@@ -3305,16 +3338,18 @@ msgstr ""
 #: 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/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:125 gl/includes/ui/gl_bank_ui.inc:128
-#: gl/includes/ui/gl_bank_ui.inc:131 includes/sysnames.inc:132
+#: gl/includes/ui/gl_bank_ui.inc:133 gl/includes/ui/gl_bank_ui.inc:136
+#: gl/includes/ui/gl_bank_ui.inc:139 gl/includes/ui/gl_bank_ui.inc.orig:133
+#: gl/includes/ui/gl_bank_ui.inc.orig:136
+#: gl/includes/ui/gl_bank_ui.inc.orig:139 includes/sysnames.inc:132
 #: includes/ui/allocation_cart.inc:263 includes/ui/ui_lists.inc:1152
 #: manufacturing/includes/manufacturing_ui.inc:236
 #: purchasing/includes/ui/invoice_ui.inc:245
 #: purchasing/includes/ui/invoice_ui.inc:247
 #: purchasing/includes/ui/invoice_ui.inc:249
 #: purchasing/view/view_supp_payment.php:60
 #: includes/ui/allocation_cart.inc:263 includes/ui/ui_lists.inc:1152
 #: manufacturing/includes/manufacturing_ui.inc:236
 #: purchasing/includes/ui/invoice_ui.inc:245
 #: purchasing/includes/ui/invoice_ui.inc:247
 #: purchasing/includes/ui/invoice_ui.inc:249
 #: purchasing/view/view_supp_payment.php:60
-#: purchasing/view/view_supp_payment.php:69 reporting/rep102.php:228
-#: reporting/rep202.php:234 reporting/rep706.php:303 reporting/rep707.php:321
+#: purchasing/view/view_supp_payment.php:69 reporting/rep102.php:243
+#: reporting/rep202.php:249 reporting/rep706.php:303 reporting/rep707.php:321
 #: reporting/rep710.php:76 reporting/includes/doctext.inc:152
 #: sales/view/view_receipt.php:44
 msgid "Amount"
 #: reporting/rep710.php:76 reporting/includes/doctext.inc:152
 #: sales/view/view_receipt.php:44
 msgid "Amount"
@@ -3350,7 +3385,8 @@ msgstr ""
 
 #: gl/bank_account_reconcile.php:35 gl/bank_transfer.php:30 gl/gl_bank.php:48
 #: gl/inquiry/bank_inquiry.php:30 purchasing/supplier_payment.php:42
 
 #: gl/bank_account_reconcile.php:35 gl/bank_transfer.php:30 gl/gl_bank.php:48
 #: gl/inquiry/bank_inquiry.php:30 purchasing/supplier_payment.php:42
-#: sales/customer_payments.php:39
+#: purchasing/supplier_payment.php.orig:42 sales/customer_payments.php:39
+#: sales/customer_payments.php.orig:39
 msgid "There are no bank accounts defined in the system."
 msgstr ""
 
 msgid "There are no bank accounts defined in the system."
 msgstr ""
 
@@ -3419,11 +3455,11 @@ msgstr ""
 msgid "Transfer between Bank Accounts"
 msgstr ""
 
 msgid "Transfer between Bank Accounts"
 msgstr ""
 
-#: gl/bank_transfer.php:39 gl/manage/revaluate_currencies.php:34
+#: gl/bank_transfer.php:39 gl/manage/revaluate_currencies.php:35
 msgid "Transfer has been entered"
 msgstr ""
 
 msgid "Transfer has been entered"
 msgstr ""
 
-#: gl/bank_transfer.php:41 gl/manage/revaluate_currencies.php:36
+#: gl/bank_transfer.php:41 gl/manage/revaluate_currencies.php:37
 msgid "&View the GL Journal Entries for this Transfer"
 msgstr ""
 
 msgid "&View the GL Journal Entries for this Transfer"
 msgstr ""
 
@@ -3444,12 +3480,14 @@ msgid "Transfer Date:"
 msgstr ""
 
 #: gl/bank_transfer.php:78 gl/bank_transfer.php:85
 msgstr ""
 
 #: gl/bank_transfer.php:78 gl/bank_transfer.php:85
-#: sales/customer_payments.php:289
+#: sales/customer_payments.php:290 sales/customer_payments.php.orig:291
 msgid "Amount:"
 msgstr ""
 
 #: gl/bank_transfer.php:79 gl/bank_transfer.php:86
 msgid "Amount:"
 msgstr ""
 
 #: gl/bank_transfer.php:79 gl/bank_transfer.php:86
-#: purchasing/supplier_payment.php:296 sales/customer_payments.php:274
+#: purchasing/supplier_payment.php:298
+#: purchasing/supplier_payment.php.orig:300 sales/customer_payments.php:274
+#: sales/customer_payments.php.orig:276
 msgid "Bank Charge:"
 msgstr ""
 
 msgid "Bank Charge:"
 msgstr ""
 
@@ -3457,39 +3495,50 @@ msgstr ""
 msgid "Enter Transfer"
 msgstr ""
 
 msgid "Enter Transfer"
 msgstr ""
 
-#: gl/bank_transfer.php:123 gl/bank_transfer.php:144
-#: purchasing/supplier_payment.php:130 purchasing/supplier_payment.php:136
+#: gl/bank_transfer.php:123 gl/bank_transfer.php:153
+#: purchasing/supplier_payment.php:129 purchasing/supplier_payment.php:135
+#: purchasing/supplier_payment.php.orig:126
+#: purchasing/supplier_payment.php.orig:132
 msgid "The entered amount is invalid or less than zero."
 msgstr ""
 
 msgid "The entered amount is invalid or less than zero."
 msgstr ""
 
-#: gl/bank_transfer.php:128 gl/gl_bank.php:222
+#: gl/bank_transfer.php:128 gl/gl_bank.php:224
 msgid "The total bank amount cannot be 0."
 msgstr ""
 
 msgid "The total bank amount cannot be 0."
 msgstr ""
 
-#: gl/bank_transfer.php:137
+#: gl/bank_transfer.php:139
 #, php-format
 msgid "The total bank amount exceeds allowed limit (%s) for source account."
 msgstr ""
 
 #, php-format
 msgid "The total bank amount exceeds allowed limit (%s) for source account."
 msgstr ""
 
-#: gl/bank_transfer.php:149 purchasing/supplier_payment.php:144
-#: sales/customer_payments.php:131
+#: gl/bank_transfer.php:145 gl/gl_bank.php:241
+#, 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:143
+#: purchasing/supplier_payment.php.orig:140 sales/customer_payments.php:131
+#: sales/customer_payments.php.orig:131
 msgid ""
 "The Bank Charge Account has not been set in System and General GL Setup."
 msgstr ""
 
 msgid ""
 "The Bank Charge Account has not been set in System and General GL Setup."
 msgstr ""
 
-#: gl/bank_transfer.php:155 gl/gl_bank.php:238 gl/gl_journal.php:166
-#: gl/manage/revaluate_currencies.php:62 inventory/adjustments.php:94
+#: gl/bank_transfer.php:164 gl/gl_bank.php:248 gl/gl_journal.php:168
+#: gl/manage/revaluate_currencies.php:65 inventory/adjustments.php:96
 #: inventory/transfers.php:93 manufacturing/work_order_add_finished.php:77
 #: inventory/transfers.php:93 manufacturing/work_order_add_finished.php:77
-#: manufacturing/work_order_entry.php:131
+#: manufacturing/work_order_entry.php:132
 #: manufacturing/work_order_issue.php:91 purchasing/po_receive_items.php:188
 #: manufacturing/work_order_issue.php:91 purchasing/po_receive_items.php:188
-#: purchasing/supplier_payment.php:201 sales/credit_note_entry.php:145
-#: sales/customer_credit_invoice.php:100 sales/customer_delivery.php:163
-#: sales/customer_invoice.php:274 sales/customer_payments.php:106
-#: sales/sales_order_entry.php:403
+#: purchasing/supplier_payment.php:200
+#: purchasing/supplier_payment.php.orig:197 sales/credit_note_entry.php:147
+#: sales/customer_credit_invoice.php:102 sales/customer_delivery.php:163
+#: sales/customer_invoice.php:276 sales/customer_payments.php:106
+#: sales/customer_payments.php.orig:106 sales/sales_order_entry.php:405
 msgid "You must enter a reference."
 msgstr ""
 
 msgid "You must enter a reference."
 msgstr ""
 
-#: gl/bank_transfer.php:169
+#: gl/bank_transfer.php:178
 msgid "The source and destination bank accouts cannot be the same."
 msgstr ""
 
 msgid "The source and destination bank accouts cannot be the same."
 msgstr ""
 
@@ -3514,85 +3563,95 @@ msgstr ""
 msgid "Payment %d has been entered"
 msgstr ""
 
 msgid "Payment %d has been entered"
 msgstr ""
 
-#: gl/gl_bank.php:74 gl/gl_bank.php:90
+#: gl/gl_bank.php:74 gl/gl_bank.php:92
 msgid "&View the GL Postings for this Payment"
 msgstr ""
 
 msgid "&View the GL Postings for this Payment"
 msgstr ""
 
-#: gl/gl_bank.php:76 gl/gl_bank.php:92
+#: gl/gl_bank.php:76 gl/gl_bank.php:94
 msgid "Enter Another &Payment"
 msgstr ""
 
 msgid "Enter Another &Payment"
 msgstr ""
 
-#: gl/gl_bank.php:78 gl/gl_bank.php:94
+#: gl/gl_bank.php:78 gl/gl_bank.php:96
 msgid "Enter A &Deposit"
 msgstr ""
 
 msgid "Enter A &Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:104
+#: gl/gl_bank.php:80 gl/gl_journal.php:61 inventory/adjustments.php:50
+#: manufacturing/work_order_entry.php:68 purchasing/po_entry_items.php:109
+#: purchasing/po_entry_items.php:133 purchasing/supplier_credit.php:49
+#: purchasing/supplier_invoice.php:52 sales/credit_note_entry.php:77
+#: sales/customer_credit_invoice.php:62 sales/customer_invoice.php:66
+#: sales/sales_order_entry.php:226
+msgid "Add an Attachment"
+msgstr ""
+
+#: gl/gl_bank.php:106
 #, php-format
 msgid "Deposit %d has been entered"
 msgstr ""
 
 #, php-format
 msgid "Deposit %d has been entered"
 msgstr ""
 
-#: gl/gl_bank.php:106
+#: gl/gl_bank.php:108
 msgid "View the GL Postings for this Deposit"
 msgstr ""
 
 msgid "View the GL Postings for this Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:108
+#: gl/gl_bank.php:110
 msgid "Enter Another Deposit"
 msgstr ""
 
 msgid "Enter Another Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:110
+#: gl/gl_bank.php:112
 msgid "Enter A Payment"
 msgstr ""
 
 msgid "Enter A Payment"
 msgstr ""
 
-#: gl/gl_bank.php:121
+#: gl/gl_bank.php:123
 msgid "&View the GL Postings for this Deposit"
 msgstr ""
 
 msgid "&View the GL Postings for this Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:123
+#: gl/gl_bank.php:125
 msgid "Enter Another &Deposit"
 msgstr ""
 
 msgid "Enter Another &Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:125
+#: gl/gl_bank.php:127
 msgid "Enter A &Payment"
 msgstr ""
 
 msgid "Enter A &Payment"
 msgstr ""
 
-#: gl/gl_bank.php:216
+#: gl/gl_bank.php:218
 msgid "You must enter at least one payment line."
 msgstr ""
 
 msgid "You must enter at least one payment line."
 msgstr ""
 
-#: gl/gl_bank.php:231 purchasing/supplier_payment.php:194
+#: gl/gl_bank.php:235 purchasing/supplier_payment.php:193
+#: purchasing/supplier_payment.php.orig:190
 #, php-format
 msgid "The total bank amount exceeds allowed limit (%s)."
 msgstr ""
 
 #, php-format
 msgid "The total bank amount exceeds allowed limit (%s)."
 msgstr ""
 
-#: gl/gl_bank.php:250
+#: gl/gl_bank.php:260
 msgid "The entered date for the payment is invalid."
 msgstr ""
 
 msgid "The entered date for the payment is invalid."
 msgstr ""
 
-#: gl/gl_bank.php:262
+#: gl/gl_bank.php:272
 msgid "You have to select customer and customer branch."
 msgstr ""
 
 msgid "You have to select customer and customer branch."
 msgstr ""
 
-#: gl/gl_bank.php:266
+#: gl/gl_bank.php:276
 msgid "You have to select supplier."
 msgstr ""
 
 msgid "You have to select supplier."
 msgstr ""
 
-#: gl/gl_bank.php:312
+#: gl/gl_bank.php:322
 msgid "The amount entered is not a valid number or is less than zero."
 msgstr ""
 
 msgid "The amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: gl/gl_bank.php:384
+#: gl/gl_bank.php:394
 msgid "Payment Items"
 msgstr ""
 
 msgid "Payment Items"
 msgstr ""
 
-#: gl/gl_bank.php:384
+#: gl/gl_bank.php:394
 msgid "Deposit Items"
 msgstr ""
 
 msgid "Deposit Items"
 msgstr ""
 
-#: gl/gl_bank.php:392
+#: gl/gl_bank.php:402
 msgid "Process Payment"
 msgstr ""
 
 msgid "Process Payment"
 msgstr ""
 
-#: gl/gl_bank.php:392
+#: gl/gl_bank.php:402
 msgid "Process Deposit"
 msgstr ""
 
 msgid "Process Deposit"
 msgstr ""
 
@@ -3601,7 +3660,6 @@ msgid "Budget Entry"
 msgstr ""
 
 #: gl/gl_budget.php:26 gl/manage/gl_accounts.php:23
 msgstr ""
 
 #: gl/gl_budget.php:26 gl/manage/gl_accounts.php:23
-#: gl/manage/gl_accounts.php.orig:23
 msgid ""
 "There are no account groups defined. Please define at least one account "
 "group before entering accounts."
 msgid ""
 "There are no account groups defined. Please define at least one account "
 "group before entering accounts."
@@ -3616,8 +3674,7 @@ msgid "The Budget has been deleted."
 msgstr ""
 
 #: gl/gl_budget.php:64 gl/manage/gl_accounts.php:231
 msgstr ""
 
 #: gl/gl_budget.php:64 gl/manage/gl_accounts.php:231
-#: gl/manage/gl_accounts.php:241 gl/manage/gl_accounts.php.orig:231
-#: gl/manage/gl_accounts.php.orig:241
+#: gl/manage/gl_accounts.php:241
 msgid "Account Code:"
 msgstr ""
 
 msgid "Account Code:"
 msgstr ""
 
@@ -3646,12 +3703,13 @@ msgstr ""
 msgid "Last Year"
 msgstr ""
 
 msgid "Last Year"
 msgstr ""
 
-#: gl/gl_budget.php:127 gl/inquiry/balance_sheet.php:99
-#: gl/inquiry/balance_sheet.php:206 gl/inquiry/balance_sheet.php:237
+#: gl/gl_budget.php:127 gl/inquiry/balance_sheet.php:98
+#: gl/inquiry/balance_sheet.php:205 gl/inquiry/balance_sheet.php:236
 #: gl/inquiry/gl_trial_balance.php:209 gl/inquiry/profit_loss.php:115
 #: gl/inquiry/profit_loss.php:283 gl/view/gl_deposit_view.php:132
 #: gl/view/gl_payment_view.php:131 gl/view/gl_trans_view.php:106
 #: gl/inquiry/gl_trial_balance.php:209 gl/inquiry/profit_loss.php:115
 #: gl/inquiry/profit_loss.php:283 gl/view/gl_deposit_view.php:132
 #: gl/view/gl_payment_view.php:131 gl/view/gl_trans_view.php:106
-#: gl/includes/ui/gl_bank_ui.inc:174 gl/includes/ui/gl_journal_ui.inc:141
+#: gl/includes/ui/gl_bank_ui.inc:182 gl/includes/ui/gl_bank_ui.inc.orig:182
+#: gl/includes/ui/gl_journal_ui.inc:141
 #: inventory/includes/item_adjustments_ui.inc:63
 #: inventory/includes/item_adjustments_ui.inc:102
 #: manufacturing/includes/manufacturing_ui.inc:178
 #: inventory/includes/item_adjustments_ui.inc:63
 #: inventory/includes/item_adjustments_ui.inc:102
 #: manufacturing/includes/manufacturing_ui.inc:178
@@ -3670,8 +3728,8 @@ msgstr ""
 #: reporting/rep706.php:249 reporting/rep706.php:284 reporting/rep707.php:115
 #: reporting/rep707.php:291 reporting/rep708.php:234
 #: reporting/includes/doctext.inc:105 reporting/includes/doctext.inc:113
 #: reporting/rep706.php:249 reporting/rep706.php:284 reporting/rep707.php:115
 #: reporting/rep707.php:291 reporting/rep708.php:234
 #: reporting/includes/doctext.inc:105 reporting/includes/doctext.inc:113
-#: sales/customer_credit_invoice.php:281 sales/customer_delivery.php:430
-#: sales/customer_invoice.php:447
+#: sales/customer_credit_invoice.php:283 sales/customer_delivery.php:430
+#: sales/customer_invoice.php:449
 #: 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/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
@@ -3695,7 +3753,7 @@ msgstr ""
 msgid "Journal entry has been entered"
 msgstr ""
 
 msgid "Journal entry has been entered"
 msgstr ""
 
-#: gl/gl_journal.php:56 gl/gl_journal.php:69
+#: gl/gl_journal.php:56 gl/gl_journal.php:71
 msgid "&View this Journal Entry"
 msgstr ""
 
 msgid "&View this Journal Entry"
 msgstr ""
 
@@ -3703,69 +3761,69 @@ msgstr ""
 msgid "Enter &New Journal Entry"
 msgstr ""
 
 msgid "Enter &New Journal Entry"
 msgstr ""
 
-#: gl/gl_journal.php:67
+#: gl/gl_journal.php:69
 msgid "Journal entry has been updated"
 msgstr ""
 
 msgid "Journal entry has been updated"
 msgstr ""
 
-#: gl/gl_journal.php:71
+#: gl/gl_journal.php:73
 msgid "Return to Journal &Inquiry"
 msgstr ""
 
 msgid "Return to Journal &Inquiry"
 msgstr ""
 
-#: gl/gl_journal.php:84
+#: gl/gl_journal.php:86
 msgid ""
 "You can edit directly only journal entries created via Journal Entry page."
 msgstr ""
 
 msgid ""
 "You can edit directly only journal entries created via Journal Entry page."
 msgstr ""
 
-#: gl/gl_journal.php:85
+#: gl/gl_journal.php:87
 msgid "Entry &New Journal Entry"
 msgstr ""
 
 msgid "Entry &New Journal Entry"
 msgstr ""
 
-#: gl/gl_journal.php:141
+#: gl/gl_journal.php:143
 msgid "You must enter at least one journal line."
 msgstr ""
 
 msgid "You must enter at least one journal line."
 msgstr ""
 
-#: gl/gl_journal.php:147
+#: gl/gl_journal.php:149
 msgid ""
 "The journal must balance (debits equal to credits) before it can be "
 "processed."
 msgstr ""
 
 msgid ""
 "The journal must balance (debits equal to credits) before it can be "
 "processed."
 msgstr ""
 
-#: gl/gl_journal.php:209 gl/gl_journal.php:216
+#: gl/gl_journal.php:211 gl/gl_journal.php:218
 msgid "Dimension is closed."
 msgstr ""
 
 msgid "Dimension is closed."
 msgstr ""
 
-#: gl/gl_journal.php:223
+#: gl/gl_journal.php:225
 msgid "You must enter either a debit amount or a credit amount."
 msgstr ""
 
 msgid "You must enter either a debit amount or a credit amount."
 msgstr ""
 
-#: gl/gl_journal.php:230
+#: gl/gl_journal.php:232
 msgid "The debit amount entered is not a valid number or is less than zero."
 msgstr ""
 
 msgid "The debit amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: gl/gl_journal.php:235
+#: gl/gl_journal.php:237
 msgid "The credit amount entered is not a valid number or is less than zero."
 msgstr ""
 
 msgid "The credit amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: gl/gl_journal.php:241 includes/ui/ui_view.inc:655
+#: gl/gl_journal.php:243 includes/ui/ui_view.inc:655
 #: purchasing/supplier_credit.php:119 purchasing/supplier_invoice.php:119
 msgid "Cannot post to GL account used by more than one tax type."
 msgstr ""
 
 #: purchasing/supplier_credit.php:119 purchasing/supplier_invoice.php:119
 msgid "Cannot post to GL account used by more than one tax type."
 msgstr ""
 
-#: gl/gl_journal.php:248
+#: gl/gl_journal.php:250
 msgid ""
 "You cannot make a journal entry for a bank account. Please use one of the "
 "banking functions for bank transactions."
 msgstr ""
 
 msgid ""
 "You cannot make a journal entry for a bank account. Please use one of the "
 "banking functions for bank transactions."
 msgstr ""
 
-#: gl/gl_journal.php:327
+#: gl/gl_journal.php:329
 msgid "Rows"
 msgstr ""
 
 msgid "Rows"
 msgstr ""
 
-#: gl/gl_journal.php:333
+#: gl/gl_journal.php:335
 msgid "Process Journal Entry"
 msgstr ""
 
 msgid "Process Journal Entry"
 msgstr ""
 
-#: gl/gl_journal.php:334
+#: gl/gl_journal.php:336
 msgid "Process journal entry only if debits equal to credits"
 msgstr ""
 
 msgid "Process journal entry only if debits equal to credits"
 msgstr ""
 
@@ -3773,26 +3831,26 @@ msgstr ""
 msgid "Balance Sheet Drilldown"
 msgstr ""
 
 msgid "Balance Sheet Drilldown"
 msgstr ""
 
-#: gl/inquiry/balance_sheet.php:127
+#: gl/inquiry/balance_sheet.php:126
 msgid "As at:"
 msgstr ""
 
 msgid "As at:"
 msgstr ""
 
-#: gl/inquiry/balance_sheet.php:229 gl/inquiry/profit_loss.php:294
+#: 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 ""
 
 #: 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:237 includes/sysnames.inc:120
+#: gl/inquiry/balance_sheet.php:236 includes/sysnames.inc:120
 #: reporting/rep706.php:284
 msgid "Liabilities"
 msgstr ""
 
 #: reporting/rep706.php:284
 msgid "Liabilities"
 msgstr ""
 
-#: gl/inquiry/balance_sheet.php:237 reporting/rep706.php:284
+#: gl/inquiry/balance_sheet.php:236 reporting/rep706.php:284
 msgid " and "
 msgstr ""
 
 msgid " and "
 msgstr ""
 
-#: gl/inquiry/balance_sheet.php:237 reporting/rep706.php:284
+#: gl/inquiry/balance_sheet.php:236 reporting/rep706.php:284
 msgid "Equities"
 msgstr ""
 
 msgid "Equities"
 msgstr ""
 
@@ -3840,11 +3898,18 @@ msgstr ""
 msgid "No zero values"
 msgstr ""
 
 msgid "No zero values"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:56 reporting/reports_main.php:298
-#: reporting/reports_main.php:343 reporting/reports_main.php:383
+#: gl/inquiry/gl_trial_balance.php:56 reporting/reports_main.php:300
+#: reporting/reports_main.php:345 reporting/reports_main.php:385
 msgid "Only balances"
 msgstr ""
 
 msgid "Only balances"
 msgstr ""
 
+#: gl/inquiry/gl_trial_balance.php:89 gl/inquiry/gl_trial_balance.php:141
+#: reporting/rep706.php:302 reporting/rep707.php:320 reporting/rep708.php:50
+#: reporting/rep708.php:116 sales/create_recurrent_invoices.php:115
+#: sales/manage/recurrent_invoices.php:102
+msgid "Group"
+msgstr ""
+
 #: gl/inquiry/gl_trial_balance.php:158
 msgid "The from date cannot be bigger than the fiscal year end."
 msgstr ""
 #: gl/inquiry/gl_trial_balance.php:158
 msgid "The from date cannot be bigger than the fiscal year end."
 msgstr ""
@@ -3865,6 +3930,10 @@ msgstr ""
 msgid "This Period"
 msgstr ""
 
 msgid "This Period"
 msgstr ""
 
+#: gl/inquiry/gl_trial_balance.php:192
+msgid "Class"
+msgstr ""
+
 #: gl/inquiry/gl_trial_balance.php:227 reporting/rep708.php:264
 msgid ""
 "The Opening Balance is not in balance, probably due to a non closed Previous "
 #: gl/inquiry/gl_trial_balance.php:227 reporting/rep708.php:264
 msgid ""
 "The Opening Balance is not in balance, probably due to a non closed Previous "
@@ -3892,7 +3961,7 @@ msgid "Trans #"
 msgstr ""
 
 #: gl/inquiry/journal_inquiry.php:127 reporting/rep710.php:75
 msgstr ""
 
 #: gl/inquiry/journal_inquiry.php:127 reporting/rep710.php:75
-#: reporting/rep710.php:85 reporting/reports_main.php:397
+#: reporting/rep710.php:85 reporting/reports_main.php:399
 msgid "User"
 msgstr ""
 
 msgid "User"
 msgstr ""
 
@@ -3915,8 +3984,8 @@ msgstr ""
 msgid "Budget"
 msgstr ""
 
 msgid "Budget"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:169 reporting/reports_main.php:286
-#: reporting/reports_main.php:332 reporting/reports_main.php:373
+#: gl/inquiry/profit_loss.php:169 reporting/reports_main.php:288
+#: reporting/reports_main.php:334 reporting/reports_main.php:375
 msgid "Compare to"
 msgstr ""
 
 msgid "Compare to"
 msgstr ""
 
@@ -3964,7 +4033,7 @@ msgstr ""
 msgid "Total payable or refund"
 msgstr ""
 
 msgid "Total payable or refund"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:16 reporting/reports_main.php:235
+#: gl/manage/bank_accounts.php:16 reporting/reports_main.php:237
 msgid "Bank Accounts"
 msgstr ""
 
 msgid "Bank Accounts"
 msgstr ""
 
@@ -4008,12 +4077,15 @@ msgstr ""
 #: purchasing/inquiry/supplier_inquiry.php:72
 #: purchasing/inquiry/supplier_inquiry.php:169
 #: purchasing/inquiry/supplier_inquiry.php:180
 #: purchasing/inquiry/supplier_inquiry.php:72
 #: purchasing/inquiry/supplier_inquiry.php:169
 #: purchasing/inquiry/supplier_inquiry.php:180
+#: purchasing/inquiry/supplier_inquiry.php.orig:72
+#: purchasing/inquiry/supplier_inquiry.php.orig:169
+#: purchasing/inquiry/supplier_inquiry.php.orig:180
 #: purchasing/allocations/supplier_allocation_main.php:99
 #: purchasing/allocations/supplier_allocation_main.php:107
 #: purchasing/allocations/supplier_allocation_main.php:99
 #: purchasing/allocations/supplier_allocation_main.php:107
-#: reporting/rep101.php:138 reporting/rep102.php:123 reporting/rep102.php:128
-#: reporting/rep104.php:114 reporting/rep201.php:126 reporting/rep202.php:126
-#: reporting/rep203.php:99 sales/customer_credit_invoice.php:237
-#: sales/customer_delivery.php:337 sales/customer_invoice.php:396
+#: reporting/rep101.php:138 reporting/rep102.php:133 reporting/rep102.php:139
+#: reporting/rep104.php:114 reporting/rep201.php:126 reporting/rep202.php:136
+#: reporting/rep203.php:99 sales/customer_credit_invoice.php:239
+#: sales/customer_delivery.php:337 sales/customer_invoice.php:398
 #: sales/allocations/customer_allocation_main.php:98
 #: sales/allocations/customer_allocation_main.php:106
 #: sales/view/view_credit.php:70 sales/view/view_dispatch.php:86
 #: 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
@@ -4279,7 +4351,6 @@ msgid "Class Name"
 msgstr ""
 
 #: gl/manage/gl_account_classes.php:110 gl/manage/gl_account_types.php:129
 msgstr ""
 
 #: gl/manage/gl_account_classes.php:110 gl/manage/gl_account_types.php:129
-#: gl/manage/gl_account_types.php.orig:122
 msgid "Class Type"
 msgstr ""
 
 msgid "Class Type"
 msgstr ""
 
@@ -4297,133 +4368,131 @@ msgid "Class Name:"
 msgstr ""
 
 #: gl/manage/gl_account_classes.php:171 gl/manage/gl_account_types.php:193
 msgstr ""
 
 #: gl/manage/gl_account_classes.php:171 gl/manage/gl_account_types.php:193
-#: gl/manage/gl_account_types.php.orig:186
 msgid "Class Type:"
 msgstr ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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:81
 msgid "The account belongs to a bank account and cannot be inactivated."
 msgstr ""
 
 msgid "The account belongs to a bank account and cannot be inactivated."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:90 gl/manage/gl_accounts.php.orig:90
+#: gl/manage/gl_accounts.php:90
 msgid "Account data has been updated."
 msgstr ""
 
 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:99
 msgid "New account has been added."
 msgstr ""
 
 msgid "New account has been added."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:117 gl/manage/gl_accounts.php.orig:117
+#: gl/manage/gl_accounts.php:117
 msgid ""
 "Cannot delete this account because transactions have been created using this "
 "account."
 msgstr ""
 
 msgid ""
 "Cannot delete this account because transactions have been created using this "
 "account."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:123 gl/manage/gl_accounts.php.orig: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 ""
 
 msgid ""
 "Cannot delete this account because it is used as one of the company default "
 "GL accounts."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:129 gl/manage/gl_accounts.php.orig:129
+#: gl/manage/gl_accounts.php:129
 msgid "Cannot delete this account because it is used by a bank account."
 msgstr ""
 
 msgid "Cannot delete this account because it is used by a bank account."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:135 gl/manage/gl_accounts.php.orig:135
+#: gl/manage/gl_accounts.php:135
 msgid ""
 "Cannot delete this account because it is used by one or more Item Categories."
 msgstr ""
 
 msgid ""
 "Cannot delete this account because it is used by one or more Item Categories."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:141 gl/manage/gl_accounts.php.orig:141
+#: gl/manage/gl_accounts.php:141
 msgid "Cannot delete this account because it is used by one or more Items."
 msgstr ""
 
 msgid "Cannot delete this account because it is used by one or more Items."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:147 gl/manage/gl_accounts.php.orig:147
+#: gl/manage/gl_accounts.php:147
 msgid "Cannot delete this account because it is used by one or more Taxes."
 msgstr ""
 
 msgid "Cannot delete this account because it is used by one or more Taxes."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:153 gl/manage/gl_accounts.php.orig:153
+#: gl/manage/gl_accounts.php:153
 msgid ""
 "Cannot delete this account because it is used by one or more Customer "
 "Branches."
 msgstr ""
 
 msgid ""
 "Cannot delete this account because it is used by one or more Customer "
 "Branches."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:159 gl/manage/gl_accounts.php.orig:159
+#: gl/manage/gl_accounts.php:159
 msgid "Cannot delete this account because it is used by one or more suppliers."
 msgstr ""
 
 msgid "Cannot delete this account because it is used by one or more suppliers."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:165 gl/manage/gl_accounts.php.orig:165
+#: gl/manage/gl_accounts.php:165
 msgid ""
 "Cannot delete this account because it is used by one or more Quick Entry "
 "Lines."
 msgstr ""
 
 msgid ""
 "Cannot delete this account because it is used by one or more Quick Entry "
 "Lines."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:183 gl/manage/gl_accounts.php.orig:183
+#: gl/manage/gl_accounts.php:183
 msgid "Selected account has been deleted"
 msgstr ""
 
 msgid "Selected account has been deleted"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:198 gl/manage/gl_accounts.php.orig:198
+#: gl/manage/gl_accounts.php:198
 msgid "New account"
 msgstr ""
 
 msgid "New account"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:244 gl/manage/gl_accounts.php.orig:244
+#: gl/manage/gl_accounts.php:244
 msgid "Account Code 2:"
 msgstr ""
 
 msgid "Account Code 2:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:246 gl/manage/gl_accounts.php.orig:246
+#: gl/manage/gl_accounts.php:246
 msgid "Account Name:"
 msgstr ""
 
 msgid "Account Name:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:248 gl/manage/gl_accounts.php.orig:248
+#: gl/manage/gl_accounts.php:248
 msgid "Account Group:"
 msgstr ""
 
 msgid "Account Group:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:250 gl/manage/gl_accounts.php.orig:250
+#: gl/manage/gl_accounts.php:250
 msgid "Account Tags:"
 msgstr ""
 
 msgid "Account Tags:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:252 gl/manage/gl_accounts.php.orig:252
+#: gl/manage/gl_accounts.php:252
 msgid "Account status:"
 msgstr ""
 
 msgid "Account status:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:257 gl/manage/gl_accounts.php.orig:257
+#: gl/manage/gl_accounts.php:257
 msgid "Add Account"
 msgstr ""
 
 msgid "Add Account"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:261 gl/manage/gl_accounts.php.orig:261
+#: gl/manage/gl_accounts.php:261
 msgid "Update Account"
 msgstr ""
 
 msgid "Update Account"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:262 gl/manage/gl_accounts.php.orig:262
+#: gl/manage/gl_accounts.php:262
 msgid "Delete account"
 msgstr ""
 
 msgid "Delete account"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:16 gl/manage/gl_account_types.php.orig:16
+#: gl/manage/gl_account_types.php:16
 msgid "GL Account Groups"
 msgstr ""
 
 msgid "GL Account Groups"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:29 gl/manage/gl_account_types.php.orig:29
+#: gl/manage/gl_account_types.php:29
 msgid "The account group id cannot be empty."
 msgstr ""
 
 msgid "The account group id cannot be empty."
 msgstr ""
 
-#: gl/manage/gl_account_types.php:35 gl/manage/gl_account_types.php.orig:35
+#: gl/manage/gl_account_types.php:35
 msgid "The account group name cannot be empty."
 msgstr ""
 
 msgid "The account group name cannot be empty."
 msgstr ""
 
@@ -4431,52 +4500,51 @@ msgstr ""
 msgid "This account group id is already in use."
 msgstr ""
 
 msgid "This account group id is already in use."
 msgstr ""
 
-#: gl/manage/gl_account_types.php:50 gl/manage/gl_account_types.php.orig:43
+#: gl/manage/gl_account_types.php:50
 msgid "You cannot set an account group to be a subgroup of itself."
 msgstr ""
 
 msgid "You cannot set an account group to be a subgroup of itself."
 msgstr ""
 
-#: gl/manage/gl_account_types.php:68 gl/manage/gl_account_types.php.orig:61
+#: gl/manage/gl_account_types.php:68
 msgid "Selected account type has been updated"
 msgstr ""
 
 msgid "Selected account type has been updated"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:73 gl/manage/gl_account_types.php.orig:66
+#: gl/manage/gl_account_types.php:73
 msgid "New account type has been added"
 msgstr ""
 
 msgid "New account type has been added"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:90 gl/manage/gl_account_types.php.orig:83
+#: gl/manage/gl_account_types.php:90
 msgid ""
 "Cannot delete this account group because GL accounts have been created "
 "referring to it."
 msgstr ""
 
 msgid ""
 "Cannot delete this account group because GL accounts have been created "
 "referring to it."
 msgstr ""
 
-#: gl/manage/gl_account_types.php:96 gl/manage/gl_account_types.php.orig:89
+#: gl/manage/gl_account_types.php:96
 msgid ""
 "Cannot delete this account group because GL account groups have been created "
 "referring to it."
 msgstr ""
 
 msgid ""
 "Cannot delete this account group because GL account groups have been created "
 "referring to it."
 msgstr ""
 
-#: gl/manage/gl_account_types.php:112 gl/manage/gl_account_types.php.orig:105
+#: gl/manage/gl_account_types.php:112
 msgid "Selected account group has been deleted"
 msgstr ""
 
 msgid "Selected account group has been deleted"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:129 gl/manage/gl_account_types.php.orig:122
+#: gl/manage/gl_account_types.php:129
 msgid "Group ID"
 msgstr ""
 
 msgid "Group ID"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:129 gl/manage/gl_account_types.php.orig:122
-#: sales/manage/sales_groups.php:85
+#: gl/manage/gl_account_types.php:129 sales/manage/sales_groups.php:85
 msgid "Group Name"
 msgstr ""
 
 msgid "Group Name"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:129 gl/manage/gl_account_types.php.orig:122
+#: gl/manage/gl_account_types.php:129
 msgid "Subgroup Of"
 msgstr ""
 
 msgid "Subgroup Of"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:188 gl/manage/gl_account_types.php.orig:181
+#: gl/manage/gl_account_types.php:188
 msgid "ID:"
 msgstr ""
 
 msgid "ID:"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:191 gl/manage/gl_account_types.php.orig:184
+#: gl/manage/gl_account_types.php:191
 msgid "Subgroup Of:"
 msgstr ""
 
 msgid "Subgroup Of:"
 msgstr ""
 
@@ -4572,7 +4640,7 @@ msgid "Posted"
 msgstr ""
 
 #: gl/manage/gl_quick_entries.php:329 sales/customer_delivery.php:430
 msgstr ""
 
 #: gl/manage/gl_quick_entries.php:329 sales/customer_delivery.php:430
-#: sales/customer_invoice.php:447
+#: sales/customer_invoice.php:449
 msgid "Tax Type"
 msgstr ""
 
 msgid "Tax Type"
 msgstr ""
 
@@ -4584,15 +4652,20 @@ msgstr ""
 msgid "Revaluation of Currency Accounts"
 msgstr ""
 
 msgid "Revaluation of Currency Accounts"
 msgstr ""
 
-#: gl/manage/revaluate_currencies.php:31
+#: gl/manage/revaluate_currencies.php:32
 msgid "No Revaluation was needed"
 msgstr ""
 
 msgid "No Revaluation was needed"
 msgstr ""
 
-#: gl/manage/revaluate_currencies.php:101
+#: gl/manage/revaluate_currencies.php:40
+#, php-format
+msgid "%d Journal Entries for AR/AP accounts have been added"
+msgstr ""
+
+#: gl/manage/revaluate_currencies.php:104
 msgid "Date for Revaluation:"
 msgstr ""
 
 msgid "Date for Revaluation:"
 msgstr ""
 
-#: gl/manage/revaluate_currencies.php:106
+#: gl/manage/revaluate_currencies.php:109
 msgid "Revaluate Currencies"
 msgstr ""
 
 msgid "Revaluate Currencies"
 msgstr ""
 
@@ -4635,12 +4708,12 @@ msgstr ""
 msgid "GL Deposit"
 msgstr ""
 
 msgid "GL Deposit"
 msgstr ""
 
-#: gl/view/gl_deposit_view.php:71 gl/includes/db/gl_db_banking.inc:104
-#: reporting/reports_main.php:87 reporting/reports_main.php:94
-#: reporting/reports_main.php:101 reporting/reports_main.php:113
-#: reporting/reports_main.php:120 reporting/reports_main.php:126
-#: reporting/reports_main.php:161 reporting/reports_main.php:167
-#: reporting/reports_main.php:216
+#: gl/view/gl_deposit_view.php:71 gl/includes/db/gl_db_banking.inc:212
+#: reporting/reports_main.php:88 reporting/reports_main.php:95
+#: reporting/reports_main.php:102 reporting/reports_main.php:114
+#: reporting/reports_main.php:121 reporting/reports_main.php:127
+#: reporting/reports_main.php:163 reporting/reports_main.php:169
+#: reporting/reports_main.php:218
 msgid "From"
 msgstr ""
 
 msgid "From"
 msgstr ""
 
@@ -4668,18 +4741,23 @@ msgstr ""
 #: 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_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:124
-#: gl/includes/ui/gl_bank_ui.inc:127 gl/includes/ui/gl_bank_ui.inc:130
-#: 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_trans_view.php:69 gl/includes/ui/gl_bank_ui.inc:132
+#: gl/includes/ui/gl_bank_ui.inc:135 gl/includes/ui/gl_bank_ui.inc:138
+#: gl/includes/ui/gl_bank_ui.inc.orig:132
+#: gl/includes/ui/gl_bank_ui.inc.orig:135
+#: gl/includes/ui/gl_bank_ui.inc.orig:138 gl/includes/ui/gl_journal_ui.inc:83
+#: gl/includes/ui/gl_journal_ui.inc:86 gl/includes/ui/gl_journal_ui.inc:89
+#: reporting/rep701.php:109
 msgid "Account Code"
 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
 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:124 gl/includes/ui/gl_bank_ui.inc:127
-#: gl/includes/ui/gl_bank_ui.inc:130 gl/includes/ui/gl_journal_ui.inc:83
+#: gl/includes/ui/gl_bank_ui.inc:132 gl/includes/ui/gl_bank_ui.inc:135
+#: gl/includes/ui/gl_bank_ui.inc:138 gl/includes/ui/gl_bank_ui.inc.orig:132
+#: gl/includes/ui/gl_bank_ui.inc.orig:135
+#: gl/includes/ui/gl_bank_ui.inc.orig:138 gl/includes/ui/gl_journal_ui.inc:83
 #: gl/includes/ui/gl_journal_ui.inc:86 gl/includes/ui/gl_journal_ui.inc:89
 msgid "Account Description"
 msgstr ""
 #: gl/includes/ui/gl_journal_ui.inc:86 gl/includes/ui/gl_journal_ui.inc:89
 msgid "Account Description"
 msgstr ""
@@ -4730,24 +4808,30 @@ msgid "This transaction has been voided."
 msgstr ""
 
 #: gl/includes/db/gl_db_banking.inc:44 gl/includes/db/gl_db_banking.inc:47
 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
 msgid "Exchange Variance"
 msgstr ""
 
 msgid "Exchange Variance"
 msgstr ""
 
-#: gl/includes/db/gl_db_banking.inc:104 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:162
-#: reporting/reports_main.php:168 reporting/reports_main.php:217
+#: gl/includes/db/gl_db_banking.inc:212 reporting/reports_main.php:89
+#: reporting/reports_main.php:96 reporting/reports_main.php:103
+#: reporting/reports_main.php:115 reporting/reports_main.php:122
+#: reporting/reports_main.php:128 reporting/reports_main.php:164
+#: reporting/reports_main.php:170 reporting/reports_main.php:219
 msgid "To"
 msgstr ""
 
 msgid "To"
 msgstr ""
 
+#: gl/includes/db/gl_db_banking.inc:311
+msgid "Document reentered."
+msgstr ""
+
 #: gl/includes/db/gl_db_rates.inc:129
 #, php-format
 msgid ""
 "Cannot retrieve currency rate from %s page. Please set the rate manually."
 msgstr ""
 
 #: gl/includes/db/gl_db_rates.inc:129
 #, php-format
 msgid ""
 "Cannot retrieve currency rate from %s page. Please set the rate manually."
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:28 gl/includes/ui/gl_journal_ui.inc:27
+#: gl/includes/ui/gl_bank_ui.inc:23 gl/includes/ui/gl_bank_ui.inc.orig:23
+#: gl/includes/ui/gl_journal_ui.inc:27
 #: inventory/includes/item_adjustments_ui.inc:39
 #: inventory/includes/stock_transfers_ui.inc:42
 #: manufacturing/work_order_add_finished.php:208
 #: inventory/includes/item_adjustments_ui.inc:39
 #: inventory/includes/stock_transfers_ui.inc:42
 #: manufacturing/work_order_add_finished.php:208
@@ -4758,41 +4842,45 @@ msgstr ""
 msgid "Date:"
 msgstr ""
 
 msgid "Date:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:53
+#: gl/includes/ui/gl_bank_ui.inc:50 gl/includes/ui/gl_bank_ui.inc.orig:50
 msgid "Pay To:"
 msgstr ""
 
 msgid "Pay To:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:58
+#: gl/includes/ui/gl_bank_ui.inc:55 gl/includes/ui/gl_bank_ui.inc.orig:55
 msgid "To the Order of:"
 msgstr ""
 
 msgid "To the Order of:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:65 inventory/purchasing_data.php:184
-#: inventory/purchasing_data.php:188 purchasing/includes/ui/invoice_ui.inc:73
+#: gl/includes/ui/gl_bank_ui.inc:62 gl/includes/ui/gl_bank_ui.inc.orig:62
+#: inventory/purchasing_data.php:184 inventory/purchasing_data.php:188
+#: purchasing/includes/ui/invoice_ui.inc:73
 #: purchasing/includes/ui/invoice_ui.inc:80
 #: purchasing/includes/ui/po_ui.inc:120 purchasing/includes/ui/po_ui.inc:125
 msgid "Supplier:"
 msgstr ""
 
 #: purchasing/includes/ui/invoice_ui.inc:80
 #: purchasing/includes/ui/po_ui.inc:120 purchasing/includes/ui/po_ui.inc:125
 msgid "Supplier:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:68 sales/manage/recurrent_invoices.php:151
+#: gl/includes/ui/gl_bank_ui.inc:65 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
 msgid "Customer:"
 msgstr ""
 
 #: sales/includes/ui/sales_credit_ui.inc:29
 #: sales/includes/ui/sales_order_ui.inc:278
 msgid "Customer:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:72 sales/customer_payments.php:239
-#: sales/manage/recurrent_invoices.php:154
+#: gl/includes/ui/gl_bank_ui.inc:69 gl/includes/ui/gl_bank_ui.inc.orig:69
+#: sales/customer_payments.php:238 sales/customer_payments.php.orig:240
+#: sales/manage/recurrent_invoices.php:172
 #: sales/includes/ui/sales_credit_ui.inc:37
 #: sales/includes/ui/sales_order_ui.inc:285
 msgid "Branch:"
 msgstr ""
 
 #: sales/includes/ui/sales_credit_ui.inc:37
 #: sales/includes/ui/sales_order_ui.inc:285
 msgid "Branch:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:90 gl/includes/ui/gl_journal_ui.inc:58
-#: gl/includes/ui/gl_journal_ui.inc:62
+#: gl/includes/ui/gl_bank_ui.inc:87 gl/includes/ui/gl_bank_ui.inc.orig:87
+#: gl/includes/ui/gl_journal_ui.inc:58 gl/includes/ui/gl_journal_ui.inc:62
 #: purchasing/includes/ui/invoice_ui.inc:231
 msgid "Go"
 msgstr ""
 
 #: purchasing/includes/ui/invoice_ui.inc:231
 msgid "Go"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:159 includes/ui/simple_crud_class.inc:52
+#: gl/includes/ui/gl_bank_ui.inc:167 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
 #: inventory/includes/item_adjustments_ui.inc:88
 #: inventory/includes/stock_transfers_ui.inc:80
 #: manufacturing/includes/work_order_issue_ui.inc:59
@@ -4803,7 +4891,8 @@ msgstr ""
 msgid "Edit document line"
 msgstr ""
 
 msgid "Edit document line"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:161 includes/ui/simple_crud_class.inc:54
+#: gl/includes/ui/gl_bank_ui.inc:169 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
 #: inventory/includes/item_adjustments_ui.inc:90
 #: inventory/includes/stock_transfers_ui.inc:82
 #: manufacturing/includes/work_order_issue_ui.inc:61
@@ -4814,8 +4903,8 @@ msgstr ""
 msgid "Remove line from document"
 msgstr ""
 
 msgid "Remove line from document"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:250 gl/includes/ui/gl_journal_ui.inc:222
-#: includes/ui/simple_crud_class.inc:56
+#: gl/includes/ui/gl_bank_ui.inc:258 gl/includes/ui/gl_bank_ui.inc.orig:258
+#: gl/includes/ui/gl_journal_ui.inc:222 includes/ui/simple_crud_class.inc:56
 #: inventory/includes/item_adjustments_ui.inc:158
 #: inventory/includes/stock_transfers_ui.inc:138
 #: manufacturing/includes/work_order_issue_ui.inc:132
 #: inventory/includes/item_adjustments_ui.inc:158
 #: inventory/includes/stock_transfers_ui.inc:138
 #: manufacturing/includes/work_order_issue_ui.inc:132
@@ -4825,8 +4914,8 @@ msgstr ""
 msgid "Confirm changes"
 msgstr ""
 
 msgid "Confirm changes"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:252 gl/includes/ui/gl_journal_ui.inc:224
-#: includes/ui/simple_crud_class.inc:58
+#: gl/includes/ui/gl_bank_ui.inc:260 gl/includes/ui/gl_bank_ui.inc.orig:260
+#: gl/includes/ui/gl_journal_ui.inc:224 includes/ui/simple_crud_class.inc:58
 #: inventory/includes/item_adjustments_ui.inc:160
 #: inventory/includes/stock_transfers_ui.inc:140
 #: manufacturing/includes/work_order_issue_ui.inc:134
 #: inventory/includes/item_adjustments_ui.inc:160
 #: inventory/includes/stock_transfers_ui.inc:140
 #: manufacturing/includes/work_order_issue_ui.inc:134
@@ -4836,7 +4925,8 @@ msgstr ""
 msgid "Cancel changes"
 msgstr ""
 
 msgid "Cancel changes"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:257 gl/includes/ui/gl_journal_ui.inc:228
+#: gl/includes/ui/gl_bank_ui.inc:265 gl/includes/ui/gl_bank_ui.inc.orig:265
+#: gl/includes/ui/gl_journal_ui.inc:228
 #: inventory/includes/item_adjustments_ui.inc:166
 #: inventory/includes/stock_transfers_ui.inc:146
 #: manufacturing/includes/work_order_issue_ui.inc:140
 #: inventory/includes/item_adjustments_ui.inc:166
 #: inventory/includes/stock_transfers_ui.inc:146
 #: manufacturing/includes/work_order_issue_ui.inc:140
@@ -4846,7 +4936,7 @@ msgstr ""
 msgid "Add Item"
 msgstr ""
 
 msgid "Add Item"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:258
+#: gl/includes/ui/gl_bank_ui.inc:266 gl/includes/ui/gl_bank_ui.inc.orig:266
 #: inventory/includes/item_adjustments_ui.inc:167
 #: inventory/includes/stock_transfers_ui.inc:147
 #: manufacturing/includes/work_order_issue_ui.inc:141
 #: inventory/includes/item_adjustments_ui.inc:167
 #: inventory/includes/stock_transfers_ui.inc:147
 #: manufacturing/includes/work_order_issue_ui.inc:141
@@ -4945,7 +5035,7 @@ msgid "Dimensions configuration"
 msgstr ""
 
 #: includes/access_levels.inc:72 inventory/manage/items.php:351
 msgstr ""
 
 #: includes/access_levels.inc:72 inventory/manage/items.php:351
-#: reporting/reports_main.php:220
+#: reporting/reports_main.php:222
 msgid "Dimensions"
 msgstr ""
 
 msgid "Dimensions"
 msgstr ""
 
@@ -5430,7 +5520,7 @@ msgid ""
 "$security_headings arrays from old config.php file to the new one."
 msgstr ""
 
 "$security_headings arrays from old config.php file to the new one."
 msgstr ""
 
-#: includes/current_user.inc:80 includes/ui/ui_controls.inc:174
+#: includes/current_user.inc:80 includes/ui/ui_controls.inc:190
 #: includes/ui/ui_view.inc:826
 msgid "Back"
 msgstr ""
 #: includes/ui/ui_view.inc:826
 msgid "Back"
 msgstr ""
@@ -5443,23 +5533,23 @@ msgstr ""
 msgid "Requesting data..."
 msgstr ""
 
 msgid "Requesting data..."
 msgstr ""
 
-#: includes/errors.inc:119
+#: includes/errors.inc:123
 msgid "in file"
 msgstr ""
 
 msgid "in file"
 msgstr ""
 
-#: includes/errors.inc:119
+#: includes/errors.inc:123
 msgid "at line "
 msgstr ""
 
 msgid "at line "
 msgstr ""
 
-#: includes/errors.inc:168
+#: includes/errors.inc:173
 msgid "Debug mode database warning:"
 msgstr ""
 
 msgid "Debug mode database warning:"
 msgstr ""
 
-#: includes/errors.inc:170
+#: includes/errors.inc:175
 msgid "DATABASE ERROR :"
 msgstr ""
 
 msgid "DATABASE ERROR :"
 msgstr ""
 
-#: includes/errors.inc:201
+#: includes/errors.inc:206
 msgid ""
 "The entered information is a duplicate. Please go back and enter different "
 "values."
 msgid ""
 "The entered information is a duplicate. Please go back and enter different "
 "values."
@@ -5625,7 +5715,7 @@ msgstr ""
 msgid "Sales Order"
 msgstr ""
 
 msgid "Sales Order"
 msgstr ""
 
-#: includes/sysnames.inc:41 sales/sales_order_entry.php:613
+#: includes/sysnames.inc:41 sales/sales_order_entry.php:615
 msgid "Sales Quotation"
 msgstr ""
 
 msgid "Sales Quotation"
 msgstr ""
 
@@ -5661,7 +5751,7 @@ msgstr ""
 msgid "CP"
 msgstr ""
 
 msgid "CP"
 msgstr ""
 
-#: includes/sysnames.inc:54 sales/customer_invoice.php:450
+#: includes/sysnames.inc:54 sales/customer_invoice.php:452
 msgid "DN"
 msgstr ""
 
 msgid "DN"
 msgstr ""
 
@@ -5749,17 +5839,17 @@ msgstr ""
 msgid "Cash"
 msgstr ""
 
 msgid "Cash"
 msgstr ""
 
-#: includes/sysnames.inc:96 reporting/rep101.php:137 reporting/rep102.php:115
-#: reporting/rep102.php:122 reporting/rep105.php:107 reporting/rep106.php:81
+#: includes/sysnames.inc:96 reporting/rep101.php:137 reporting/rep102.php:125
+#: reporting/rep102.php:132 reporting/rep105.php:107 reporting/rep106.php:81
 #: reporting/rep114.php:93 reporting/rep304.php:114 reporting/rep304.php:124
 #: reporting/reports_main.php:32 reporting/reports_main.php:36
 #: reporting/rep114.php:93 reporting/rep304.php:114 reporting/rep304.php:124
 #: reporting/reports_main.php:32 reporting/reports_main.php:36
-#: reporting/reports_main.php:43 reporting/reports_main.php:107
-#: reporting/reports_main.php:200 sales/create_recurrent_invoices.php:98
-#: sales/customer_credit_invoice.php:235 sales/customer_delivery.php:335
-#: sales/customer_invoice.php:372
+#: reporting/reports_main.php:43 reporting/reports_main.php:108
+#: reporting/reports_main.php:202 sales/create_recurrent_invoices.php:115
+#: sales/customer_credit_invoice.php:237 sales/customer_delivery.php:335
+#: sales/customer_invoice.php:374
 #: sales/allocations/customer_allocation_main.php:97
 #: sales/allocations/customer_allocation_main.php:105
 #: sales/allocations/customer_allocation_main.php:97
 #: sales/allocations/customer_allocation_main.php:105
-#: sales/manage/recurrent_invoices.php:85 sales/view/view_credit.php:47
+#: sales/manage/recurrent_invoices.php:102 sales/view/view_credit.php:47
 #: sales/inquiry/customer_allocation_inquiry.php:147
 #: sales/inquiry/customer_allocation_inquiry.php:157
 #: sales/inquiry/customer_inquiry.php:218
 #: sales/inquiry/customer_allocation_inquiry.php:147
 #: sales/inquiry/customer_allocation_inquiry.php:157
 #: sales/inquiry/customer_inquiry.php:218
@@ -5781,13 +5871,15 @@ msgstr ""
 #: purchasing/inquiry/supplier_allocation_inquiry.php:141
 #: purchasing/inquiry/supplier_inquiry.php:165
 #: purchasing/inquiry/supplier_inquiry.php:179
 #: purchasing/inquiry/supplier_allocation_inquiry.php:141
 #: purchasing/inquiry/supplier_inquiry.php:165
 #: purchasing/inquiry/supplier_inquiry.php:179
+#: purchasing/inquiry/supplier_inquiry.php.orig:165
+#: purchasing/inquiry/supplier_inquiry.php.orig:179
 #: purchasing/allocations/supplier_allocation_main.php:98
 #: purchasing/allocations/supplier_allocation_main.php:106
 #: purchasing/allocations/supplier_allocation_main.php:98
 #: purchasing/allocations/supplier_allocation_main.php:106
-#: reporting/rep201.php:125 reporting/rep202.php:118 reporting/rep202.php:125
+#: reporting/rep201.php:125 reporting/rep202.php:128 reporting/rep202.php:135
 #: reporting/rep203.php:98 reporting/rep204.php:88
 #: reporting/rep203.php:98 reporting/rep204.php:88
-#: reporting/reports_main.php:131 reporting/reports_main.php:135
-#: reporting/reports_main.php:142 reporting/reports_main.php:151
-#: reporting/reports_main.php:157
+#: 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 ""
 
 msgid "Supplier"
 msgstr ""
 
@@ -6142,30 +6234,30 @@ msgid "Value"
 msgstr ""
 
 #: includes/system_tests.inc:411 reporting/reports_main.php:39
 msgstr ""
 
 #: includes/system_tests.inc:411 reporting/reports_main.php:39
-#: reporting/reports_main.php:48 reporting/reports_main.php:56
-#: reporting/reports_main.php:62 reporting/reports_main.php:70
-#: reporting/reports_main.php:78 reporting/reports_main.php:84
-#: reporting/reports_main.php:92 reporting/reports_main.php:99
-#: reporting/reports_main.php:105 reporting/reports_main.php:111
-#: reporting/reports_main.php:118 reporting/reports_main.php:124
-#: reporting/reports_main.php:129 reporting/reports_main.php:138
-#: reporting/reports_main.php:147 reporting/reports_main.php:154
-#: reporting/reports_main.php:158 reporting/reports_main.php:165
-#: reporting/reports_main.php:171 reporting/reports_main.php:179
-#: reporting/reports_main.php:184 reporting/reports_main.php:193
-#: reporting/reports_main.php:201 reporting/reports_main.php:206
-#: reporting/reports_main.php:213 reporting/reports_main.php:219
-#: reporting/reports_main.php:227 reporting/reports_main.php:238
-#: reporting/reports_main.php:244 reporting/reports_main.php:250
-#: reporting/reports_main.php:264 reporting/reports_main.php:271
-#: reporting/reports_main.php:281 reporting/reports_main.php:292
-#: reporting/reports_main.php:301 reporting/reports_main.php:312
-#: reporting/reports_main.php:318 reporting/reports_main.php:327
-#: reporting/reports_main.php:337 reporting/reports_main.php:345
-#: reporting/reports_main.php:355 reporting/reports_main.php:360
-#: reporting/reports_main.php:368 reporting/reports_main.php:377
-#: reporting/reports_main.php:384 reporting/reports_main.php:391
-#: reporting/reports_main.php:398 reporting/includes/excel_report.inc:295
+#: reporting/reports_main.php:49 reporting/reports_main.php:57
+#: reporting/reports_main.php:63 reporting/reports_main.php:71
+#: reporting/reports_main.php:79 reporting/reports_main.php:85
+#: reporting/reports_main.php:93 reporting/reports_main.php:100
+#: reporting/reports_main.php:106 reporting/reports_main.php:112
+#: reporting/reports_main.php:119 reporting/reports_main.php:125
+#: reporting/reports_main.php:130 reporting/reports_main.php:139
+#: reporting/reports_main.php:149 reporting/reports_main.php:156
+#: reporting/reports_main.php:160 reporting/reports_main.php:167
+#: reporting/reports_main.php:173 reporting/reports_main.php:181
+#: reporting/reports_main.php:186 reporting/reports_main.php:195
+#: reporting/reports_main.php:203 reporting/reports_main.php:208
+#: reporting/reports_main.php:215 reporting/reports_main.php:221
+#: reporting/reports_main.php:229 reporting/reports_main.php:240
+#: reporting/reports_main.php:246 reporting/reports_main.php:252
+#: reporting/reports_main.php:266 reporting/reports_main.php:273
+#: reporting/reports_main.php:283 reporting/reports_main.php:294
+#: reporting/reports_main.php:303 reporting/reports_main.php:314
+#: reporting/reports_main.php:320 reporting/reports_main.php:329
+#: reporting/reports_main.php:339 reporting/reports_main.php:347
+#: reporting/reports_main.php:357 reporting/reports_main.php:362
+#: reporting/reports_main.php:370 reporting/reports_main.php:379
+#: reporting/reports_main.php:386 reporting/reports_main.php:393
+#: reporting/reports_main.php:400 reporting/includes/excel_report.inc:295
 #: reporting/includes/excel_report.inc:428
 #: reporting/includes/pdf_report.inc:346 reporting/includes/pdf_report.inc:617
 #: sales/view/view_sales_order.php:85
 #: reporting/includes/excel_report.inc:428
 #: reporting/includes/pdf_report.inc:346 reporting/includes/pdf_report.inc:617
 #: sales/view/view_sales_order.php:85
@@ -6182,39 +6274,19 @@ msgid ""
 "trail record."
 msgstr ""
 
 "trail record."
 msgstr ""
 
-#: includes/db/inventory_db.inc:285 includes/db/inventory_db.inc:286
-msgid "new_sales_cost"
-msgstr ""
-
-#: includes/db/inventory_db.inc:287
-msgid "Sales Diff"
-msgstr ""
-
-#: includes/db/inventory_db.inc:299
-msgid "new_purchase_cost"
-msgstr ""
-
-#: includes/db/inventory_db.inc:300
-msgid "purchase_diff"
-msgstr ""
-
-#: includes/db/inventory_db.inc:304
-msgid "Final diff"
-msgstr ""
-
-#: includes/db/inventory_db.inc:318
+#: includes/db/inventory_db.inc:249
 msgid "Cost was "
 msgstr ""
 
 msgid "Cost was "
 msgstr ""
 
-#: includes/db/inventory_db.inc:318
+#: includes/db/inventory_db.inc:249
 msgid " changed to "
 msgstr ""
 
 msgid " changed to "
 msgstr ""
 
-#: includes/db/inventory_db.inc:318
+#: includes/db/inventory_db.inc:249
 msgid " for item "
 msgstr ""
 
 msgid " for item "
 msgstr ""
 
-#: includes/db/inventory_db.inc:360
+#: includes/db/inventory_db.inc:289
 msgid "Zero/negative inventory handling"
 msgstr ""
 
 msgid "Zero/negative inventory handling"
 msgstr ""
 
@@ -6382,48 +6454,56 @@ msgstr ""
 msgid "Cancel edition"
 msgstr ""
 
 msgid "Cancel edition"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:123
+#: 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 ""
 
 msgid "You should automatically be forwarded."
 msgstr ""
 
-#: includes/ui/ui_controls.inc:124
+#: includes/ui/ui_controls.inc:140
 msgid "If this does not happen"
 msgstr ""
 
 msgid "If this does not happen"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:124
+#: includes/ui/ui_controls.inc:140
 msgid "click here"
 msgstr ""
 
 msgid "click here"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:124
+#: includes/ui/ui_controls.inc:140
 msgid "to continue"
 msgstr ""
 
 msgid "to continue"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:171
+#: includes/ui/ui_controls.inc:187
 msgid "View Attachment"
 msgstr ""
 
 msgid "View Attachment"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:174
+#: includes/ui/ui_controls.inc:190
 msgid "Close"
 msgstr ""
 
 msgid "Close"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:425 sales/manage/customers.php:16
+#: includes/ui/ui_controls.inc:450 sales/manage/customers.php:16
 msgid "Customers"
 msgstr ""
 
 msgid "Customers"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:427
+#: includes/ui/ui_controls.inc:452
 msgid "Branches"
 msgstr ""
 
 msgid "Branches"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:429 purchasing/manage/suppliers.php:16
+#: includes/ui/ui_controls.inc:454 purchasing/manage/suppliers.php:16
 msgid "Suppliers"
 msgstr ""
 
 msgid "Suppliers"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:431 inventory/transfers.php:230
+#: includes/ui/ui_controls.inc:456 inventory/transfers.php:230
 #: inventory/manage/items.php:16
 msgid "Items"
 msgstr ""
 
 #: inventory/manage/items.php:16
 msgid "Items"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:576
+#: includes/ui/ui_controls.inc:601
 msgid "Entered data has not been saved yet.\\nDo you want to abandon changes?"
 msgstr ""
 
 msgid "Entered data has not been saved yet.\\nDo you want to abandon changes?"
 msgstr ""
 
@@ -6595,7 +6675,7 @@ msgstr ""
 msgid "Standard American COA (4 digit) with demo data"
 msgstr ""
 
 msgid "Standard American COA (4 digit) with demo data"
 msgstr ""
 
-#: includes/ui/ui_msgs.inc:65
+#: includes/ui/ui_msgs.inc:63
 msgid "in units of : "
 msgstr ""
 
 msgid "in units of : "
 msgstr ""
 
@@ -6604,8 +6684,8 @@ msgid "Date Voided:"
 msgstr ""
 
 #: includes/ui/ui_view.inc:407 reporting/rep107.php:175
 msgstr ""
 
 #: includes/ui/ui_view.inc:407 reporting/rep107.php:175
-#: reporting/rep109.php:181 reporting/rep110.php:186 reporting/rep113.php:175
-#: reporting/rep209.php:190
+#: reporting/rep109.php:181 reporting/rep110.php:186 reporting/rep111.php:168
+#: reporting/rep113.php:175 reporting/rep209.php:190
 msgid "Total Tax Excluded"
 msgstr ""
 
 msgid "Total Tax Excluded"
 msgstr ""
 
@@ -6813,34 +6893,34 @@ msgstr ""
 msgid "Enter &Another Adjustment"
 msgstr ""
 
 msgid "Enter &Another Adjustment"
 msgstr ""
 
-#: inventory/adjustments.php:88 inventory/transfers.php:87
-#: sales/sales_order_entry.php:350
+#: inventory/adjustments.php:90 inventory/transfers.php:87
+#: sales/sales_order_entry.php:352
 msgid "You must enter at least one non empty item line."
 msgstr ""
 
 msgid "You must enter at least one non empty item line."
 msgstr ""
 
-#: inventory/adjustments.php:108 inventory/transfers.php:105
+#: inventory/adjustments.php:110 inventory/transfers.php:105
 msgid "The entered date for the adjustment is invalid."
 msgstr ""
 
 msgid "The entered date for the adjustment is invalid."
 msgstr ""
 
-#: inventory/adjustments.php:122
+#: inventory/adjustments.php:124
 msgid ""
 "The adjustment cannot be processed because an adjustment item would cause a "
 "negative inventory balance :"
 msgstr ""
 
 msgid ""
 "The adjustment cannot be processed because an adjustment item would cause a "
 "negative inventory balance :"
 msgstr ""
 
-#: inventory/adjustments.php:152 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 ""
 
 msgid "The quantity entered is negative or invalid."
 msgstr ""
 
-#: inventory/adjustments.php:159 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 ""
 
 msgid "The entered standard cost is negative or invalid."
 msgstr ""
 
-#: inventory/adjustments.php:228
+#: inventory/adjustments.php:230
 msgid "Adjustment Items"
 msgstr ""
 
 msgid "Adjustment Items"
 msgstr ""
 
-#: inventory/adjustments.php:234
+#: inventory/adjustments.php:236
 msgid "Process Adjustment"
 msgstr ""
 
 msgid "Process Adjustment"
 msgstr ""
 
@@ -6874,8 +6954,8 @@ msgstr ""
 #: inventory/purchasing_data.php:101 inventory/reorder_level.php:43
 #: inventory/inquiry/stock_movements.php:49
 #: inventory/inquiry/stock_status.php:41 inventory/manage/item_codes.php:105
 #: inventory/purchasing_data.php:101 inventory/reorder_level.php:43
 #: inventory/inquiry/stock_movements.php:49
 #: inventory/inquiry/stock_status.php:41 inventory/manage/item_codes.php:105
-#: manufacturing/work_order_entry.php:395
-#: manufacturing/work_order_entry.php:400 purchasing/inquiry/po_search.php:74
+#: manufacturing/work_order_entry.php:396
+#: manufacturing/work_order_entry.php:401 purchasing/inquiry/po_search.php:74
 #: sales/inquiry/sales_deliveries_view.php:114
 #: sales/inquiry/sales_orders_view.php:233
 msgid "Item:"
 #: sales/inquiry/sales_deliveries_view.php:114
 #: sales/inquiry/sales_orders_view.php:233
 msgid "Item:"
@@ -6927,7 +7007,7 @@ msgid "The selected price has been deleted."
 msgstr ""
 
 #: inventory/prices.php:133 reporting/rep104.php:116
 msgstr ""
 
 #: inventory/prices.php:133 reporting/rep104.php:116
-#: sales/customer_delivery.php:352 sales/customer_invoice.php:394
+#: sales/customer_delivery.php:352 sales/customer_invoice.php:396
 #: 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
 msgid "Sales Type"
 #: 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
 msgid "Sales Type"
@@ -6938,8 +7018,8 @@ msgstr ""
 #: purchasing/po_receive_items.php:63 purchasing/view/view_grn.php:41
 #: purchasing/view/view_po.php:45 reporting/rep104.php:109
 #: reporting/includes/doctext.inc:105 reporting/includes/doctext.inc:113
 #: purchasing/po_receive_items.php:63 purchasing/view/view_grn.php:41
 #: purchasing/view/view_po.php:45 reporting/rep104.php:109
 #: reporting/includes/doctext.inc:105 reporting/includes/doctext.inc:113
-#: sales/customer_credit_invoice.php:281 sales/customer_delivery.php:430
-#: sales/customer_invoice.php:447 sales/view/view_credit.php:91
+#: sales/customer_credit_invoice.php:283 sales/customer_delivery.php:430
+#: sales/customer_invoice.php:449 sales/view/view_credit.php:91
 #: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:114
 #: sales/view/view_sales_order.php:202
 #: sales/includes/ui/sales_credit_ui.inc:168
 #: 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
@@ -6980,7 +7060,7 @@ msgstr ""
 
 #: inventory/purchasing_data.php:24 purchasing/po_entry_items.php:62
 #: purchasing/supplier_credit.php:32 purchasing/supplier_invoice.php:32
 
 #: inventory/purchasing_data.php:24 purchasing/po_entry_items.php:62
 #: purchasing/supplier_credit.php:32 purchasing/supplier_invoice.php:32
-#: purchasing/supplier_payment.php:40
+#: purchasing/supplier_payment.php:40 purchasing/supplier_payment.php.orig:40
 msgid "There are no suppliers defined in the system."
 msgstr ""
 
 msgid "There are no suppliers defined in the system."
 msgstr ""
 
@@ -7063,15 +7143,15 @@ msgstr ""
 #: purchasing/inquiry/po_search.php:133 purchasing/inquiry/po_search.php:144
 #: reporting/rep105.php:118 reporting/rep301.php:106 reporting/rep302.php:130
 #: reporting/rep303.php:122 reporting/rep304.php:123
 #: purchasing/inquiry/po_search.php:133 purchasing/inquiry/po_search.php:144
 #: reporting/rep105.php:118 reporting/rep301.php:106 reporting/rep302.php:130
 #: reporting/rep303.php:122 reporting/rep304.php:123
-#: reporting/reports_main.php:177 reporting/reports_main.php:183
-#: reporting/reports_main.php:188 reporting/reports_main.php:199
+#: reporting/reports_main.php:179 reporting/reports_main.php:185
+#: reporting/reports_main.php:190 reporting/reports_main.php:201
 #: sales/manage/sales_points.php:84
 msgid "Location"
 msgstr ""
 
 #: inventory/reorder_level.php:57 inventory/inquiry/stock_movements.php:77
 #: inventory/inquiry/stock_status.php:69 purchasing/supplier_credit.php:203
 #: sales/manage/sales_points.php:84
 msgid "Location"
 msgstr ""
 
 #: inventory/reorder_level.php:57 inventory/inquiry/stock_movements.php:77
 #: inventory/inquiry/stock_status.php:69 purchasing/supplier_credit.php:203
-#: sales/sales_order_entry.php:491 sales/includes/ui/sales_order_ui.inc:175
+#: sales/sales_order_entry.php:493 sales/includes/ui/sales_order_ui.inc:175
 msgid "Quantity On Hand"
 msgstr ""
 
 msgid "Quantity On Hand"
 msgstr ""
 
@@ -7127,7 +7207,7 @@ msgid "For Part :"
 msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:34
 msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:34
-#: manufacturing/work_order_entry.php:209 purchasing/inquiry/po_search.php:67
+#: manufacturing/work_order_entry.php:210 purchasing/inquiry/po_search.php:67
 #: sales/inquiry/sales_deliveries_view.php:107
 #: sales/inquiry/sales_orders_view.php:224
 msgid "Location:"
 #: sales/inquiry/sales_deliveries_view.php:107
 #: sales/inquiry/sales_orders_view.php:224
 msgid "Location:"
@@ -7151,8 +7231,8 @@ msgstr ""
 #: 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:104 reporting/includes/doctext.inc:107
 #: 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:104 reporting/includes/doctext.inc:107
-#: reporting/includes/doctext.inc:112 sales/customer_credit_invoice.php:280
-#: sales/customer_delivery.php:428 sales/customer_invoice.php:446
+#: reporting/includes/doctext.inc:112 sales/customer_credit_invoice.php:282
+#: sales/customer_delivery.php:428 sales/customer_invoice.php:448
 #: sales/view/view_credit.php:90 sales/view/view_dispatch.php:112
 #: sales/view/view_invoice.php:113 sales/view/view_sales_order.php:201
 #: sales/includes/ui/sales_credit_ui.inc:167
 #: sales/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
@@ -7166,8 +7246,8 @@ msgstr ""
 #: purchasing/includes/ui/po_ui.inc:236 purchasing/view/view_grn.php:40
 #: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:104
 #: reporting/includes/doctext.inc:107 reporting/includes/doctext.inc:112
 #: purchasing/includes/ui/po_ui.inc:236 purchasing/view/view_grn.php:40
 #: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:104
 #: reporting/includes/doctext.inc:107 reporting/includes/doctext.inc:112
-#: sales/customer_credit_invoice.php:280 sales/customer_delivery.php:428
-#: sales/customer_invoice.php:446 sales/view/view_credit.php:90
+#: sales/customer_credit_invoice.php:282 sales/customer_delivery.php:428
+#: sales/customer_invoice.php:448 sales/view/view_credit.php:90
 #: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:113
 #: sales/view/view_sales_order.php:201
 #: sales/includes/ui/sales_credit_ui.inc:167
 #: sales/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
@@ -7271,6 +7351,7 @@ msgstr ""
 #: purchasing/includes/ui/invoice_ui.inc:452
 #: purchasing/inquiry/supplier_allocation_inquiry.php:57
 #: purchasing/inquiry/supplier_inquiry.php:54
 #: purchasing/includes/ui/invoice_ui.inc:452
 #: purchasing/inquiry/supplier_allocation_inquiry.php:57
 #: purchasing/inquiry/supplier_inquiry.php:54
+#: purchasing/inquiry/supplier_inquiry.php.orig:54
 #: sales/inquiry/customer_allocation_inquiry.php:51
 #: sales/inquiry/customer_inquiry.php:54
 msgid "Refresh Inquiry"
 #: sales/inquiry/customer_allocation_inquiry.php:51
 #: sales/inquiry/customer_inquiry.php:54
 msgid "Refresh Inquiry"
@@ -7350,8 +7431,8 @@ msgstr ""
 #: 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
 #: 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:429
-#: sales/customer_invoice.php:446
+#: sales/customer_credit_invoice.php:282 sales/customer_delivery.php:429
+#: sales/customer_invoice.php:448
 msgid "Units"
 msgstr ""
 
 msgid "Units"
 msgstr ""
 
@@ -7403,7 +7484,7 @@ msgstr ""
 msgid "Foreign Item Codes"
 msgstr ""
 
 msgid "Foreign Item Codes"
 msgstr ""
 
-#: inventory/manage/item_codes.php:23 sales/sales_order_entry.php:658
+#: inventory/manage/item_codes.php:23 sales/sales_order_entry.php:660
 msgid "There are no inventory items defined in the system."
 msgstr ""
 
 msgid "There are no inventory items defined in the system."
 msgstr ""
 
@@ -7449,7 +7530,7 @@ msgstr ""
 
 #: inventory/manage/item_codes.php:179 inventory/manage/sales_kits.php:245
 #: manufacturing/work_order_add_finished.php:206
 
 #: inventory/manage/item_codes.php:179 inventory/manage/sales_kits.php:245
 #: manufacturing/work_order_add_finished.php:206
-#: manufacturing/work_order_entry.php:423
+#: manufacturing/work_order_entry.php:424
 #: manufacturing/manage/bom_edit.php:228
 msgid "Quantity:"
 msgstr ""
 #: manufacturing/manage/bom_edit.php:228
 msgid "Quantity:"
 msgstr ""
@@ -7458,7 +7539,7 @@ msgstr ""
 #: inventory/manage/movement_types.php:129 inventory/manage/sales_kits.php:206
 #: inventory/manage/sales_kits.php:232
 #: manufacturing/manage/work_centres.php:138
 #: inventory/manage/movement_types.php:129 inventory/manage/sales_kits.php:206
 #: inventory/manage/sales_kits.php:232
 #: manufacturing/manage/work_centres.php:138
-#: sales/manage/credit_status.php:145 sales/manage/recurrent_invoices.php:147
+#: 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
 msgid "Description:"
 #: taxes/item_tax_types.php:173 taxes/tax_groups.php:167
 #: taxes/tax_types.php:158
 msgid "Description:"
@@ -7943,7 +8024,7 @@ msgstr ""
 
 #: manufacturing/work_order_add_finished.php:65
 #: manufacturing/work_order_costs.php:64
 
 #: manufacturing/work_order_add_finished.php:65
 #: manufacturing/work_order_costs.php:64
-#: manufacturing/work_order_entry.php:340
+#: 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."
 #: 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."
@@ -8045,107 +8126,107 @@ msgstr ""
 msgid "Email this Work Order"
 msgstr ""
 
 msgid "Email this Work Order"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:79
+#: manufacturing/work_order_entry.php:80
 msgid "The work order been updated."
 msgstr ""
 
 msgid "The work order been updated."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:89
+#: manufacturing/work_order_entry.php:90
 msgid "Work order has been deleted."
 msgstr ""
 
 msgid "Work order has been deleted."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:99
+#: manufacturing/work_order_entry.php:100
 msgid ""
 "This work order has been closed. There can be no more issues against it."
 msgstr ""
 
 msgid ""
 "This work order has been closed. There can be no more issues against it."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:109
+#: manufacturing/work_order_entry.php:110
 msgid "Enter a new work order"
 msgstr ""
 
 msgid "Enter a new work order"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:110
+#: manufacturing/work_order_entry.php:111
 msgid "Select an existing work order"
 msgstr ""
 
 msgid "Select an existing work order"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:146
+#: manufacturing/work_order_entry.php:147
 msgid "The quantity entered is invalid or less than zero."
 msgstr ""
 
 msgid "The quantity entered is invalid or less than zero."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:168
+#: manufacturing/work_order_entry.php:169
 msgid "The selected item to manufacture does not have a bom."
 msgstr ""
 
 msgid "The selected item to manufacture does not have a bom."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:177
+#: manufacturing/work_order_entry.php:178
 msgid "The labour cost entered is invalid or less than zero."
 msgstr ""
 
 msgid "The labour cost entered is invalid or less than zero."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:185
+#: manufacturing/work_order_entry.php:186
 msgid "The cost entered is invalid or less than zero."
 msgstr ""
 
 msgid "The cost entered is invalid or less than zero."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:208
+#: manufacturing/work_order_entry.php:209
 msgid ""
 "The work order cannot be processed because there is an insufficient quantity "
 "for component:"
 msgstr ""
 
 msgid ""
 "The work order cannot be processed because there is an insufficient quantity "
 "for component:"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:222
+#: manufacturing/work_order_entry.php:223
 msgid ""
 "The selected item cannot be unassembled because there is insufficient stock."
 msgstr ""
 
 msgid ""
 "The selected item cannot be unassembled because there is insufficient stock."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:248
+#: manufacturing/work_order_entry.php:249
 msgid ""
 "The quantity cannot be changed to be less than the quantity already "
 "manufactured for this order."
 msgstr ""
 
 msgid ""
 "The quantity cannot be changed to be less than the quantity already "
 "manufactured for this order."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:297
+#: manufacturing/work_order_entry.php:298
 msgid ""
 "This work order cannot be deleted because it has already been processed."
 msgstr ""
 
 msgid ""
 "This work order cannot be deleted because it has already been processed."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:348
+#: manufacturing/work_order_entry.php:349
 msgid "This work order is closed and cannot be edited."
 msgstr ""
 
 msgid "This work order is closed and cannot be edited."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:396
-#: manufacturing/work_order_entry.php:404
+#: manufacturing/work_order_entry.php:397
+#: manufacturing/work_order_entry.php:405
 msgid "Destination Location:"
 msgstr ""
 
 msgid "Destination Location:"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:415
+#: manufacturing/work_order_entry.php:416
 msgid "Quantity Required:"
 msgstr ""
 
 msgid "Quantity Required:"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:417
+#: manufacturing/work_order_entry.php:418
 msgid "Quantity Manufactured:"
 msgstr ""
 
 msgid "Quantity Manufactured:"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:436
+#: manufacturing/work_order_entry.php:437
 msgid "Credit Labour Account"
 msgstr ""
 
 msgid "Credit Labour Account"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:443
+#: manufacturing/work_order_entry.php:444
 msgid "Credit Overhead Account"
 msgstr ""
 
 msgid "Credit Overhead Account"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:448
+#: manufacturing/work_order_entry.php:449
 msgid "Released On:"
 msgstr ""
 
 msgid "Released On:"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:458
+#: manufacturing/work_order_entry.php:459
 msgid "Save changes to work order"
 msgstr ""
 
 msgid "Save changes to work order"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:461
+#: manufacturing/work_order_entry.php:462
 msgid "Close This Work Order"
 msgstr ""
 
 msgid "Close This Work Order"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:463
+#: manufacturing/work_order_entry.php:464
 msgid "Delete This Work Order"
 msgstr ""
 
 msgid "Delete This Work Order"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:469
+#: manufacturing/work_order_entry.php:470
 msgid "Add Workorder"
 msgstr ""
 
 msgid "Add Workorder"
 msgstr ""
 
@@ -8544,23 +8625,23 @@ msgstr ""
 msgid "Reversed the production "
 msgstr ""
 
 msgid "Reversed the production "
 msgstr ""
 
-#: manufacturing/includes/db/work_orders_db.inc:306
+#: manufacturing/includes/db/work_orders_db.inc:278
 #: purchasing/includes/db/po_db.inc:116
 #: sales/includes/db/cust_trans_db.inc:109
 #: sales/includes/db/sales_order_db.inc:249
 msgid "Updated."
 msgstr ""
 
 #: purchasing/includes/db/po_db.inc:116
 #: sales/includes/db/cust_trans_db.inc:109
 #: sales/includes/db/sales_order_db.inc:249
 msgid "Updated."
 msgstr ""
 
-#: manufacturing/includes/db/work_orders_db.inc:328
+#: manufacturing/includes/db/work_orders_db.inc:297
 msgid "Canceled."
 msgstr ""
 
 msgid "Canceled."
 msgstr ""
 
-#: manufacturing/includes/db/work_orders_db.inc:404
+#: manufacturing/includes/db/work_orders_db.inc:373
 msgid "Released."
 msgstr ""
 
 msgid "Released."
 msgstr ""
 
-#: manufacturing/includes/db/work_orders_db.inc:493
-#: manufacturing/includes/db/work_orders_db.inc:518
+#: manufacturing/includes/db/work_orders_db.inc:445
+#: manufacturing/includes/db/work_orders_db.inc:461
 msgid "Voiding Work Order Trans # "
 msgstr ""
 
 msgid "Voiding Work Order Trans # "
 msgstr ""
 
@@ -8616,6 +8697,7 @@ msgstr ""
 #: purchasing/inquiry/po_search_completed.php:120
 #: purchasing/inquiry/po_search.php:134
 #: purchasing/inquiry/supplier_inquiry.php:166
 #: purchasing/inquiry/po_search_completed.php:120
 #: purchasing/inquiry/po_search.php:134
 #: purchasing/inquiry/supplier_inquiry.php:166
+#: purchasing/inquiry/supplier_inquiry.php.orig:166
 msgid "Supplier's Reference"
 msgstr ""
 
 msgid "Supplier's Reference"
 msgstr ""
 
@@ -8656,7 +8738,7 @@ msgid "Invoice Total:"
 msgstr ""
 
 #: purchasing/includes/ui/invoice_ui.inc:156
 msgstr ""
 
 #: purchasing/includes/ui/invoice_ui.inc:156
-#: sales/customer_credit_invoice.php:330
+#: sales/customer_credit_invoice.php:332
 #: sales/includes/ui/sales_credit_ui.inc:233
 msgid "Credit Note Total"
 msgstr ""
 #: sales/includes/ui/sales_credit_ui.inc:233
 msgid "Credit Note Total"
 msgstr ""
@@ -8694,7 +8776,7 @@ msgstr ""
 msgid "Add to Credit Note"
 msgstr ""
 
 msgid "Add to Credit Note"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:395 sales/customer_invoice.php:501
+#: purchasing/includes/ui/invoice_ui.inc:395 sales/customer_invoice.php:503
 msgid "Remove"
 msgstr ""
 
 msgid "Remove"
 msgstr ""
 
@@ -8706,11 +8788,10 @@ msgid ""
 msgstr ""
 
 #: purchasing/includes/ui/invoice_ui.inc:397
 msgstr ""
 
 #: purchasing/includes/ui/invoice_ui.inc:397
-#, php-format
 msgid ""
 msgid ""
-"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 ?"
+"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 ?"
 msgstr ""
 
 #: purchasing/includes/ui/invoice_ui.inc:428
 msgstr ""
 
 #: purchasing/includes/ui/invoice_ui.inc:428
@@ -8804,15 +8885,15 @@ msgstr ""
 msgid "Supplier Currency:"
 msgstr ""
 
 msgid "Supplier Currency:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:178 sales/sales_order_entry.php:682
+#: purchasing/includes/ui/po_ui.inc:178 sales/sales_order_entry.php:684
 msgid "Order Date:"
 msgstr ""
 
 msgid "Order Date:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:179 sales/sales_order_entry.php:669
+#: purchasing/includes/ui/po_ui.inc:179 sales/sales_order_entry.php:671
 msgid "Delivery Date:"
 msgstr ""
 
 msgid "Delivery Date:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:179 sales/sales_order_entry.php:663
+#: purchasing/includes/ui/po_ui.inc:179 sales/sales_order_entry.php:665
 msgid "Invoice Date:"
 msgstr ""
 
 msgid "Invoice Date:"
 msgstr ""
 
@@ -8857,8 +8938,8 @@ msgid "Line Total"
 msgstr ""
 
 #: purchasing/includes/ui/po_ui.inc:289 purchasing/po_receive_items.php:114
 msgstr ""
 
 #: purchasing/includes/ui/po_ui.inc:289 purchasing/po_receive_items.php:114
-#: reporting/includes/doctext.inc:149 sales/customer_credit_invoice.php:322
-#: sales/customer_delivery.php:498 sales/customer_invoice.php:542
+#: reporting/includes/doctext.inc:149 sales/customer_credit_invoice.php:324
+#: sales/customer_delivery.php:498 sales/customer_invoice.php:544
 #: sales/view/view_dispatch.php:146 sales/view/view_invoice.php:148
 #: sales/includes/ui/sales_credit_ui.inc:217
 #: sales/includes/ui/sales_order_ui.inc:229
 #: 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
@@ -8945,11 +9026,6 @@ msgstr ""
 msgid "Entry purchase &invoice for this receival"
 msgstr ""
 
 msgid "Entry purchase &invoice for this receival"
 msgstr ""
 
-#: purchasing/po_entry_items.php:109 purchasing/po_entry_items.php:133
-#: purchasing/supplier_credit.php:49 purchasing/supplier_invoice.php:52
-msgid "Add an Attachment"
-msgstr ""
-
 #: purchasing/po_entry_items.php:112
 msgid "Enter &Another GRN"
 msgstr ""
 #: purchasing/po_entry_items.php:112
 msgid "Enter &Another GRN"
 msgstr ""
@@ -8999,7 +9075,7 @@ msgstr ""
 msgid "Enter a new purchase order"
 msgstr ""
 
 msgid "Enter a new purchase order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:213 sales/sales_order_entry.php:463
+#: purchasing/po_entry_items.php:213 sales/sales_order_entry.php:465
 msgid "Item description cannot be empty."
 msgstr ""
 
 msgid "Item description cannot be empty."
 msgstr ""
 
@@ -9034,8 +9110,9 @@ msgid ""
 "purchased."
 msgstr ""
 
 "purchased."
 msgstr ""
 
-#: purchasing/po_entry_items.php:326 purchasing/supplier_invoice.php:352
-#: purchasing/supplier_payment.php:118
+#: purchasing/po_entry_items.php:326 purchasing/supplier_invoice.php:343
+#: purchasing/supplier_payment.php:117
+#: purchasing/supplier_payment.php.orig:114
 msgid "There is no supplier selected."
 msgstr ""
 
 msgid "There is no supplier selected."
 msgstr ""
 
@@ -9044,7 +9121,7 @@ msgid "The entered order date is invalid."
 msgstr ""
 
 #: purchasing/po_entry_items.php:340 purchasing/po_receive_items.php:181
 msgstr ""
 
 #: purchasing/po_entry_items.php:340 purchasing/po_receive_items.php:181
-#: sales/sales_order_entry.php:345
+#: sales/sales_order_entry.php:347
 msgid "The entered date is not in fiscal year"
 msgstr ""
 
 msgid "The entered date is not in fiscal year"
 msgstr ""
 
@@ -9073,7 +9150,7 @@ msgid ""
 "The order cannot be placed because there are no lines entered on this order."
 msgstr ""
 
 "The order cannot be placed because there are no lines entered on this order."
 msgstr ""
 
-#: purchasing/po_entry_items.php:516 sales/sales_order_entry.php:686
+#: purchasing/po_entry_items.php:516 sales/sales_order_entry.php:688
 msgid "Place Order"
 msgstr ""
 
 msgid "Place Order"
 msgstr ""
 
@@ -9081,7 +9158,7 @@ msgstr ""
 msgid "Update Order"
 msgstr ""
 
 msgid "Update Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:518 sales/sales_order_entry.php:685
+#: purchasing/po_entry_items.php:518 sales/sales_order_entry.php:687
 msgid "Cancel Order"
 msgstr ""
 
 msgid "Cancel Order"
 msgstr ""
 
@@ -9097,7 +9174,7 @@ msgstr ""
 msgid "Cancel GRN"
 msgstr ""
 
 msgid "Cancel GRN"
 msgstr ""
 
-#: purchasing/po_entry_items.php:525 sales/customer_invoice.php:561
+#: purchasing/po_entry_items.php:525 sales/customer_invoice.php:563
 msgid "Process Invoice"
 msgstr ""
 
 msgid "Process Invoice"
 msgstr ""
 
@@ -9105,7 +9182,7 @@ msgstr ""
 msgid "Update Invoice"
 msgstr ""
 
 msgid "Update Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:527 sales/sales_order_entry.php:666
+#: purchasing/po_entry_items.php:527 sales/sales_order_entry.php:668
 msgid "Cancel Invoice"
 msgstr ""
 
 msgid "Cancel Invoice"
 msgstr ""
 
@@ -9330,83 +9407,96 @@ msgid ""
 "necessary."
 msgstr ""
 
 "necessary."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:334
+#: purchasing/supplier_invoice.php:325
 #, php-format
 msgid "All yet non-invoiced items on delivery line # %d has been removed."
 msgstr ""
 
 #, php-format
 msgid "All yet non-invoiced items on delivery line # %d has been removed."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:376
+#: purchasing/supplier_invoice.php:367
 msgid "Enter Invoice"
 msgstr ""
 
 msgid "Enter Invoice"
 msgstr ""
 
-#: purchasing/supplier_payment.php:31
+#: purchasing/supplier_payment.php:31 purchasing/supplier_payment.php.orig:31
 msgid "Supplier Payment Entry"
 msgstr ""
 
 msgid "Supplier Payment Entry"
 msgstr ""
 
-#: purchasing/supplier_payment.php:89
+#: purchasing/supplier_payment.php:88 purchasing/supplier_payment.php.orig:85
 msgid "Invalid purchase invoice number."
 msgstr ""
 
 msgid "Invalid purchase invoice number."
 msgstr ""
 
-#: purchasing/supplier_payment.php:96
+#: purchasing/supplier_payment.php:95 purchasing/supplier_payment.php.orig:92
 msgid "Payment has been sucessfully entered"
 msgstr ""
 
 msgid "Payment has been sucessfully entered"
 msgstr ""
 
-#: purchasing/supplier_payment.php:98
+#: purchasing/supplier_payment.php:97 purchasing/supplier_payment.php.orig:94
 msgid "&Print This Remittance"
 msgstr ""
 
 msgid "&Print This Remittance"
 msgstr ""
 
-#: purchasing/supplier_payment.php:99
+#: purchasing/supplier_payment.php:98 purchasing/supplier_payment.php.orig:95
 msgid "&Email This Remittance"
 msgstr ""
 
 msgid "&Email This Remittance"
 msgstr ""
 
-#: purchasing/supplier_payment.php:101
+#: purchasing/supplier_payment.php:100 purchasing/supplier_payment.php.orig:97
 msgid "View the GL &Journal Entries for this Payment"
 msgstr ""
 
 msgid "View the GL &Journal Entries for this Payment"
 msgstr ""
 
-#: purchasing/supplier_payment.php:105
+#: purchasing/supplier_payment.php:104
+#: purchasing/supplier_payment.php.orig:101
 msgid "Enter another supplier &payment"
 msgstr ""
 
 msgid "Enter another supplier &payment"
 msgstr ""
 
-#: purchasing/supplier_payment.php:152 sales/customer_payments.php:139
+#: purchasing/supplier_payment.php:151
+#: purchasing/supplier_payment.php.orig:148 sales/customer_payments.php:139
+#: sales/customer_payments.php.orig:139
 msgid "The exchange rate must be numeric and greater than zero."
 msgstr ""
 
 msgid "The exchange rate must be numeric and greater than zero."
 msgstr ""
 
-#: purchasing/supplier_payment.php:164
+#: purchasing/supplier_payment.php:163
+#: purchasing/supplier_payment.php.orig:160
 msgid "The entered discount is invalid or less than zero."
 msgstr ""
 
 msgid "The entered discount is invalid or less than zero."
 msgstr ""
 
-#: purchasing/supplier_payment.php:172
+#: purchasing/supplier_payment.php:171
+#: purchasing/supplier_payment.php.orig:168
 msgid ""
 "The total of the amount and the discount is zero or negative. Please enter "
 "positive values."
 msgstr ""
 
 msgid ""
 "The total of the amount and the discount is zero or negative. Please enter "
 "positive values."
 msgstr ""
 
-#: purchasing/supplier_payment.php:273
+#: purchasing/supplier_payment.php:272
+#: purchasing/supplier_payment.php.orig:269
 msgid "Payment To:"
 msgstr ""
 
 msgid "Payment To:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:277
+#: purchasing/supplier_payment.php:279
+#: purchasing/supplier_payment.php.orig:281
 msgid "From Bank Account:"
 msgstr ""
 
 msgid "From Bank Account:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:285
+#: purchasing/supplier_payment.php:287
+#: purchasing/supplier_payment.php.orig:289
 #: purchasing/view/view_supp_payment.php:55
 msgid "Date Paid"
 msgstr ""
 
 #: purchasing/view/view_supp_payment.php:55
 msgid "Date Paid"
 msgstr ""
 
-#: purchasing/supplier_payment.php:308 sales/customer_payments.php:287
+#: purchasing/supplier_payment.php:311
+#: purchasing/supplier_payment.php.orig:312 sales/customer_payments.php:288
+#: sales/customer_payments.php.orig:289
 msgid "Amount of Discount:"
 msgstr ""
 
 msgid "Amount of Discount:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:309
+#: purchasing/supplier_payment.php:312
+#: purchasing/supplier_payment.php.orig:313
 msgid "Amount of Payment:"
 msgstr ""
 
 msgid "Amount of Payment:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:315
+#: purchasing/supplier_payment.php:318
+#: purchasing/supplier_payment.php.orig:319
 msgid "The amount and discount are in the bank account's currency."
 msgstr ""
 
 msgid "The amount and discount are in the bank account's currency."
 msgstr ""
 
-#: purchasing/supplier_payment.php:318
+#: purchasing/supplier_payment.php:321
+#: purchasing/supplier_payment.php.orig:322
 msgid "Enter Payment"
 msgstr ""
 
 msgid "Enter Payment"
 msgstr ""
 
@@ -9456,10 +9546,11 @@ msgstr ""
 #: purchasing/view/view_po.php:100
 #: purchasing/inquiry/supplier_allocation_inquiry.php:147
 #: purchasing/inquiry/supplier_inquiry.php:187
 #: purchasing/view/view_po.php:100
 #: purchasing/inquiry/supplier_allocation_inquiry.php:147
 #: purchasing/inquiry/supplier_inquiry.php:187
+#: purchasing/inquiry/supplier_inquiry.php.orig:187
 #: sales/inquiry/customer_allocation_inquiry.php:162
 #: sales/inquiry/customer_inquiry.php:239
 #: sales/inquiry/sales_deliveries_view.php:206
 #: sales/inquiry/customer_allocation_inquiry.php:162
 #: sales/inquiry/customer_inquiry.php:239
 #: sales/inquiry/sales_deliveries_view.php:206
-#: sales/inquiry/sales_orders_view.php:307
+#: sales/inquiry/sales_orders_view.php:309
 msgid "Marked items are overdue."
 msgstr ""
 
 msgid "Marked items are overdue."
 msgstr ""
 
@@ -9486,7 +9577,7 @@ msgstr ""
 
 #: purchasing/view/view_supp_credit.php:47
 #: purchasing/view/view_supp_invoice.php:50
 
 #: purchasing/view/view_supp_credit.php:47
 #: purchasing/view/view_supp_invoice.php:50
-#: sales/customer_credit_invoice.php:268 sales/view/view_invoice.php:95
+#: sales/customer_credit_invoice.php:270 sales/view/view_invoice.php:95
 msgid "Invoice Date"
 msgstr ""
 
 msgid "Invoice Date"
 msgstr ""
 
@@ -9762,56 +9853,67 @@ msgid "Allocated"
 msgstr ""
 
 #: purchasing/inquiry/supplier_inquiry.php:25
 msgstr ""
 
 #: purchasing/inquiry/supplier_inquiry.php:25
+#: purchasing/inquiry/supplier_inquiry.php.orig:25
 msgid "Supplier Inquiry"
 msgstr ""
 
 #: purchasing/inquiry/supplier_inquiry.php:47
 msgid "Supplier Inquiry"
 msgstr ""
 
 #: purchasing/inquiry/supplier_inquiry.php:47
+#: purchasing/inquiry/supplier_inquiry.php.orig:47
 msgid "Select a supplier:"
 msgstr ""
 
 #: purchasing/inquiry/supplier_inquiry.php:66
 #: purchasing/inquiry/supplier_inquiry.php:67
 msgid "Select a supplier:"
 msgstr ""
 
 #: purchasing/inquiry/supplier_inquiry.php:66
 #: purchasing/inquiry/supplier_inquiry.php:67
-#: purchasing/inquiry/supplier_inquiry.php:68 reporting/rep102.php:110
-#: reporting/rep102.php:111 reporting/rep102.php:112 reporting/rep102.php:227
-#: reporting/rep202.php:112 reporting/rep202.php:113 reporting/rep202.php:114
-#: reporting/rep202.php:143 reporting/rep202.php:144 reporting/rep202.php:145
-#: reporting/rep202.php:233 reporting/includes/doctext.inc:181
-#: sales/create_recurrent_invoices.php:98
-#: sales/manage/recurrent_invoices.php:85
+#: purchasing/inquiry/supplier_inquiry.php:68
+#: purchasing/inquiry/supplier_inquiry.php.orig:66
+#: purchasing/inquiry/supplier_inquiry.php.orig:67
+#: purchasing/inquiry/supplier_inquiry.php.orig:68 reporting/rep102.php:120
+#: reporting/rep102.php:121 reporting/rep102.php:122 reporting/rep102.php:242
+#: reporting/rep202.php:122 reporting/rep202.php:123 reporting/rep202.php:124
+#: reporting/rep202.php:154 reporting/rep202.php:155 reporting/rep202.php:156
+#: reporting/rep202.php:248 reporting/includes/doctext.inc:181
+#: sales/create_recurrent_invoices.php:115
+#: sales/manage/recurrent_invoices.php:102
 #: sales/inquiry/customer_inquiry.php:71 sales/inquiry/customer_inquiry.php:72
 #: sales/inquiry/customer_inquiry.php:73
 msgid "Days"
 msgstr ""
 
 #: sales/inquiry/customer_inquiry.php:71 sales/inquiry/customer_inquiry.php:72
 #: sales/inquiry/customer_inquiry.php:73
 msgid "Days"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:68 reporting/rep102.php:112
-#: reporting/rep202.php:114 reporting/rep202.php:145
+#: purchasing/inquiry/supplier_inquiry.php:68
+#: purchasing/inquiry/supplier_inquiry.php.orig:68 reporting/rep102.php:122
+#: reporting/rep202.php:124 reporting/rep202.php:156
 #: reporting/includes/doctext.inc:182 sales/inquiry/customer_inquiry.php:73
 msgid "Over"
 msgstr ""
 
 #: purchasing/inquiry/supplier_inquiry.php:72
 #: reporting/includes/doctext.inc:182 sales/inquiry/customer_inquiry.php:73
 msgid "Over"
 msgstr ""
 
 #: purchasing/inquiry/supplier_inquiry.php:72
+#: purchasing/inquiry/supplier_inquiry.php.orig:72
 #: sales/inquiry/customer_inquiry.php:76
 msgid "Terms"
 msgstr ""
 
 #: sales/inquiry/customer_inquiry.php:76
 msgid "Terms"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:72 reporting/rep102.php:115
-#: reporting/rep102.php:225 reporting/rep202.php:118 reporting/rep202.php:231
+#: purchasing/inquiry/supplier_inquiry.php:72
+#: purchasing/inquiry/supplier_inquiry.php.orig:72 reporting/rep102.php:125
+#: reporting/rep102.php:240 reporting/rep202.php:128 reporting/rep202.php:246
 #: reporting/includes/doctext.inc:177 sales/inquiry/customer_inquiry.php:76
 msgid "Current"
 msgstr ""
 
 #: reporting/includes/doctext.inc:177 sales/inquiry/customer_inquiry.php:76
 msgid "Current"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:73 reporting/rep102.php:116
-#: reporting/rep202.php:119 reporting/includes/doctext.inc:178
+#: purchasing/inquiry/supplier_inquiry.php:73
+#: purchasing/inquiry/supplier_inquiry.php.orig:73 reporting/rep102.php:126
+#: reporting/rep202.php:129 reporting/includes/doctext.inc:178
 #: sales/inquiry/customer_inquiry.php:77
 msgid "Total Balance"
 msgstr ""
 
 #: purchasing/inquiry/supplier_inquiry.php:127
 #: sales/inquiry/customer_inquiry.php:77
 msgid "Total Balance"
 msgstr ""
 
 #: purchasing/inquiry/supplier_inquiry.php:127
+#: purchasing/inquiry/supplier_inquiry.php.orig:127
 #: sales/inquiry/customer_inquiry.php:158
 msgid "Credit This"
 msgstr ""
 
 #: purchasing/inquiry/supplier_inquiry.php:149
 #: sales/inquiry/customer_inquiry.php:158
 msgid "Credit This"
 msgstr ""
 
 #: purchasing/inquiry/supplier_inquiry.php:149
+#: purchasing/inquiry/supplier_inquiry.php.orig:149
 msgid "Print Remittance"
 msgstr ""
 
 msgid "Print Remittance"
 msgstr ""
 
@@ -9880,8 +9982,8 @@ msgstr ""
 msgid "Marked items are settled."
 msgstr ""
 
 msgid "Marked items are settled."
 msgstr ""
 
-#: reporting/rep101.php:120 reporting/rep102.php:100 reporting/rep114.php:103
-#: reporting/rep202.php:102 reporting/rep203.php:81
+#: reporting/rep101.php:120 reporting/rep102.php:108 reporting/rep114.php:103
+#: reporting/rep202.php:110 reporting/rep203.php:81
 msgid "Balances in Home Currency"
 msgstr ""
 
 msgid "Balances in Home Currency"
 msgstr ""
 
@@ -9901,11 +10003,11 @@ msgstr ""
 msgid "Credits"
 msgstr ""
 
 msgid "Credits"
 msgstr ""
 
-#: reporting/rep101.php:139 reporting/rep102.php:125 reporting/rep201.php:127
-#: reporting/rep202.php:128 reporting/rep203.php:100 reporting/rep303.php:124
-#: reporting/reports_main.php:38 reporting/reports_main.php:46
-#: reporting/reports_main.php:137 reporting/reports_main.php:145
-#: reporting/reports_main.php:153 reporting/reports_main.php:192
+#: reporting/rep101.php:139 reporting/rep102.php:136 reporting/rep201.php:127
+#: reporting/rep202.php:139 reporting/rep203.php:100 reporting/rep303.php:124
+#: reporting/reports_main.php:38 reporting/reports_main.php:47
+#: reporting/reports_main.php:138 reporting/reports_main.php:147
+#: reporting/reports_main.php:155 reporting/reports_main.php:194
 msgid "Suppress Zeros"
 msgstr ""
 
 msgid "Suppress Zeros"
 msgstr ""
 
@@ -9913,42 +10015,48 @@ msgstr ""
 msgid "Customer Balances"
 msgstr ""
 
 msgid "Customer Balances"
 msgstr ""
 
-#: reporting/rep101.php:244 reporting/rep102.php:211 reporting/rep106.php:177
-#: reporting/rep201.php:231 reporting/rep202.php:216 reporting/rep203.php:177
+#: reporting/rep101.php:244 reporting/rep102.php:226 reporting/rep106.php:177
+#: reporting/rep201.php:231 reporting/rep202.php:231 reporting/rep203.php:177
 #: reporting/rep204.php:144 reporting/rep301.php:172 reporting/rep304.php:193
 #: reporting/rep305.php:181
 msgid "Grand Total"
 msgstr ""
 
 #: reporting/rep204.php:144 reporting/rep301.php:172 reporting/rep304.php:193
 #: reporting/rep305.php:181
 msgid "Grand Total"
 msgstr ""
 
-#: reporting/rep102.php:94 reporting/rep106.php:91 reporting/rep202.php:96
-#: reporting/rep709.php:93 reporting/reports_main.php:45
-#: reporting/reports_main.php:83 reporting/reports_main.php:144
-#: reporting/reports_main.php:178 reporting/reports_main.php:390
+#: reporting/rep102.php:102 reporting/rep106.php:91 reporting/rep202.php:104
+#: reporting/rep709.php:93 reporting/reports_main.php:46
+#: reporting/reports_main.php:84 reporting/reports_main.php:146
+#: reporting/reports_main.php:180 reporting/reports_main.php:392
 msgid "Summary Only"
 msgstr ""
 
 msgid "Summary Only"
 msgstr ""
 
-#: reporting/rep102.php:96 reporting/rep202.php:98 reporting/rep709.php:95
+#: reporting/rep102.php:104 reporting/rep202.php:106 reporting/rep709.php:95
 msgid "Detailed Report"
 msgstr ""
 
 msgid "Detailed Report"
 msgstr ""
 
-#: reporting/rep102.php:121 reporting/rep202.php:124 reporting/rep203.php:97
+#: reporting/rep102.php:131 reporting/rep202.php:134 reporting/rep203.php:97
 #: reporting/reports_main.php:35 reporting/reports_main.php:42
 #: reporting/reports_main.php:35 reporting/reports_main.php:42
-#: reporting/reports_main.php:60 reporting/reports_main.php:74
-#: reporting/reports_main.php:82 reporting/reports_main.php:134
-#: reporting/reports_main.php:141 reporting/reports_main.php:150
-#: reporting/reports_main.php:197 reporting/reports_main.php:205
-#: reporting/reports_main.php:237 reporting/reports_main.php:248
-#: reporting/reports_main.php:259 reporting/reports_main.php:275
-#: reporting/reports_main.php:285 reporting/reports_main.php:296
-#: reporting/reports_main.php:308 reporting/reports_main.php:322
-#: reporting/reports_main.php:331 reporting/reports_main.php:341
-#: reporting/reports_main.php:352 reporting/reports_main.php:364
-#: reporting/reports_main.php:372 reporting/reports_main.php:381
-#: reporting/reports_main.php:389 reporting/reports_main.php:395
+#: reporting/reports_main.php:61 reporting/reports_main.php:75
+#: reporting/reports_main.php:83 reporting/reports_main.php:135
+#: reporting/reports_main.php:142 reporting/reports_main.php:152
+#: reporting/reports_main.php:199 reporting/reports_main.php:207
+#: reporting/reports_main.php:239 reporting/reports_main.php:250
+#: reporting/reports_main.php:261 reporting/reports_main.php:277
+#: reporting/reports_main.php:287 reporting/reports_main.php:298
+#: reporting/reports_main.php:310 reporting/reports_main.php:324
+#: reporting/reports_main.php:333 reporting/reports_main.php:343
+#: reporting/reports_main.php:354 reporting/reports_main.php:366
+#: reporting/reports_main.php:374 reporting/reports_main.php:383
+#: reporting/reports_main.php:391 reporting/reports_main.php:397
 msgid "End Date"
 msgstr ""
 
 msgid "End Date"
 msgstr ""
 
-#: reporting/rep102.php:129
+#: reporting/rep102.php:135 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:140
 msgid "Aged Customer Analysis"
 msgstr ""
 
 msgid "Aged Customer Analysis"
 msgstr ""
 
@@ -9984,16 +10092,16 @@ msgstr ""
 msgid "Branch Delivery Address"
 msgstr ""
 
 msgid "Branch Delivery Address"
 msgstr ""
 
-#: reporting/rep103.php:142 reporting/reports_main.php:51
+#: reporting/rep103.php:142 reporting/reports_main.php:52
 msgid "Activity Since"
 msgstr ""
 
 msgid "Activity Since"
 msgstr ""
 
-#: reporting/rep103.php:143 reporting/reports_main.php:52
+#: reporting/rep103.php:143 reporting/reports_main.php:53
 #: sales/manage/sales_areas.php:16
 msgid "Sales Areas"
 msgstr ""
 
 #: sales/manage/sales_areas.php:16
 msgid "Sales Areas"
 msgstr ""
 
-#: reporting/rep103.php:144 reporting/reports_main.php:53
+#: reporting/rep103.php:144 reporting/reports_main.php:54
 msgid "Sales Folk"
 msgstr ""
 
 msgid "Sales Folk"
 msgstr ""
 
@@ -10034,7 +10142,7 @@ msgstr ""
 msgid "GP %"
 msgstr ""
 
 msgid "GP %"
 msgstr ""
 
-#: reporting/rep104.php:117 reporting/reports_main.php:69
+#: reporting/rep104.php:117 reporting/reports_main.php:70
 msgid "Show GP %"
 msgstr ""
 
 msgid "Show GP %"
 msgstr ""
 
@@ -10050,7 +10158,7 @@ msgstr ""
 msgid "All Orders"
 msgstr ""
 
 msgid "All Orders"
 msgstr ""
 
-#: reporting/rep105.php:103 reporting/reports_main.php:77
+#: reporting/rep105.php:103 reporting/reports_main.php:78
 msgid "Back Orders Only"
 msgstr ""
 
 msgid "Back Orders Only"
 msgstr ""
 
@@ -10061,9 +10169,9 @@ msgid "Order"
 msgstr ""
 
 #: reporting/rep105.php:107 reporting/rep106.php:81
 msgstr ""
 
 #: reporting/rep105.php:107 reporting/rep106.php:81
-#: reporting/includes/doctext.inc:165 sales/create_recurrent_invoices.php:98
-#: sales/customer_credit_invoice.php:236 sales/customer_delivery.php:336
-#: sales/customer_invoice.php:373 sales/manage/recurrent_invoices.php:85
+#: reporting/includes/doctext.inc:165 sales/create_recurrent_invoices.php:115
+#: sales/customer_credit_invoice.php:238 sales/customer_delivery.php:336
+#: sales/customer_invoice.php:375 sales/manage/recurrent_invoices.php:102
 #: sales/view/view_credit.php:58 sales/inquiry/customer_inquiry.php:219
 #: sales/inquiry/sales_deliveries_view.php:182
 #: sales/inquiry/sales_orders_view.php:256
 #: sales/view/view_credit.php:58 sales/inquiry/customer_inquiry.php:219
 #: sales/inquiry/sales_deliveries_view.php:182
 #: sales/inquiry/sales_orders_view.php:256
@@ -10088,7 +10196,7 @@ msgid "Loc"
 msgstr ""
 
 #: reporting/rep105.php:112 sales/customer_delivery.php:429
 msgstr ""
 
 #: reporting/rep105.php:112 sales/customer_delivery.php:429
-#: sales/customer_invoice.php:446
+#: sales/customer_invoice.php:448
 msgid "Invoiced"
 msgstr ""
 
 msgid "Invoiced"
 msgstr ""
 
@@ -10161,7 +10269,7 @@ msgstr ""
 msgid "DELIVERY NOTE"
 msgstr ""
 
 msgid "DELIVERY NOTE"
 msgstr ""
 
-#: reporting/rep111.php:60 reporting/rep111.php:85
+#: reporting/rep111.php:61 reporting/rep111.php:86
 #: reporting/includes/doctext.inc:86
 msgid "SALES QUOTATION"
 msgstr ""
 #: reporting/includes/doctext.inc:86
 msgid "SALES QUOTATION"
 msgstr ""
@@ -10180,7 +10288,7 @@ msgstr ""
 msgid "Sales Summary Report"
 msgstr ""
 
 msgid "Sales Summary Report"
 msgstr ""
 
-#: reporting/rep114.php:89 reporting/reports_main.php:61
+#: reporting/rep114.php:89 reporting/reports_main.php:62
 msgid "Tax Id Only"
 msgstr ""
 
 msgid "Tax Id Only"
 msgstr ""
 
@@ -10204,11 +10312,11 @@ msgstr ""
 msgid "Supplier Balances"
 msgstr ""
 
 msgid "Supplier Balances"
 msgstr ""
 
-#: reporting/rep202.php:131
+#: reporting/rep202.php:142
 msgid "currency"
 msgstr ""
 
 msgid "currency"
 msgstr ""
 
-#: reporting/rep202.php:132
+#: reporting/rep202.php:143
 msgid "Aged Supplier Analysis"
 msgstr ""
 
 msgid "Aged Supplier Analysis"
 msgstr ""
 
@@ -10389,8 +10497,8 @@ msgid "GL Account Transactions"
 msgstr ""
 
 #: reporting/rep705.php:243 reporting/rep705.php:256 reporting/rep705.php:267
 msgstr ""
 
 #: reporting/rep705.php:243 reporting/rep705.php:256 reporting/rep705.php:267
-#: reporting/reports_main.php:267 reporting/reports_main.php:315
-#: reporting/reports_main.php:358
+#: reporting/reports_main.php:269 reporting/reports_main.php:317
+#: reporting/reports_main.php:360
 msgid "Year"
 msgstr ""
 
 msgid "Year"
 msgstr ""
 
@@ -10412,12 +10520,6 @@ msgstr ""
 msgid "Close Balance"
 msgstr ""
 
 msgid "Close Balance"
 msgstr ""
 
-#: reporting/rep706.php:302 reporting/rep707.php:320 reporting/rep708.php:50
-#: reporting/rep708.php:116 sales/create_recurrent_invoices.php:98
-#: sales/manage/recurrent_invoices.php:85
-msgid "Group"
-msgstr ""
-
 #: reporting/rep707.php:254
 msgid "Profit and Loss Statement"
 msgstr ""
 #: reporting/rep707.php:254
 msgid "Profit and Loss Statement"
 msgstr ""
@@ -10458,7 +10560,7 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
 msgid "Action"
 msgstr ""
 
-#: reporting/rep710.php:87 reporting/reports_main.php:393
+#: reporting/rep710.php:87 reporting/reports_main.php:395
 msgid "Audit Trail"
 msgstr ""
 
 msgid "Audit Trail"
 msgstr ""
 
@@ -10475,34 +10577,34 @@ msgid "Customer &Balances"
 msgstr ""
 
 #: reporting/reports_main.php:37 reporting/reports_main.php:44
 msgstr ""
 
 #: reporting/reports_main.php:37 reporting/reports_main.php:44
-#: reporting/reports_main.php:65 reporting/reports_main.php:89
-#: reporting/reports_main.php:96 reporting/reports_main.php:108
-#: reporting/reports_main.php:115 reporting/reports_main.php:122
-#: reporting/reports_main.php:128 reporting/reports_main.php:136
-#: reporting/reports_main.php:143 reporting/reports_main.php:152
-#: reporting/reports_main.php:163 reporting/reports_main.php:169
+#: 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 ""
 
 msgid "Currency Filter"
 msgstr ""
 
-#: reporting/reports_main.php:40 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:139
-#: reporting/reports_main.php:148 reporting/reports_main.php:155
-#: reporting/reports_main.php:159 reporting/reports_main.php:180
-#: reporting/reports_main.php:185 reporting/reports_main.php:194
-#: reporting/reports_main.php:202 reporting/reports_main.php:207
-#: reporting/reports_main.php:214 reporting/reports_main.php:228
-#: reporting/reports_main.php:239 reporting/reports_main.php:245
-#: reporting/reports_main.php:251 reporting/reports_main.php:265
-#: reporting/reports_main.php:272 reporting/reports_main.php:282
-#: reporting/reports_main.php:293 reporting/reports_main.php:302
-#: reporting/reports_main.php:313 reporting/reports_main.php:319
-#: reporting/reports_main.php:328 reporting/reports_main.php:338
-#: reporting/reports_main.php:346 reporting/reports_main.php:356
-#: reporting/reports_main.php:361 reporting/reports_main.php:369
-#: reporting/reports_main.php:378 reporting/reports_main.php:385
-#: reporting/reports_main.php:392 reporting/reports_main.php:399
+#: reporting/reports_main.php:40 reporting/reports_main.php:50
+#: reporting/reports_main.php:58 reporting/reports_main.php:64
+#: reporting/reports_main.php:72 reporting/reports_main.php:80
+#: reporting/reports_main.php:86 reporting/reports_main.php:140
+#: reporting/reports_main.php:150 reporting/reports_main.php:157
+#: reporting/reports_main.php:161 reporting/reports_main.php:182
+#: reporting/reports_main.php:187 reporting/reports_main.php:196
+#: reporting/reports_main.php:204 reporting/reports_main.php:209
+#: reporting/reports_main.php:216 reporting/reports_main.php:230
+#: reporting/reports_main.php:241 reporting/reports_main.php:247
+#: reporting/reports_main.php:253 reporting/reports_main.php:267
+#: reporting/reports_main.php:274 reporting/reports_main.php:284
+#: reporting/reports_main.php:295 reporting/reports_main.php:304
+#: reporting/reports_main.php:315 reporting/reports_main.php:321
+#: reporting/reports_main.php:330 reporting/reports_main.php:340
+#: reporting/reports_main.php:348 reporting/reports_main.php:358
+#: reporting/reports_main.php:363 reporting/reports_main.php:371
+#: reporting/reports_main.php:380 reporting/reports_main.php:387
+#: reporting/reports_main.php:394 reporting/reports_main.php:401
 msgid "Destination"
 msgstr ""
 
 msgid "Destination"
 msgstr ""
 
@@ -10510,272 +10612,268 @@ msgstr ""
 msgid "&Aged Customer Analysis"
 msgstr ""
 
 msgid "&Aged Customer Analysis"
 msgstr ""
 
-#: reporting/reports_main.php:47 reporting/reports_main.php:146
-#: reporting/reports_main.php:280 reporting/reports_main.php:291
-#: reporting/reports_main.php:326 reporting/reports_main.php:336
-#: reporting/reports_main.php:367 reporting/reports_main.php:376
+#: reporting/reports_main.php:48 reporting/reports_main.php:148
+#: reporting/reports_main.php:282 reporting/reports_main.php:293
+#: reporting/reports_main.php:328 reporting/reports_main.php:338
+#: reporting/reports_main.php:369 reporting/reports_main.php:378
 msgid "Graphics"
 msgstr ""
 
 msgid "Graphics"
 msgstr ""
 
-#: reporting/reports_main.php:50
+#: reporting/reports_main.php:51
 msgid "Customer &Detail Listing"
 msgstr ""
 
 msgid "Customer &Detail Listing"
 msgstr ""
 
-#: reporting/reports_main.php:54
+#: reporting/reports_main.php:55
 msgid "Activity Greater Than"
 msgstr ""
 
 msgid "Activity Greater Than"
 msgstr ""
 
-#: reporting/reports_main.php:55
+#: reporting/reports_main.php:56
 msgid "Activity Less Than"
 msgstr ""
 
 msgid "Activity Less Than"
 msgstr ""
 
-#: reporting/reports_main.php:58
+#: reporting/reports_main.php:59
 msgid "Sales &Summary Report"
 msgstr ""
 
 msgid "Sales &Summary Report"
 msgstr ""
 
-#: reporting/reports_main.php:64
+#: reporting/reports_main.php:65
 msgid "&Price Listing"
 msgstr ""
 
 msgid "&Price Listing"
 msgstr ""
 
-#: reporting/reports_main.php:66 reporting/reports_main.php:75
-#: reporting/reports_main.php:176 reporting/reports_main.php:182
-#: reporting/reports_main.php:187 reporting/reports_main.php:198
+#: reporting/reports_main.php:67 reporting/reports_main.php:76
+#: reporting/reports_main.php:178 reporting/reports_main.php:184
+#: reporting/reports_main.php:189 reporting/reports_main.php:200
 msgid "Inventory Category"
 msgstr ""
 
 msgid "Inventory Category"
 msgstr ""
 
-#: reporting/reports_main.php:67 sales/manage/sales_types.php:16
+#: reporting/reports_main.php:68 sales/manage/sales_types.php:16
 msgid "Sales Types"
 msgstr ""
 
 msgid "Sales Types"
 msgstr ""
 
-#: reporting/reports_main.php:68 reporting/reports_main.php:189
+#: reporting/reports_main.php:69 reporting/reports_main.php:191
 msgid "Show Pictures"
 msgstr ""
 
 msgid "Show Pictures"
 msgstr ""
 
-#: reporting/reports_main.php:72
+#: reporting/reports_main.php:73
 msgid "&Order Status Listing"
 msgstr ""
 
 msgid "&Order Status Listing"
 msgstr ""
 
-#: reporting/reports_main.php:76
+#: reporting/reports_main.php:77
 msgid "Stock Location"
 msgstr ""
 
 msgid "Stock Location"
 msgstr ""
 
-#: reporting/reports_main.php:80
+#: reporting/reports_main.php:81
 msgid "&Salesman Listing"
 msgstr ""
 
 msgid "&Salesman Listing"
 msgstr ""
 
-#: reporting/reports_main.php:86
+#: reporting/reports_main.php:87
 msgid "Print &Invoices"
 msgstr ""
 
 msgid "Print &Invoices"
 msgstr ""
 
-#: reporting/reports_main.php:90 reporting/reports_main.php:97
-#: reporting/reports_main.php:103
+#: reporting/reports_main.php:91 reporting/reports_main.php:98
+#: reporting/reports_main.php:104
 msgid "email Customers"
 msgstr ""
 
 msgid "email Customers"
 msgstr ""
 
-#: reporting/reports_main.php:91 reporting/reports_main.php:98
+#: reporting/reports_main.php:92 reporting/reports_main.php:99
 msgid "Payment Link"
 msgstr ""
 
 msgid "Payment Link"
 msgstr ""
 
-#: reporting/reports_main.php:93
+#: reporting/reports_main.php:94
 msgid "Print &Credit Notes"
 msgstr ""
 
 msgid "Print &Credit Notes"
 msgstr ""
 
-#: reporting/reports_main.php:100
+#: reporting/reports_main.php:101
 msgid "Print &Deliveries"
 msgstr ""
 
 msgid "Print &Deliveries"
 msgstr ""
 
-#: reporting/reports_main.php:104
+#: reporting/reports_main.php:105
 msgid "Print as Packing Slip"
 msgstr ""
 
 msgid "Print as Packing Slip"
 msgstr ""
 
-#: reporting/reports_main.php:106
+#: reporting/reports_main.php:107
 msgid "Print &Statements"
 msgstr ""
 
 msgid "Print &Statements"
 msgstr ""
 
-#: reporting/reports_main.php:109
-msgid "Show Outstanding Only"
-msgstr ""
-
-#: reporting/reports_main.php:110 reporting/reports_main.php:116
-#: reporting/reports_main.php:123 reporting/reports_main.php:164
-#: reporting/reports_main.php:170
+#: 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 ""
 
 msgid "Email Customers"
 msgstr ""
 
-#: reporting/reports_main.php:112
+#: reporting/reports_main.php:113
 msgid "&Print Sales Orders"
 msgstr ""
 
 msgid "&Print Sales Orders"
 msgstr ""
 
-#: reporting/reports_main.php:117
+#: reporting/reports_main.php:118
 msgid "Print as Quote"
 msgstr ""
 
 msgid "Print as Quote"
 msgstr ""
 
-#: reporting/reports_main.php:119
+#: reporting/reports_main.php:120
 msgid "&Print Sales Quotations"
 msgstr ""
 
 msgid "&Print Sales Quotations"
 msgstr ""
 
-#: reporting/reports_main.php:125
+#: reporting/reports_main.php:126
 msgid "Print Receipts"
 msgstr ""
 
 msgid "Print Receipts"
 msgstr ""
 
-#: reporting/reports_main.php:132
+#: reporting/reports_main.php:133
 msgid "Supplier &Balances"
 msgstr ""
 
 msgid "Supplier &Balances"
 msgstr ""
 
-#: reporting/reports_main.php:140
+#: reporting/reports_main.php:141
 msgid "&Aged Supplier Analyses"
 msgstr ""
 
 msgid "&Aged Supplier Analyses"
 msgstr ""
 
-#: reporting/reports_main.php:149
+#: reporting/reports_main.php:151
 msgid "&Payment Report"
 msgstr ""
 
 msgid "&Payment Report"
 msgstr ""
 
-#: reporting/reports_main.php:156
+#: reporting/reports_main.php:158
 msgid "Outstanding &GRNs Report"
 msgstr ""
 
 msgid "Outstanding &GRNs Report"
 msgstr ""
 
-#: reporting/reports_main.php:160
+#: reporting/reports_main.php:162
 msgid "Print Purchase &Orders"
 msgstr ""
 
 msgid "Print Purchase &Orders"
 msgstr ""
 
-#: reporting/reports_main.php:166
+#: reporting/reports_main.php:168
 msgid "Print Remittances"
 msgstr ""
 
 msgid "Print Remittances"
 msgstr ""
 
-#: reporting/reports_main.php:175
+#: reporting/reports_main.php:177
 msgid "Inventory &Valuation Report"
 msgstr ""
 
 msgid "Inventory &Valuation Report"
 msgstr ""
 
-#: reporting/reports_main.php:181
+#: reporting/reports_main.php:183
 msgid "Inventory &Planning Report"
 msgstr ""
 
 msgid "Inventory &Planning Report"
 msgstr ""
 
-#: reporting/reports_main.php:186
+#: reporting/reports_main.php:188
 msgid "Stock &Check Sheets"
 msgstr ""
 
 msgid "Stock &Check Sheets"
 msgstr ""
 
-#: reporting/reports_main.php:190
+#: reporting/reports_main.php:192
 msgid "Inventory Column"
 msgstr ""
 
 msgid "Inventory Column"
 msgstr ""
 
-#: reporting/reports_main.php:191
+#: reporting/reports_main.php:193
 msgid "Show Shortage"
 msgstr ""
 
 msgid "Show Shortage"
 msgstr ""
 
-#: reporting/reports_main.php:195
+#: reporting/reports_main.php:197
 msgid "Inventory &Sales Report"
 msgstr ""
 
 msgid "Inventory &Sales Report"
 msgstr ""
 
-#: reporting/reports_main.php:203
+#: reporting/reports_main.php:205
 msgid "&GRN Valuation Report"
 msgstr ""
 
 msgid "&GRN Valuation Report"
 msgstr ""
 
-#: reporting/reports_main.php:209
+#: reporting/reports_main.php:211
 msgid "Manufacturing"
 msgstr ""
 
 msgid "Manufacturing"
 msgstr ""
 
-#: reporting/reports_main.php:210
+#: reporting/reports_main.php:212
 msgid "&Bill of Material Listing"
 msgstr ""
 
 msgid "&Bill of Material Listing"
 msgstr ""
 
-#: reporting/reports_main.php:211
+#: reporting/reports_main.php:213
 msgid "From product"
 msgstr ""
 
 msgid "From product"
 msgstr ""
 
-#: reporting/reports_main.php:212
+#: reporting/reports_main.php:214
 msgid "To product"
 msgstr ""
 
 msgid "To product"
 msgstr ""
 
-#: reporting/reports_main.php:215
+#: reporting/reports_main.php:217
 msgid "Print &Work Orders"
 msgstr ""
 
 msgid "Print &Work Orders"
 msgstr ""
 
-#: reporting/reports_main.php:218
+#: reporting/reports_main.php:220
 msgid "Email Locations"
 msgstr ""
 
 msgid "Email Locations"
 msgstr ""
 
-#: reporting/reports_main.php:223
+#: reporting/reports_main.php:225
 msgid "Dimension &Summary"
 msgstr ""
 
 msgid "Dimension &Summary"
 msgstr ""
 
-#: reporting/reports_main.php:224
+#: reporting/reports_main.php:226
 msgid "From Dimension"
 msgstr ""
 
 msgid "From Dimension"
 msgstr ""
 
-#: reporting/reports_main.php:225
+#: reporting/reports_main.php:227
 msgid "To Dimension"
 msgstr ""
 
 msgid "To Dimension"
 msgstr ""
 
-#: reporting/reports_main.php:226
+#: reporting/reports_main.php:228
 msgid "Show Balance"
 msgstr ""
 
 msgid "Show Balance"
 msgstr ""
 
-#: reporting/reports_main.php:233
+#: reporting/reports_main.php:235
 msgid "Banking"
 msgstr ""
 
 msgid "Banking"
 msgstr ""
 
-#: reporting/reports_main.php:234
+#: reporting/reports_main.php:236
 msgid "Bank &Statement"
 msgstr ""
 
 msgid "Bank &Statement"
 msgstr ""
 
-#: reporting/reports_main.php:241
+#: reporting/reports_main.php:243
 msgid "General Ledger"
 msgstr ""
 
 msgid "General Ledger"
 msgstr ""
 
-#: reporting/reports_main.php:242
+#: reporting/reports_main.php:244
 msgid "Chart of &Accounts"
 msgstr ""
 
 msgid "Chart of &Accounts"
 msgstr ""
 
-#: reporting/reports_main.php:243
+#: reporting/reports_main.php:245
 msgid "Show Balances"
 msgstr ""
 
 msgid "Show Balances"
 msgstr ""
 
-#: reporting/reports_main.php:246
+#: reporting/reports_main.php:248
 msgid "List of &Journal Entries"
 msgstr ""
 
 msgid "List of &Journal Entries"
 msgstr ""
 
-#: reporting/reports_main.php:257 reporting/reports_main.php:306
-#: reporting/reports_main.php:350
+#: reporting/reports_main.php:259 reporting/reports_main.php:308
+#: reporting/reports_main.php:352
 msgid "GL Account &Transactions"
 msgstr ""
 
 msgid "GL Account &Transactions"
 msgstr ""
 
-#: reporting/reports_main.php:260 reporting/reports_main.php:309
-#: reporting/reports_main.php:353
+#: reporting/reports_main.php:262 reporting/reports_main.php:311
+#: reporting/reports_main.php:355
 msgid "From Account"
 msgstr ""
 
 msgid "From Account"
 msgstr ""
 
-#: reporting/reports_main.php:261 reporting/reports_main.php:310
-#: reporting/reports_main.php:354
+#: reporting/reports_main.php:263 reporting/reports_main.php:312
+#: reporting/reports_main.php:356
 msgid "To Account"
 msgstr ""
 
 msgid "To Account"
 msgstr ""
 
-#: reporting/reports_main.php:266 reporting/reports_main.php:314
-#: reporting/reports_main.php:357
+#: reporting/reports_main.php:268 reporting/reports_main.php:316
+#: reporting/reports_main.php:359
 msgid "Annual &Expense Breakdown"
 msgstr ""
 
 msgid "Annual &Expense Breakdown"
 msgstr ""
 
-#: reporting/reports_main.php:273 reporting/reports_main.php:320
-#: reporting/reports_main.php:362
+#: reporting/reports_main.php:275 reporting/reports_main.php:322
+#: reporting/reports_main.php:364
 msgid "&Balance Sheet"
 msgstr ""
 
 msgid "&Balance Sheet"
 msgstr ""
 
-#: reporting/reports_main.php:279 reporting/reports_main.php:290
-#: reporting/reports_main.php:325 reporting/reports_main.php:335
-#: reporting/reports_main.php:366 reporting/reports_main.php:375
+#: reporting/reports_main.php:281 reporting/reports_main.php:292
+#: reporting/reports_main.php:327 reporting/reports_main.php:337
+#: reporting/reports_main.php:368 reporting/reports_main.php:377
 msgid "Decimal values"
 msgstr ""
 
 msgid "Decimal values"
 msgstr ""
 
-#: reporting/reports_main.php:283 reporting/reports_main.php:329
-#: reporting/reports_main.php:370
+#: reporting/reports_main.php:285 reporting/reports_main.php:331
+#: reporting/reports_main.php:372
 msgid "&Profit and Loss Statement"
 msgstr ""
 
 msgid "&Profit and Loss Statement"
 msgstr ""
 
-#: reporting/reports_main.php:297 reporting/reports_main.php:342
-#: reporting/reports_main.php:382
+#: reporting/reports_main.php:299 reporting/reports_main.php:344
+#: reporting/reports_main.php:384
 msgid "Zero values"
 msgstr ""
 
 msgid "Zero values"
 msgstr ""
 
-#: reporting/reports_main.php:387
+#: reporting/reports_main.php:389
 msgid "Ta&x Report"
 msgstr ""
 
 msgid "Ta&x Report"
 msgstr ""
 
@@ -10867,7 +10965,7 @@ msgstr ""
 msgid "You can pay through"
 msgstr ""
 
 msgid "You can pay through"
 msgstr ""
 
-#: reporting/includes/doctext.inc:113 sales/customer_credit_invoice.php:281
+#: reporting/includes/doctext.inc:113 sales/customer_credit_invoice.php:283
 #: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113
 #: sales/view/view_invoice.php:114 sales/includes/ui/sales_credit_ui.inc:168
 #: sales/includes/ui/sales_order_ui.inc:142
 #: 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
@@ -11154,19 +11252,19 @@ msgstr ""
 msgid "No Supplier Filter"
 msgstr ""
 
 msgid "No Supplier Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:381
+#: reporting/includes/reports_classes.inc:380
 msgid "No Location Filter"
 msgstr ""
 
 msgid "No Location Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:384
+#: reporting/includes/reports_classes.inc:383
 msgid "No Category Filter"
 msgstr ""
 
 msgid "No Category Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:393
+#: reporting/includes/reports_classes.inc:392
 msgid "No Sales Folk Filter"
 msgstr ""
 
 msgid "No Sales Folk Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:400
+#: reporting/includes/reports_classes.inc:399
 msgid "No Users Filter"
 msgstr ""
 
 msgid "No Users Filter"
 msgstr ""
 
@@ -11174,35 +11272,56 @@ msgstr ""
 msgid "Create and Print Recurrent Invoices"
 msgstr ""
 
 msgid "Create and Print Recurrent Invoices"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:98
-#: sales/manage/recurrent_invoices.php:85
+#: sales/create_recurrent_invoices.php:40
+#, php-format
+msgid "Recurrent Invoice covers period %s - %s."
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:97
+#, php-format
+msgid "%s recurrent invoice(s) created, # %s - # %s."
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:102
+#, php-format
+msgid "&Print Recurrent Invoices # %s - # %s"
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:104
+#, php-format
+msgid "&Email Recurrent Invoices # %s - # %s"
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:115
+#: sales/manage/recurrent_invoices.php:102
 msgid "Template No"
 msgstr ""
 
 msgid "Template No"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:98
-#: sales/manage/recurrent_invoices.php:85
+#: sales/create_recurrent_invoices.php:115
+#: sales/manage/recurrent_invoices.php:102
 msgid "Begin"
 msgstr ""
 
 msgid "Begin"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:98
-#: sales/manage/recurrent_invoices.php:85
+#: sales/create_recurrent_invoices.php:115
+#: sales/manage/recurrent_invoices.php:102
 msgid "End"
 msgstr ""
 
 msgid "End"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:98
-#: sales/manage/recurrent_invoices.php:85
+#: sales/create_recurrent_invoices.php:115
+#: sales/manage/recurrent_invoices.php:102
+#: sales/manage/recurrent_invoices.php:185
 msgid "Last Created"
 msgstr ""
 
 msgid "Last Created"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:142
+#: sales/create_recurrent_invoices.php:156
 msgid "Create Invoices"
 msgstr ""
 
 msgid "Create Invoices"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:149
+#: sales/create_recurrent_invoices.php:164
 msgid "Marked items are due."
 msgstr ""
 
 msgid "Marked items are due."
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:151
+#: sales/create_recurrent_invoices.php:166
 msgid "No recurrent invoices are due."
 msgstr ""
 
 msgid "No recurrent invoices are due."
 msgstr ""
 
@@ -11211,7 +11330,7 @@ msgstr ""
 msgid "Modifying Customer Credit Note #%d"
 msgstr ""
 
 msgid "Modifying Customer Credit Note #%d"
 msgstr ""
 
-#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:660
+#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:662
 msgid ""
 "There are no customers, or there are no customers with branches. Please "
 "define customers and customer branches."
 msgid ""
 "There are no customers, or there are no customers with branches. Please "
 "define customers and customer branches."
@@ -11235,7 +11354,7 @@ msgid "&Email This Credit Invoice"
 msgstr ""
 
 #: sales/credit_note_entry.php:73 sales/customer_credit_invoice.php:60
 msgstr ""
 
 #: sales/credit_note_entry.php:73 sales/customer_credit_invoice.php:60
-#: sales/customer_credit_invoice.php:75
+#: sales/customer_credit_invoice.php:77
 msgid "View the GL &Journal Entries for this Credit Note"
 msgstr ""
 
 msgid "View the GL &Journal Entries for this Credit Note"
 msgstr ""
 
@@ -11243,39 +11362,39 @@ msgstr ""
 msgid "Enter Another &Credit Note"
 msgstr ""
 
 msgid "Enter Another &Credit Note"
 msgstr ""
 
-#: sales/credit_note_entry.php:155
+#: sales/credit_note_entry.php:157
 msgid "The entered date for the credit note is invalid."
 msgstr ""
 
 msgid "The entered date for the credit note is invalid."
 msgstr ""
 
-#: sales/credit_note_entry.php:172
+#: sales/credit_note_entry.php:174
 msgid ""
 "For credit notes created to write off the stock, a general ledger account is "
 "required to be selected."
 msgstr ""
 
 msgid ""
 "For credit notes created to write off the stock, a general ledger account is "
 "required to be selected."
 msgstr ""
 
-#: sales/credit_note_entry.php:173
+#: sales/credit_note_entry.php:175
 msgid ""
 "Please select an account to write the cost of the stock off to, then click "
 "on Process again."
 msgstr ""
 
 msgid ""
 "Please select an account to write the cost of the stock off to, then click "
 "on Process again."
 msgstr ""
 
-#: sales/credit_note_entry.php:193
+#: sales/credit_note_entry.php:195
 msgid "The quantity must be greater than zero."
 msgstr ""
 
 msgid "The quantity must be greater than zero."
 msgstr ""
 
-#: sales/credit_note_entry.php:198
+#: sales/credit_note_entry.php:200
 msgid "The entered price is negative or invalid."
 msgstr ""
 
 msgid "The entered price is negative or invalid."
 msgstr ""
 
-#: sales/credit_note_entry.php:203
+#: sales/credit_note_entry.php:205
 msgid "The entered discount percent is negative, greater than 100 or invalid."
 msgstr ""
 
 msgid "The entered discount percent is negative, greater than 100 or invalid."
 msgstr ""
 
-#: sales/credit_note_entry.php:271
+#: sales/credit_note_entry.php:273
 msgid "Credit Note Items"
 msgstr ""
 
 msgid "Credit Note Items"
 msgstr ""
 
-#: sales/credit_note_entry.php:281 sales/customer_credit_invoice.php:382
+#: sales/credit_note_entry.php:283 sales/customer_credit_invoice.php:384
 msgid "Process Credit Note"
 msgstr ""
 
 msgid "Process Credit Note"
 msgstr ""
 
@@ -11292,73 +11411,73 @@ msgstr ""
 msgid "Credit Note has been processed"
 msgstr ""
 
 msgid "Credit Note has been processed"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:55 sales/customer_credit_invoice.php:70
+#: sales/customer_credit_invoice.php:55 sales/customer_credit_invoice.php:72
 msgid "&View This Credit Note"
 msgstr ""
 
 msgid "&View This Credit Note"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:57 sales/customer_credit_invoice.php:72
+#: sales/customer_credit_invoice.php:57 sales/customer_credit_invoice.php:74
 msgid "&Print This Credit Note"
 msgstr ""
 
 msgid "&Print This Credit Note"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:58 sales/customer_credit_invoice.php:73
+#: sales/customer_credit_invoice.php:58 sales/customer_credit_invoice.php:75
 msgid "&Email This Credit Note"
 msgstr ""
 
 msgid "&Email This Credit Note"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:68
+#: sales/customer_credit_invoice.php:70
 msgid "Credit Note has been updated"
 msgstr ""
 
 msgid "Credit Note has been updated"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:112
+#: sales/customer_credit_invoice.php:114
 msgid "The entered shipping cost is invalid or less than zero."
 msgstr ""
 
 msgid "The entered shipping cost is invalid or less than zero."
 msgstr ""
 
-#: sales/customer_credit_invoice.php:117 sales/customer_credit_invoice.php:139
+#: sales/customer_credit_invoice.php:119 sales/customer_credit_invoice.php:141
 msgid ""
 "Selected quantity cannot be less than zero nor more than quantity not "
 "credited yet."
 msgstr ""
 
 msgid ""
 "Selected quantity cannot be less than zero nor more than quantity not "
 "credited yet."
 msgstr ""
 
-#: sales/customer_credit_invoice.php:137
+#: sales/customer_credit_invoice.php:139
 msgid ""
 "This page can only be opened if an invoice has been selected for crediting."
 msgstr ""
 
 msgid ""
 "This page can only be opened if an invoice has been selected for crediting."
 msgstr ""
 
-#: sales/customer_credit_invoice.php:249
+#: sales/customer_credit_invoice.php:251
 msgid "Crediting Invoice"
 msgstr ""
 
 msgid "Crediting Invoice"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:270
+#: sales/customer_credit_invoice.php:272
 msgid "Credit Note Date"
 msgstr ""
 
 msgid "Credit Note Date"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:280
+#: sales/customer_credit_invoice.php:282
 msgid "Invoiced Quantity"
 msgstr ""
 
 msgid "Invoiced Quantity"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:281
+#: sales/customer_credit_invoice.php:283
 msgid "Credit Quantity"
 msgstr ""
 
 msgid "Credit Quantity"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:315
+#: sales/customer_credit_invoice.php:317
 msgid "Credit Shipping Cost"
 msgstr ""
 
 msgid "Credit Shipping Cost"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:348
+#: sales/customer_credit_invoice.php:350
 #: sales/includes/ui/sales_credit_ui.inc:323
 msgid "Credit Note Type"
 msgstr ""
 
 #: sales/includes/ui/sales_credit_ui.inc:323
 msgid "Credit Note Type"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:356
+#: sales/customer_credit_invoice.php:358
 #: sales/includes/ui/sales_credit_ui.inc:331
 msgid "Items Returned to Location"
 msgstr ""
 
 #: sales/includes/ui/sales_credit_ui.inc:331
 msgid "Items Returned to Location"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:361
+#: sales/customer_credit_invoice.php:363
 #: sales/includes/ui/sales_credit_ui.inc:336
 msgid "Write off the cost of the items to"
 msgstr ""
 
 #: sales/includes/ui/sales_credit_ui.inc:336
 msgid "Write off the cost of the items to"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:380
+#: sales/customer_credit_invoice.php:382
 msgid "Update credit value for quantities entered"
 msgstr ""
 
 msgid "Update credit value for quantities entered"
 msgstr ""
 
@@ -11477,7 +11596,7 @@ msgstr ""
 msgid "The entered dead-line for invoice is invalid."
 msgstr ""
 
 msgid "The entered dead-line for invoice is invalid."
 msgstr ""
 
-#: sales/customer_delivery.php:179 sales/customer_invoice.php:291
+#: sales/customer_delivery.php:179 sales/customer_invoice.php:293
 msgid "The entered shipping value is not numeric."
 msgstr ""
 
 msgid "The entered shipping value is not numeric."
 msgstr ""
 
@@ -11485,7 +11604,7 @@ msgstr ""
 msgid "There are no item quantities on this delivery note."
 msgstr ""
 
 msgid "There are no item quantities on this delivery note."
 msgstr ""
 
-#: sales/customer_delivery.php:288 sales/sales_order_entry.php:489
+#: sales/customer_delivery.php:288 sales/sales_order_entry.php:491
 #: sales/includes/ui/sales_order_ui.inc:244
 msgid ""
 "The delivery cannot be processed because there is an insufficient quantity "
 #: sales/includes/ui/sales_order_ui.inc:244
 msgid ""
 "The delivery cannot be processed because there is an insufficient quantity "
@@ -11504,7 +11623,7 @@ msgstr ""
 msgid "Invoice Dead-line"
 msgstr ""
 
 msgid "Invoice Dead-line"
 msgstr ""
 
-#: sales/customer_delivery.php:418 sales/customer_invoice.php:436
+#: sales/customer_delivery.php:418 sales/customer_invoice.php:438
 #: sales/includes/ui/sales_order_ui.inc:82
 #: sales/includes/ui/sales_order_ui.inc:368
 msgid ""
 #: sales/includes/ui/sales_order_ui.inc:82
 #: sales/includes/ui/sales_order_ui.inc:368
 msgid ""
@@ -11520,17 +11639,17 @@ msgstr ""
 msgid "Max. delivery"
 msgstr ""
 
 msgid "Max. delivery"
 msgstr ""
 
-#: sales/customer_delivery.php:429 sales/customer_invoice.php:446
+#: sales/customer_delivery.php:429 sales/customer_invoice.php:448
 #: sales/includes/ui/sales_order_ui.inc:141
 msgid "Delivered"
 msgstr ""
 
 #: sales/includes/ui/sales_order_ui.inc:141
 msgid "Delivered"
 msgstr ""
 
-#: sales/customer_delivery.php:430 sales/customer_invoice.php:447
+#: sales/customer_delivery.php:430 sales/customer_invoice.php:449
 #: sales/view/view_receipt.php:45 sales/view/view_sales_order.php:202
 msgid "Discount"
 msgstr ""
 
 #: sales/view/view_receipt.php:45 sales/view/view_sales_order.php:202
 msgid "Discount"
 msgstr ""
 
-#: sales/customer_delivery.php:490 sales/customer_invoice.php:531
+#: sales/customer_delivery.php:490 sales/customer_invoice.php:533
 msgid "Shipping Cost"
 msgstr ""
 
 msgid "Shipping Cost"
 msgstr ""
 
@@ -11543,7 +11662,7 @@ msgstr ""
 msgid "Action For Balance"
 msgstr ""
 
 msgid "Action For Balance"
 msgstr ""
 
-#: sales/customer_delivery.php:521 sales/customer_invoice.php:560
+#: sales/customer_delivery.php:521 sales/customer_invoice.php:562
 msgid "Refresh document page"
 msgstr ""
 
 msgid "Refresh document page"
 msgstr ""
 
@@ -11551,8 +11670,8 @@ msgstr ""
 msgid "Process Dispatch"
 msgstr ""
 
 msgid "Process Dispatch"
 msgstr ""
 
-#: sales/customer_delivery.php:523 sales/customer_invoice.php:562
-#: sales/sales_order_entry.php:708
+#: sales/customer_delivery.php:523 sales/customer_invoice.php:564
+#: sales/sales_order_entry.php:710
 msgid "Check entered data and save document"
 msgstr ""
 
 msgid "Check entered data and save document"
 msgstr ""
 
@@ -11573,16 +11692,16 @@ msgstr ""
 msgid "Selected deliveries has been processed"
 msgstr ""
 
 msgid "Selected deliveries has been processed"
 msgstr ""
 
-#: sales/customer_invoice.php:57 sales/customer_invoice.php:75
+#: sales/customer_invoice.php:57 sales/customer_invoice.php:77
 #: sales/sales_order_entry.php:204
 msgid "&View This Invoice"
 msgstr ""
 
 #: sales/sales_order_entry.php:204
 msgid "&View This Invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:59 sales/customer_invoice.php:77
+#: sales/customer_invoice.php:59 sales/customer_invoice.php:79
 msgid "&Print This Invoice"
 msgstr ""
 
 msgid "&Print This Invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:60 sales/customer_invoice.php:78
+#: sales/customer_invoice.php:60 sales/customer_invoice.php:80
 msgid "&Email This Invoice"
 msgstr ""
 
 msgid "&Email This Invoice"
 msgstr ""
 
@@ -11594,26 +11713,26 @@ msgstr ""
 msgid "Select Another &Delivery For Invoicing"
 msgstr ""
 
 msgid "Select Another &Delivery For Invoicing"
 msgstr ""
 
-#: sales/customer_invoice.php:73
+#: sales/customer_invoice.php:75
 #, php-format
 msgid "Sales Invoice # %d has been updated."
 msgstr ""
 
 #, php-format
 msgid "Sales Invoice # %d has been updated."
 msgstr ""
 
-#: sales/customer_invoice.php:80
+#: sales/customer_invoice.php:82
 msgid "Select Another &Invoice to Modify"
 msgstr ""
 
 msgid "Select Another &Invoice to Modify"
 msgstr ""
 
-#: sales/customer_invoice.php:119
+#: sales/customer_invoice.php:121
 msgid "Select a different delivery to invoice"
 msgstr ""
 
 msgid "Select a different delivery to invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:120
+#: sales/customer_invoice.php:122
 msgid ""
 "There are no delivered items with a quantity left to invoice. There is "
 "nothing left to invoice."
 msgstr ""
 
 msgid ""
 "There are no delivered items with a quantity left to invoice. There is "
 "nothing left to invoice."
 msgstr ""
 
-#: sales/customer_invoice.php:129
+#: sales/customer_invoice.php:131
 msgid ""
 "There are no delivery notes for this invoice.<br>\n"
 "\t\tMost likely this invoice was created in Front Accounting version prior "
 msgid ""
 "There are no delivery notes for this invoice.<br>\n"
 "\t\tMost likely this invoice was created in Front Accounting version prior "
@@ -11621,144 +11740,147 @@ msgid ""
 "\t\tand therefore can not be modified."
 msgstr ""
 
 "\t\tand therefore can not be modified."
 msgstr ""
 
-#: sales/customer_invoice.php:138
+#: sales/customer_invoice.php:140
 msgid ""
 "All quantities on this invoice has been credited. There is nothing to modify "
 "on this invoice"
 msgstr ""
 
 msgid ""
 "All quantities on this invoice has been credited. There is nothing to modify "
 "on this invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:144
+#: sales/customer_invoice.php:146
 msgid ""
 "This page can only be opened after delivery selection. Please select "
 "delivery to invoicing first."
 msgstr ""
 
 msgid ""
 "This page can only be opened after delivery selection. Please select "
 "delivery to invoicing first."
 msgstr ""
 
-#: sales/customer_invoice.php:146
+#: sales/customer_invoice.php:148
 msgid "Select Delivery to Invoice"
 msgstr ""
 
 msgid "Select Delivery to Invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:151 sales/customer_invoice.php:302
+#: sales/customer_invoice.php:153 sales/customer_invoice.php:304
 msgid ""
 "Selected quantity cannot be less than quantity credited nor more than "
 "quantity not invoiced yet."
 msgstr ""
 
 msgid ""
 "Selected quantity cannot be less than quantity credited nor more than "
 "quantity not invoiced yet."
 msgstr ""
 
-#: sales/customer_invoice.php:255
+#: sales/customer_invoice.php:257
 msgid "The entered invoice date is invalid."
 msgstr ""
 
 msgid "The entered invoice date is invalid."
 msgstr ""
 
-#: sales/customer_invoice.php:261
+#: sales/customer_invoice.php:263
 msgid "The entered invoice date is not in fiscal year."
 msgstr ""
 
 msgid "The entered invoice date is not in fiscal year."
 msgstr ""
 
-#: sales/customer_invoice.php:267
+#: sales/customer_invoice.php:269
 msgid "The entered invoice due date is invalid."
 msgstr ""
 
 msgid "The entered invoice due date is invalid."
 msgstr ""
 
-#: sales/customer_invoice.php:297
+#: sales/customer_invoice.php:299
 msgid "There are no item quantities on this invoice."
 msgstr ""
 
 msgid "There are no item quantities on this invoice."
 msgstr ""
 
-#: sales/customer_invoice.php:377
+#: sales/customer_invoice.php:379
 msgid "Payment terms:"
 msgstr ""
 
 msgid "Payment terms:"
 msgstr ""
 
-#: sales/customer_invoice.php:380 sales/includes/ui/sales_order_ui.inc:405
+#: sales/customer_invoice.php:382 sales/includes/ui/sales_order_ui.inc:405
 #: sales/includes/ui/sales_order_ui.inc:409
 msgid "Payment:"
 msgstr ""
 
 #: sales/includes/ui/sales_order_ui.inc:409
 msgid "Payment:"
 msgstr ""
 
-#: sales/customer_invoice.php:442
+#: sales/customer_invoice.php:444
 msgid "Invoice Items"
 msgstr ""
 
 msgid "Invoice Items"
 msgstr ""
 
-#: sales/customer_invoice.php:447
+#: sales/customer_invoice.php:449
 msgid "This Invoice"
 msgstr ""
 
 msgid "This Invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:455
+#: sales/customer_invoice.php:457
 msgid "Credited"
 msgstr ""
 
 msgid "Credited"
 msgstr ""
 
-#: sales/customer_invoice.php:549
+#: sales/customer_invoice.php:551
 msgid "Invoice Total"
 msgstr ""
 
 msgid "Invoice Total"
 msgstr ""
 
-#: sales/customer_payments.php:33
+#: sales/customer_payments.php:33 sales/customer_payments.php.orig:33
 msgid "Customer Payment Entry"
 msgstr ""
 
 msgid "Customer Payment Entry"
 msgstr ""
 
-#: sales/customer_payments.php:37
+#: sales/customer_payments.php:37 sales/customer_payments.php.orig:37
 msgid "There are no customers defined in the system."
 msgstr ""
 
 msgid "There are no customers defined in the system."
 msgstr ""
 
-#: sales/customer_payments.php:62
+#: sales/customer_payments.php:62 sales/customer_payments.php.orig:62
 msgid "The customer payment has been successfully entered."
 msgstr ""
 
 msgid "The customer payment has been successfully entered."
 msgstr ""
 
-#: sales/customer_payments.php:64
+#: sales/customer_payments.php:64 sales/customer_payments.php.orig:64
 msgid "&Print This Receipt"
 msgstr ""
 
 msgid "&Print This Receipt"
 msgstr ""
 
-#: sales/customer_payments.php:66
+#: sales/customer_payments.php:66 sales/customer_payments.php.orig:66
 msgid "&View the GL Journal Entries for this Customer Payment"
 msgstr ""
 
 msgid "&View the GL Journal Entries for this Customer Payment"
 msgstr ""
 
-#: sales/customer_payments.php:70
+#: sales/customer_payments.php:70 sales/customer_payments.php.orig:70
 msgid "Enter Another &Customer Payment"
 msgstr ""
 
 msgid "Enter Another &Customer Payment"
 msgstr ""
 
-#: sales/customer_payments.php:83 sales/sales_order_entry.php:327
+#: sales/customer_payments.php:83 sales/customer_payments.php.orig:83
+#: sales/sales_order_entry.php:329
 msgid "There is no customer selected."
 msgstr ""
 
 msgid "There is no customer selected."
 msgstr ""
 
-#: sales/customer_payments.php:90 sales/sales_order_entry.php:334
+#: sales/customer_payments.php:90 sales/customer_payments.php.orig:90
+#: sales/sales_order_entry.php:336
 msgid "This customer has no branch defined."
 msgstr ""
 
 msgid "This customer has no branch defined."
 msgstr ""
 
-#: sales/customer_payments.php:96
+#: sales/customer_payments.php:96 sales/customer_payments.php.orig:96
 msgid "The entered date is invalid. Please enter a valid date for the payment."
 msgstr ""
 
 #: sales/customer_payments.php:118 sales/customer_payments.php:124
 msgid "The entered date is invalid. Please enter a valid date for the payment."
 msgstr ""
 
 #: sales/customer_payments.php:118 sales/customer_payments.php:124
+#: sales/customer_payments.php.orig:118 sales/customer_payments.php.orig:124
 msgid "The entered amount is invalid or negative and cannot be processed."
 msgstr ""
 
 msgid "The entered amount is invalid or negative and cannot be processed."
 msgstr ""
 
-#: sales/customer_payments.php:150
+#: sales/customer_payments.php:150 sales/customer_payments.php.orig:150
 msgid "The entered discount is not a valid number."
 msgstr ""
 
 msgid "The entered discount is not a valid number."
 msgstr ""
 
-#: sales/customer_payments.php:157
+#: sales/customer_payments.php:157 sales/customer_payments.php.orig:157
 msgid ""
 "The balance of the amount and discout is zero or negative. Please enter "
 "valid amounts."
 msgstr ""
 
 msgid ""
 "The balance of the amount and discout is zero or negative. Please enter "
 "valid amounts."
 msgstr ""
 
-#: sales/customer_payments.php:234
+#: sales/customer_payments.php:233 sales/customer_payments.php.orig:231
 msgid "From Customer:"
 msgstr ""
 
 msgid "From Customer:"
 msgstr ""
 
-#: sales/customer_payments.php:249
+#: sales/customer_payments.php:248 sales/customer_payments.php.orig:250
 msgid "This customer account is on hold."
 msgstr ""
 
 msgid "This customer account is on hold."
 msgstr ""
 
-#: sales/customer_payments.php:255
+#: sales/customer_payments.php:255 sales/customer_payments.php.orig:257
 msgid "Into Bank Account:"
 msgstr ""
 
 msgid "Into Bank Account:"
 msgstr ""
 
-#: sales/customer_payments.php:262
+#: sales/customer_payments.php:262 sales/customer_payments.php.orig:264
 msgid "Date of Deposit:"
 msgstr ""
 
 msgid "Date of Deposit:"
 msgstr ""
 
-#: sales/customer_payments.php:286
+#: sales/customer_payments.php:287 sales/customer_payments.php.orig:288
 msgid "Customer prompt payment discount :"
 msgstr ""
 
 msgid "Customer prompt payment discount :"
 msgstr ""
 
-#: sales/customer_payments.php:295
+#: sales/customer_payments.php:296 sales/customer_payments.php.orig:297
 msgid "Amount and discount are in customer's currency."
 msgstr ""
 
 msgid "Amount and discount are in customer's currency."
 msgstr ""
 
-#: sales/customer_payments.php:299
+#: sales/customer_payments.php:300 sales/customer_payments.php.orig:301
 msgid "Add Payment"
 msgstr ""
 
 msgid "Add Payment"
 msgstr ""
 
@@ -11893,178 +12015,178 @@ msgstr ""
 msgid "Enter a &New Direct Invoice"
 msgstr ""
 
 msgid "Enter a &New Direct Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:356
+#: sales/sales_order_entry.php:358
 msgid ""
 "You must enter the person or company to whom delivery should be made to."
 msgstr ""
 
 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:365
 msgid ""
 "You should enter the street address in the box provided. Orders cannot be "
 "accepted without a valid street address."
 msgstr ""
 
 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:374
 msgid "The shipping cost entered is expected to be numeric."
 msgstr ""
 
 msgid "The shipping cost entered is expected to be numeric."
 msgstr ""
 
-#: sales/sales_order_entry.php:378
+#: sales/sales_order_entry.php:380
 msgid "The Valid date is invalid."
 msgstr ""
 
 msgid "The Valid date is invalid."
 msgstr ""
 
-#: sales/sales_order_entry.php:380
+#: sales/sales_order_entry.php:382
 msgid "The delivery date is invalid."
 msgstr ""
 
 msgid "The delivery date is invalid."
 msgstr ""
 
-#: sales/sales_order_entry.php:387
+#: sales/sales_order_entry.php:389
 msgid "The requested valid date is before the date of the quotation."
 msgstr ""
 
 msgid "The requested valid date is before the date of the quotation."
 msgstr ""
 
-#: sales/sales_order_entry.php:389
+#: sales/sales_order_entry.php:391
 msgid "The requested delivery date is before the date of the order."
 msgstr ""
 
 msgid "The requested delivery date is before the date of the order."
 msgstr ""
 
-#: sales/sales_order_entry.php:398
+#: sales/sales_order_entry.php:400
 msgid "You need to define a cash account for your Sales Point."
 msgstr ""
 
 msgid "You need to define a cash account for your Sales Point."
 msgstr ""
 
-#: sales/sales_order_entry.php:468
+#: sales/sales_order_entry.php:470
 msgid ""
 "The item could not be updated because you are attempting to set the quantity "
 "ordered to less than 0, or the discount percent to more than 100."
 msgstr ""
 
 msgid ""
 "The item could not be updated because you are attempting to set the quantity "
 "ordered to less than 0, or the discount percent to more than 100."
 msgstr ""
 
-#: sales/sales_order_entry.php:472
+#: sales/sales_order_entry.php:474
 msgid "Price for inventory item must be entered and can not be less than 0"
 msgstr ""
 
 msgid "Price for inventory item must be entered and can not be less than 0"
 msgstr ""
 
-#: sales/sales_order_entry.php:479
+#: sales/sales_order_entry.php:481
 msgid ""
 "You attempting to make the quantity ordered a quantity less than has already "
 "been delivered. The quantity delivered cannot be modified retrospectively."
 msgstr ""
 
 msgid ""
 "You attempting to make the quantity ordered a quantity less than has already "
 "been delivered. The quantity delivered cannot be modified retrospectively."
 msgstr ""
 
-#: sales/sales_order_entry.php:510
+#: sales/sales_order_entry.php:512
 #, php-format
 msgid "Price %s is below Standard Cost %s"
 msgstr ""
 
 #, php-format
 msgid "Price %s is below Standard Cost %s"
 msgstr ""
 
-#: sales/sales_order_entry.php:535
+#: sales/sales_order_entry.php:537
 msgid ""
 "This item cannot be deleted because some of it has already been delivered."
 msgstr ""
 
 msgid ""
 "This item cannot be deleted because some of it has already been delivered."
 msgstr ""
 
-#: sales/sales_order_entry.php:564
+#: sales/sales_order_entry.php:566
 msgid "Direct delivery entry has been cancelled as requested."
 msgstr ""
 
 msgid "Direct delivery entry has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:565
+#: sales/sales_order_entry.php:567
 msgid "Enter a New Sales Delivery"
 msgstr ""
 
 msgid "Enter a New Sales Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:568
+#: sales/sales_order_entry.php:570
 msgid "Direct invoice entry has been cancelled as requested."
 msgstr ""
 
 msgid "Direct invoice entry has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:569
+#: sales/sales_order_entry.php:571
 msgid "Enter a New Sales Invoice"
 msgstr ""
 
 msgid "Enter a New Sales Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:574
+#: sales/sales_order_entry.php:576
 msgid ""
 "This order cannot be cancelled because some of it has already been invoiced "
 "or dispatched. However, the line item quantities may be modified."
 msgstr ""
 
 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:579
+#: sales/sales_order_entry.php:581
 msgid "This sales quotation has been cancelled as requested."
 msgstr ""
 
 msgid "This sales quotation has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:580
+#: sales/sales_order_entry.php:582
 msgid "Enter a New Sales Quotation"
 msgstr ""
 
 msgid "Enter a New Sales Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:584
+#: sales/sales_order_entry.php:586
 msgid "This sales order has been cancelled as requested."
 msgstr ""
 
 msgid "This sales order has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:585
+#: sales/sales_order_entry.php:587
 msgid "Enter a New Sales Order"
 msgstr ""
 
 msgid "Enter a New Sales Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:664
+#: sales/sales_order_entry.php:666
 msgid "Sales Invoice Items"
 msgstr ""
 
 msgid "Sales Invoice Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:665
+#: sales/sales_order_entry.php:667
 msgid "Enter Delivery Details and Confirm Invoice"
 msgstr ""
 
 msgid "Enter Delivery Details and Confirm Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:667
+#: sales/sales_order_entry.php:669
 msgid "Place Invoice"
 msgstr ""
 
 msgid "Place Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:670
+#: sales/sales_order_entry.php:672
 msgid "Delivery Note Items"
 msgstr ""
 
 msgid "Delivery Note Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:671
+#: sales/sales_order_entry.php:673
 msgid "Enter Delivery Details and Confirm Dispatch"
 msgstr ""
 
 msgid "Enter Delivery Details and Confirm Dispatch"
 msgstr ""
 
-#: sales/sales_order_entry.php:672
+#: sales/sales_order_entry.php:674
 msgid "Cancel Delivery"
 msgstr ""
 
 msgid "Cancel Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:673
+#: sales/sales_order_entry.php:675
 msgid "Place Delivery"
 msgstr ""
 
 msgid "Place Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:675
+#: sales/sales_order_entry.php:677
 msgid "Quotation Date:"
 msgstr ""
 
 msgid "Quotation Date:"
 msgstr ""
 
-#: sales/sales_order_entry.php:676
+#: sales/sales_order_entry.php:678
 msgid "Sales Quotation Items"
 msgstr ""
 
 msgid "Sales Quotation Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:677
+#: sales/sales_order_entry.php:679
 msgid "Enter Delivery Details and Confirm Quotation"
 msgstr ""
 
 msgid "Enter Delivery Details and Confirm Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:678
+#: sales/sales_order_entry.php:680
 msgid "Cancel Quotation"
 msgstr ""
 
 msgid "Cancel Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:679
+#: sales/sales_order_entry.php:681
 msgid "Place Quotation"
 msgstr ""
 
 msgid "Place Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:680
+#: sales/sales_order_entry.php:682
 msgid "Commit Quotations Changes"
 msgstr ""
 
 msgid "Commit Quotations Changes"
 msgstr ""
 
-#: sales/sales_order_entry.php:683
+#: sales/sales_order_entry.php:685
 msgid "Sales Order Items"
 msgstr ""
 
 msgid "Sales Order Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:684
+#: sales/sales_order_entry.php:686
 msgid "Enter Delivery Details and Confirm Order"
 msgstr ""
 
 msgid "Enter Delivery Details and Confirm Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:687
+#: sales/sales_order_entry.php:689
 msgid "Commit Order Changes"
 msgstr ""
 
 msgid "Commit Order Changes"
 msgstr ""
 
-#: sales/sales_order_entry.php:709
+#: sales/sales_order_entry.php:711
 msgid "You are about to void this Document.\\nDo you want to continue?"
 msgstr ""
 
 msgid "You are about to void this Document.\\nDo you want to continue?"
 msgstr ""
 
-#: sales/sales_order_entry.php:712
+#: sales/sales_order_entry.php:714
 msgid "Validate changes and update document"
 msgstr ""
 
 msgid "Validate changes and update document"
 msgstr ""
 
-#: sales/sales_order_entry.php:716
+#: sales/sales_order_entry.php:718
 msgid ""
 "Cancels document entry or removes sales order when editing an old document"
 msgstr ""
 msgid ""
 "Cancels document entry or removes sales order when editing an old document"
 msgstr ""
@@ -12217,7 +12339,7 @@ msgid "Sales Area:"
 msgstr ""
 
 #: sales/manage/customer_branches.php:243
 msgstr ""
 
 #: sales/manage/customer_branches.php:243
-#: sales/manage/recurrent_invoices.php:156
+#: sales/manage/recurrent_invoices.php:174
 msgid "Sales Group:"
 msgstr ""
 
 msgid "Sales Group:"
 msgstr ""
 
@@ -12418,35 +12540,35 @@ msgstr ""
 msgid "The area description cannot be empty."
 msgstr ""
 
 msgid "The area description cannot be empty."
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:46
+#: sales/manage/recurrent_invoices.php:63
 msgid "Selected recurrent invoice has been updated"
 msgstr ""
 
 msgid "Selected recurrent invoice has been updated"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:52
+#: sales/manage/recurrent_invoices.php:69
 msgid "New recurrent invoice has been added"
 msgstr ""
 
 msgid "New recurrent invoice has been added"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:69
+#: sales/manage/recurrent_invoices.php:86
 msgid "Selected recurrent invoice has been deleted"
 msgstr ""
 
 msgid "Selected recurrent invoice has been deleted"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:149
+#: sales/manage/recurrent_invoices.php:167
 msgid "Template:"
 msgstr ""
 
 msgid "Template:"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:158
+#: sales/manage/recurrent_invoices.php:176
 msgid "Days:"
 msgstr ""
 
 msgid "Days:"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:160
+#: sales/manage/recurrent_invoices.php:178
 msgid "Monthly:"
 msgstr ""
 
 msgid "Monthly:"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:162
+#: sales/manage/recurrent_invoices.php:180
 msgid "Begin:"
 msgstr ""
 
 msgid "Begin:"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:164
+#: sales/manage/recurrent_invoices.php:182
 msgid "End:"
 msgstr ""
 
 msgid "End:"
 msgstr ""
 
@@ -12936,11 +13058,11 @@ msgstr ""
 msgid "Quote Total"
 msgstr ""
 
 msgid "Quote Total"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:300
+#: sales/inquiry/sales_orders_view.php:302
 msgid "Tmpl"
 msgstr ""
 
 msgid "Tmpl"
 msgstr ""
 
-#: sales/includes/cart_class.inc:345
+#: sales/includes/cart_class.inc:347
 msgid "You have to enter valid stock code or nonempty description"
 msgstr ""
 
 msgid "You have to enter valid stock code or nonempty description"
 msgstr ""