Stable branch merged up to 2.3.21
authorJanusz Dobrowolski <janusz@frontaccouting.eu>
Sat, 31 May 2014 11:33:31 +0000 (13:33 +0200)
committerJanusz Dobrowolski <janusz@frontaccouting.eu>
Sat, 31 May 2014 11:33:31 +0000 (13:33 +0200)
33 files changed:
1  2 
admin/db/fiscalyears_db.inc
admin/display_prefs.php
config.default.php
gl/gl_bank.php
gl/inquiry/gl_account_inquiry.php
includes/current_user.inc
includes/db/inventory_db.inc
includes/errors.inc
includes/hooks.inc
includes/main.inc
includes/session.inc
includes/ui/allocation_cart.inc
includes/ui/ui_controls.inc
inventory/includes/db/items_db.inc
inventory/manage/items.php
lang/new_language_template/LC_MESSAGES/empty.po
purchasing/includes/db/grn_db.inc
purchasing/includes/db/invoice_db.inc
purchasing/includes/db/supp_payment_db.inc
purchasing/includes/supp_trans_class.inc
purchasing/manage/suppliers.php
purchasing/supplier_credit.php
purchasing/supplier_invoice.php
purchasing/supplier_payment.php
reporting/includes/pdf_report.inc
reporting/reports_main.php
sales/customer_invoice.php
sales/includes/db/sales_order_db.inc
sales/manage/customers.php
sales/sales_order_entry.php
sql/en_US-demo.sql
sql/en_US-new.sql
taxes/db/tax_types_db.inc

Simple merge
Simple merge
Simple merge
diff --cc gl/gl_bank.php
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 4d41cd3bb43a8b8cff269e1b2f870a3d8650226e,1bbb85f69822f33551940d03612e8ec8e742ba1f..adf356d540d6dfbd89db98de6641b9121084e1c8
@@@ -8,7 -8,7 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2013-10-27 17:26+0100\n"
 -"POT-Creation-Date: 2014-03-10 10:17+0100\n"
++"POT-Creation-Date: 2014-05-31 13:29+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"
  msgid "Main  Menu"
  msgstr ""
  
 -#: frontaccounting.php:75 access/logout.php:18 themes/default/renderer.php:70
 -#: themes/default/renderer.php:83
 +#: ../frontaccounting.php:75
- #: ../access/logout.php:18
++#: ../access/logout.php:21
 +#: ../themes/default/renderer.php:70
 +#: ../themes/default/renderer.php:83
  msgid "Logout"
  msgstr ""
  
 -#: access/login.php:13
 +#: ../access/login.php:13
++#: ../access/password_reset.php:13
  msgid "Restricted access"
  msgstr ""
  
@@@ -41,61 -38,53 +42,91 @@@ msgstr "
  msgid "Please login here"
  msgstr ""
  
- #: ../access/login.php:36
 -#: access/login.php:36
++#: ../access/login.php:33
++msgid "or"
++msgstr ""
++
++#: ../access/login.php:33
++msgid "request new password"
++msgstr ""
++
++#: ../access/login.php:39
  msgid "Too many failed login attempts.<br>Please wait a while or try later."
  msgstr ""
  
- #: ../access/login.php:49
- #: ../access/login.php:80
 -#: access/login.php:49 access/login.php:80
++#: ../access/login.php:52
++#: ../access/login.php:83
  msgid "Authorization timeout"
  msgstr ""
  
- #: ../access/login.php:49
- #: ../access/login.php:87
 -#: access/login.php:49 access/login.php:87
++#: ../access/login.php:52
++#: ../access/login.php:90
  msgid "Login"
  msgstr ""
  
- #: ../access/login.php:87
 -#: access/login.php:87 admin/inst_upgrade.php:137
++#: ../access/login.php:90
++#: ../access/password_reset.php:61
 +#: ../admin/inst_upgrade.php:141
  msgid "Version"
  msgstr ""
  
- #: ../access/login.php:90
 -#: access/login.php:90
++#: ../access/login.php:93
  msgid "User name"
  msgstr ""
  
- #: ../access/login.php:94
 -#: access/login.php:94 admin/users.php:191
++#: ../access/login.php:97
 +#: ../admin/users.php:191
  msgid "Password:"
  msgstr ""
  
- #: ../access/login.php:104
- #: ../access/login.php:111
 -#: access/login.php:104 access/login.php:111 admin/create_coy.php:253
 -#: admin/create_coy.php:336
++#: ../access/login.php:107
++#: ../access/login.php:114
++#: ../access/password_reset.php:70
++#: ../access/password_reset.php:77
 +#: ../admin/create_coy.php:253
 +#: ../admin/create_coy.php:336
 +#: ../includes/sysnames.inc:194
  msgid "Company"
  msgstr ""
  
- #: ../access/login.php:118
 -#: access/login.php:118
++#: ../access/login.php:121
  msgid "Login -->"
  msgstr ""
  
- #: ../access/login.php:149
 -#: access/login.php:149 admin/display_prefs.php:112
 -#: themes/default/renderer.php:129
++#: ../access/login.php:152
++#: ../access/password_reset.php:108
 +#: ../admin/display_prefs.php:112
 +#: ../themes/default/renderer.php:129
  msgid "Theme:"
  msgstr ""
  
- #: ../access/logout.php:29
 -#: access/logout.php:29
++#: ../access/logout.php:32
  msgid "Thank you for using"
  msgstr ""
  
- #: ../access/logout.php:40
 -#: access/logout.php:40
++#: ../access/logout.php:43
  msgid "Click here to Login Again."
  msgstr ""
  
 -#: admin/attachments.php:74
++#: ../access/password_reset.php:31
++#: ../access/password_reset.php:61
++msgid "Password reset"
++msgstr ""
++
++#: ../access/password_reset.php:63
++#: ../reporting/rep103.php:277
++#: ../reporting/rep106.php:88
++#: ../reporting/rep205.php:195
++#: ../reporting/includes/header2.inc:110
++#: ../sales/manage/sales_people.php:99
++msgid "Email"
++msgstr ""
++
++#: ../access/password_reset.php:83
++msgid "Send password -->"
++msgstr ""
++
 +#: ../admin/attachments.php:74
  msgid "Attach Documents"
  msgstr ""
  
@@@ -107,278 -96,188 +138,277 @@@ msgstr "
  msgid "Select attachment file."
  msgstr ""
  
- #: ../admin/attachments.php:125
 -#: admin/attachments.php:128
++#: ../admin/attachments.php:128
  msgid "Attachment has been inserted."
  msgstr ""
  
- #: ../admin/attachments.php:131
 -#: admin/attachments.php:134
++#: ../admin/attachments.php:134
  msgid "Attachment has been updated."
  msgstr ""
  
- #: ../admin/attachments.php:146
 -#: admin/attachments.php:149
++#: ../admin/attachments.php:149
  msgid "Attachment has been deleted."
  msgstr ""
  
- #: ../admin/attachments.php:164
 -#: admin/attachments.php:167 admin/view_print_transaction.php:72
 -#: admin/void_transaction.php:157 gl/inquiry/journal_inquiry.php:47
 -#: inventory/includes/item_adjustments_ui.inc:47
 -#: manufacturing/work_order_add_finished.php:203
 -#: manufacturing/work_order_costs.php:150
 -#: manufacturing/work_order_entry.php:379
 -#: manufacturing/work_order_entry.php:387
 -#: manufacturing/includes/work_order_issue_ui.inc:161
 -#: sales/inquiry/customer_allocation_inquiry.php:47
++#: ../admin/attachments.php:167
 +#: ../admin/view_print_transaction.php:72
 +#: ../gl/inquiry/journal_inquiry.php:47
 +#: ../inventory/includes/item_adjustments_ui.inc:47
 +#: ../manufacturing/work_order_add_finished.php:203
 +#: ../manufacturing/work_order_costs.php:136
 +#: ../manufacturing/work_order_entry.php:379
 +#: ../manufacturing/work_order_entry.php:387
 +#: ../manufacturing/includes/work_order_issue_ui.inc:161
 +#: ../sales/inquiry/customer_allocation_inquiry.php:47
  msgid "Type:"
  msgstr ""
  
- #: ../admin/attachments.php:180
 -#: admin/attachments.php:183 admin/create_coy.php:277
 -#: admin/crm_categories.php:115 admin/fiscalyears.php:164
 -#: admin/inst_lang.php:100 admin/payment_terms.php:142 admin/printers.php:96
 -#: admin/shipping_companies.php:106 admin/tags.php:140 admin/users.php:144
 -#: dimensions/inquiry/search_dimensions.php:120
 -#: gl/inquiry/journal_inquiry.php:118 gl/manage/bank_accounts.php:130
 -#: gl/manage/currencies.php:164 gl/manage/exchange_rates.php:94
 -#: gl/manage/gl_account_classes.php:132 gl/manage/gl_account_types.php:154
 -#: gl/manage/gl_quick_entries.php:196 gl/manage/gl_quick_entries.php:295
 -#: gl/includes/ui/gl_bank_ui.inc:186 gl/includes/ui/gl_journal_ui.inc:122
 -#: includes/ui/contacts_view.inc:64 includes/ui/simple_crud_class.inc:52
 -#: inventory/prices.php:158 inventory/purchasing_data.php:164
 -#: inventory/includes/item_adjustments_ui.inc:87
 -#: inventory/includes/stock_transfers_ui.inc:79
 -#: inventory/manage/item_categories.php:121
 -#: inventory/manage/item_codes.php:140 inventory/manage/item_units.php:110
 -#: inventory/manage/locations.php:161 inventory/manage/movement_types.php:106
 -#: inventory/manage/sales_kits.php:55 manufacturing/search_work_orders.php:109
 -#: manufacturing/manage/bom_edit.php:86
 -#: manufacturing/manage/work_centres.php:114
 -#: manufacturing/includes/work_order_issue_ui.inc:58
 -#: purchasing/includes/ui/invoice_ui.inc:533
 -#: purchasing/includes/ui/po_ui.inc:263
 -#: purchasing/inquiry/po_search_completed.php:106
 -#: purchasing/inquiry/po_search.php:87 sales/manage/credit_status.php:119
 -#: sales/manage/customer_branches.php:159
 -#: sales/manage/recurrent_invoices.php:130 sales/manage/sales_areas.php:103
 -#: sales/manage/sales_groups.php:99 sales/manage/sales_people.php:119
 -#: sales/manage/sales_points.php:99 sales/manage/sales_types.php:121
 -#: sales/inquiry/customer_inquiry.php:192
 -#: sales/inquiry/sales_deliveries_view.php:154
 -#: sales/inquiry/sales_orders_view.php:128
 -#: sales/includes/ui/sales_credit_ui.inc:197
 -#: sales/includes/ui/sales_order_ui.inc:208 taxes/item_tax_types.php:139
 -#: taxes/tax_groups.php:142 taxes/tax_types.php:132
++#: ../admin/attachments.php:183
 +#: ../admin/create_coy.php:277
 +#: ../admin/crm_categories.php:115
 +#: ../admin/fiscalyears.php:164
 +#: ../admin/inst_lang.php:100
 +#: ../admin/payment_terms.php:142
 +#: ../admin/printers.php:96
 +#: ../admin/shipping_companies.php:106
 +#: ../admin/tags.php:140
 +#: ../admin/users.php:144
 +#: ../dimensions/inquiry/search_dimensions.php:120
 +#: ../gl/inquiry/journal_inquiry.php:118
 +#: ../gl/manage/bank_accounts.php:133
 +#: ../gl/manage/currencies.php:164
 +#: ../gl/manage/exchange_rates.php:94
 +#: ../gl/manage/gl_account_classes.php:132
 +#: ../gl/manage/gl_account_types.php:154
 +#: ../gl/manage/gl_quick_entries.php:196
 +#: ../gl/manage/gl_quick_entries.php:295
 +#: ../gl/includes/ui/gl_bank_ui.inc:186
 +#: ../gl/includes/ui/gl_journal_ui.inc:134
 +#: ../includes/ui/contacts_view.inc:64
 +#: ../includes/ui/simple_crud_class.inc:52
 +#: ../includes/ui/ui_input.inc:961
- #: ../inventory/prices.php.orig:161
- #: ../inventory/purchasing_data.php.orig:166
++#: ../inventory/prices.php:159
++#: ../inventory/purchasing_data.php:165
 +#: ../inventory/includes/item_adjustments_ui.inc:87
 +#: ../inventory/includes/stock_transfers_ui.inc:79
 +#: ../inventory/manage/item_categories.php:121
 +#: ../inventory/manage/item_codes.php:140
 +#: ../inventory/manage/item_units.php:110
 +#: ../inventory/manage/locations.php:161
 +#: ../inventory/manage/movement_types.php:106
 +#: ../inventory/manage/sales_kits.php:55
 +#: ../manufacturing/search_work_orders.php:109
 +#: ../manufacturing/manage/bom_edit.php:86
 +#: ../manufacturing/manage/work_centres.php:114
 +#: ../manufacturing/includes/work_order_issue_ui.inc:58
 +#: ../purchasing/includes/ui/invoice_ui.inc:557
- #: ../purchasing/includes/ui/po_ui.inc:271
++#: ../purchasing/includes/ui/po_ui.inc:275
 +#: ../purchasing/inquiry/po_search_completed.php:105
 +#: ../purchasing/inquiry/po_search.php:87
 +#: ../sales/manage/credit_status.php:119
 +#: ../sales/manage/customer_branches.php:159
 +#: ../sales/manage/recurrent_invoices.php:130
 +#: ../sales/manage/sales_areas.php:103
 +#: ../sales/manage/sales_groups.php:99
 +#: ../sales/manage/sales_people.php:119
 +#: ../sales/manage/sales_points.php:99
 +#: ../sales/manage/sales_types.php:121
 +#: ../sales/inquiry/sales_deliveries_view.php:154
 +#: ../sales/inquiry/sales_orders_view.php:136
- #: ../sales/inquiry/sales_orders_view.php.orig:136
 +#: ../sales/includes/ui/sales_credit_ui.inc:197
 +#: ../sales/includes/ui/sales_order_ui.inc:209
 +#: ../taxes/item_tax_types.php:139
 +#: ../taxes/sav.tax_types.php:211
 +#: ../taxes/sav.tax_types.php:262
 +#: ../taxes/tax_groups.php:137
 +#: ../taxes/tax_types.php:132
  msgid "Edit"
  msgstr ""
  
- #: ../admin/attachments.php:185
 -#: admin/attachments.php:188 gl/inquiry/journal_inquiry.php:135
++#: ../admin/attachments.php:188
 +#: ../gl/inquiry/journal_inquiry.php:135
  msgid "View"
  msgstr ""
  
- #: ../admin/attachments.php:190
 -#: admin/attachments.php:193
++#: ../admin/attachments.php:193
  msgid "Download"
  msgstr ""
  
- #: ../admin/attachments.php:195
 -#: admin/attachments.php:198 admin/create_coy.php:278
 -#: admin/crm_categories.php:119 admin/fiscalyears.php:166
 -#: admin/inst_chart.php:80 admin/inst_lang.php:109 admin/inst_module.php:143
 -#: admin/inst_theme.php:102 admin/payment_terms.php:143 admin/printers.php:97
 -#: admin/shipping_companies.php:107 admin/tags.php:141 admin/users.php:146
 -#: gl/gl_budget.php:137 gl/manage/bank_accounts.php:131
 -#: gl/manage/currencies.php:166 gl/manage/exchange_rates.php:99
 -#: gl/manage/gl_account_classes.php:133 gl/manage/gl_account_types.php:155
 -#: gl/manage/gl_quick_entries.php:197 gl/manage/gl_quick_entries.php:296
 -#: gl/includes/ui/gl_bank_ui.inc:188 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:285 inventory/prices.php:159
 -#: inventory/purchasing_data.php:165
 -#: inventory/includes/item_adjustments_ui.inc:89
 -#: inventory/includes/stock_transfers_ui.inc:81
 -#: inventory/manage/item_categories.php:122
 -#: inventory/manage/item_codes.php:141 inventory/manage/item_units.php:111
 -#: inventory/manage/locations.php:162 inventory/manage/movement_types.php:107
 -#: inventory/manage/sales_kits.php:56 manufacturing/manage/bom_edit.php:87
 -#: manufacturing/manage/work_centres.php:115
 -#: manufacturing/includes/work_order_issue_ui.inc:60
 -#: purchasing/includes/ui/invoice_ui.inc:297
 -#: purchasing/includes/ui/po_ui.inc:265 sales/manage/credit_status.php:120
 -#: sales/manage/customer_branches.php:163
 -#: sales/manage/recurrent_invoices.php:131 sales/manage/sales_areas.php:104
 -#: sales/manage/sales_groups.php:100 sales/manage/sales_people.php:120
 -#: sales/manage/sales_points.php:100 sales/manage/sales_types.php:122
 -#: sales/includes/ui/sales_credit_ui.inc:199
 -#: sales/includes/ui/sales_order_ui.inc:210 taxes/item_tax_types.php:140
 -#: taxes/tax_groups.php:143 taxes/tax_types.php:133
++#: ../admin/attachments.php:198
 +#: ../admin/create_coy.php:278
 +#: ../admin/crm_categories.php:119
 +#: ../admin/fiscalyears.php:166
 +#: ../admin/inst_chart.php:80
 +#: ../admin/inst_lang.php:109
 +#: ../admin/inst_module.php:143
 +#: ../admin/inst_theme.php:102
 +#: ../admin/payment_terms.php:143
 +#: ../admin/printers.php:97
 +#: ../admin/shipping_companies.php:107
 +#: ../admin/tags.php:141
 +#: ../admin/users.php:146
 +#: ../gl/gl_budget.php:137
 +#: ../gl/manage/bank_accounts.php:134
 +#: ../gl/manage/currencies.php:166
 +#: ../gl/manage/exchange_rates.php:99
 +#: ../gl/manage/gl_account_classes.php:133
 +#: ../gl/manage/gl_account_types.php:155
 +#: ../gl/manage/gl_quick_entries.php:197
 +#: ../gl/manage/gl_quick_entries.php:296
 +#: ../gl/includes/ui/gl_bank_ui.inc:188
 +#: ../gl/includes/ui/gl_journal_ui.inc:136
 +#: ../includes/ui/contacts_view.inc:67
 +#: ../includes/ui/simple_crud_class.inc:54
 +#: ../includes/ui/ui_input.inc:286
- #: ../inventory/prices.php.orig:162
- #: ../inventory/purchasing_data.php.orig:167
++#: ../inventory/prices.php:160
++#: ../inventory/purchasing_data.php:166
 +#: ../inventory/includes/item_adjustments_ui.inc:89
 +#: ../inventory/includes/stock_transfers_ui.inc:81
 +#: ../inventory/manage/item_categories.php:122
 +#: ../inventory/manage/item_codes.php:141
 +#: ../inventory/manage/item_units.php:111
 +#: ../inventory/manage/locations.php:162
 +#: ../inventory/manage/movement_types.php:107
 +#: ../inventory/manage/sales_kits.php:56
 +#: ../manufacturing/manage/bom_edit.php:87
 +#: ../manufacturing/manage/work_centres.php:115
 +#: ../manufacturing/includes/work_order_issue_ui.inc:60
 +#: ../purchasing/includes/ui/invoice_ui.inc:319
- #: ../purchasing/includes/ui/po_ui.inc:273
++#: ../purchasing/includes/ui/po_ui.inc:277
 +#: ../sales/manage/credit_status.php:120
 +#: ../sales/manage/customer_branches.php:163
 +#: ../sales/manage/recurrent_invoices.php:131
 +#: ../sales/manage/sales_areas.php:104
 +#: ../sales/manage/sales_groups.php:100
 +#: ../sales/manage/sales_people.php:120
 +#: ../sales/manage/sales_points.php:100
 +#: ../sales/manage/sales_types.php:122
 +#: ../sales/includes/ui/sales_credit_ui.inc:199
 +#: ../sales/includes/ui/sales_order_ui.inc:211
 +#: ../taxes/item_tax_types.php:140
 +#: ../taxes/sav.tax_types.php:212
 +#: ../taxes/tax_groups.php:138
 +#: ../taxes/tax_types.php:133
  msgid "Delete"
  msgstr ""
  
- #: ../admin/attachments.php:202
 -#: admin/attachments.php:205 admin/view_print_transaction.php:126
 -#: admin/void_transaction.php:181 dimensions/inquiry/search_dimensions.php:127
 -#: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:234
 -#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126
 -#: gl/inquiry/journal_inquiry.php:127 gl/inquiry/journal_inquiry.php:140
 -#: includes/ui/allocation_cart.inc:288 includes/ui/mk.allocation_cart.inc:288
 -#: inventory/inquiry/stock_movements.php:82
 -#: manufacturing/search_work_orders.php:159
 -#: manufacturing/includes/manufacturing_ui.inc:157
 -#: manufacturing/includes/manufacturing_ui.inc:200
 -#: manufacturing/includes/manufacturing_ui.inc:236
 -#: manufacturing/includes/manufacturing_ui.inc:276
 -#: manufacturing/includes/manufacturing_ui.inc:280
 -#: manufacturing/includes/manufacturing_ui.inc:331
 -#: purchasing/view/view_po.php:115 purchasing/view/view_po.php:140
 -#: purchasing/inquiry/po_search_completed.php:121
 -#: purchasing/inquiry/po_search.php:130
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:127
 -#: purchasing/inquiry/supplier_inquiry.php:169
 -#: purchasing/allocations/supplier_allocation_main.php:95
 -#: reporting/rep101.php:118 reporting/rep201.php:110 reporting/rep203.php:93
 -#: reporting/rep306.php:141 reporting/rep601.php:79 reporting/rep704.php:83
 -#: reporting/rep704.php:86 reporting/rep704.php:89 reporting/rep710.php:78
 -#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186
 -#: reporting/includes/doctext.inc:224
 -#: sales/allocations/customer_allocation_main.php:94
 -#: sales/view/view_sales_order.php:96 sales/view/view_sales_order.php:129
 -#: sales/view/view_sales_order.php:161
 -#: sales/inquiry/customer_allocation_inquiry.php:145
 -#: sales/inquiry/customer_inquiry.php:218
++#: ../admin/attachments.php:205
 +#: ../admin/view_print_transaction.php:126
 +#: ../admin/void_transaction.php:181
 +#: ../dimensions/inquiry/search_dimensions.php:127
 +#: ../dimensions/view/view_dimension.php:55
 +#: ../gl/bank_account_reconcile.php:232
 +#: ../gl/inquiry/bank_inquiry.php:70
 +#: ../gl/inquiry/gl_account_inquiry.php:126
 +#: ../gl/inquiry/journal_inquiry.php:127
 +#: ../gl/inquiry/journal_inquiry.php:140
- #: ../includes/ui/allocation_cart.inc:289
++#: ../includes/ui/allocation_cart.inc:290
 +#: ../inventory/inquiry/stock_movements.php:78
 +#: ../manufacturing/search_work_orders.php:159
 +#: ../manufacturing/includes/manufacturing_ui.inc:157
 +#: ../manufacturing/includes/manufacturing_ui.inc:200
 +#: ../manufacturing/includes/manufacturing_ui.inc:236
 +#: ../manufacturing/includes/manufacturing_ui.inc:276
 +#: ../manufacturing/includes/manufacturing_ui.inc:280
 +#: ../manufacturing/includes/manufacturing_ui.inc:331
 +#: ../purchasing/view/view_po.php:115
 +#: ../purchasing/view/view_po.php:140
 +#: ../purchasing/inquiry/po_search_completed.php:120
 +#: ../purchasing/inquiry/po_search.php:130
 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:127
 +#: ../purchasing/inquiry/supplier_inquiry.php:174
 +#: ../purchasing/allocations/supplier_allocation_main.php:95
- #: ../reporting/rep101.php:147
- #: ../reporting/rep201.php:135
++#: ../reporting/rep101.php:118
++#: ../reporting/rep201.php:110
 +#: ../reporting/rep203.php:93
 +#: ../reporting/rep306.php:141
 +#: ../reporting/rep601.php:79
 +#: ../reporting/rep602.php:80
 +#: ../reporting/rep704.php:83
 +#: ../reporting/rep704.php:86
 +#: ../reporting/rep704.php:89
 +#: ../reporting/rep710.php:78
 +#: ../reporting/includes/doctext.inc:167
 +#: ../reporting/includes/doctext.inc:208
 +#: ../reporting/includes/doctext.inc:246
 +#: ../sales/allocations/customer_allocation_main.php:94
 +#: ../sales/view/view_sales_order.php:109
 +#: ../sales/view/view_sales_order.php:142
 +#: ../sales/view/view_sales_order.php:179
 +#: ../sales/inquiry/customer_allocation_inquiry.php:145
 +#: ../sales/inquiry/customer_inquiry.php:201
  msgid "#"
  msgstr ""
  
- #: ../admin/attachments.php:203
- #: ../admin/attachments.php:247
 -#: admin/attachments.php:206 admin/attachments.php:250
 -#: admin/crm_categories.php:97 admin/inst_upgrade.php:137
 -#: admin/payment_terms.php:127 admin/printers.php:84
 -#: admin/print_profiles.php:148 gl/inquiry/tax_inquiry.php:82
 -#: gl/manage/gl_quick_entries.php:186 gl/manage/gl_quick_entries.php:224
 -#: includes/ui/view_package.php:32 inventory/manage/item_codes.php:125
 -#: inventory/manage/item_units.php:94 inventory/manage/movement_types.php:95
 -#: inventory/manage/sales_kits.php:40 inventory/view/view_adjustment.php:56
 -#: inventory/view/view_transfer.php:56 manufacturing/manage/bom_edit.php:70
 -#: manufacturing/includes/manufacturing_ui.inc:28
 -#: purchasing/includes/ui/invoice_ui.inc:484
 -#: purchasing/includes/ui/invoice_ui.inc:496
 -#: purchasing/po_receive_items.php:62 reporting/rep104.php:111
 -#: reporting/rep105.php:114 reporting/rep204.php:84 reporting/rep303.php:121
 -#: reporting/rep303.php:127 reporting/rep304.php:114 reporting/rep305.php:101
 -#: reporting/rep306.php:141 reporting/rep307.php:117 reporting/rep308.php:149
 -#: reporting/rep309.php:98 reporting/rep401.php:71
 -#: sales/create_recurrent_invoices.php:134 sales/manage/credit_status.php:97
 -#: sales/manage/recurrent_invoices.php:102
 -#: sales/inquiry/sales_orders_view.php:295
 -#: sales/inquiry/sales_orders_view.php:299 taxes/tax_groups.php:124
 -#: taxes/tax_types.php:115
++#: ../admin/attachments.php:206
++#: ../admin/attachments.php:250
 +#: ../admin/crm_categories.php:97
 +#: ../admin/inst_upgrade.php:141
 +#: ../admin/payment_terms.php:127
 +#: ../admin/printers.php:84
 +#: ../admin/print_profiles.php:148
 +#: ../gl/inquiry/tax_inquiry.php:82
 +#: ../gl/manage/gl_quick_entries.php:186
 +#: ../gl/manage/gl_quick_entries.php:224
 +#: ../includes/ui/view_package.php:32
 +#: ../inventory/manage/item_codes.php:125
 +#: ../inventory/manage/item_units.php:94
 +#: ../inventory/manage/movement_types.php:95
 +#: ../inventory/manage/sales_kits.php:40
 +#: ../inventory/view/view_adjustment.php:56
 +#: ../inventory/view/view_transfer.php:56
 +#: ../manufacturing/manage/bom_edit.php:70
 +#: ../manufacturing/includes/manufacturing_ui.inc:28
 +#: ../purchasing/includes/ui/invoice_ui.inc:507
 +#: ../purchasing/includes/ui/invoice_ui.inc:519
 +#: ../purchasing/po_receive_items.php:62
 +#: ../reporting/rep104.php:111
 +#: ../reporting/rep105.php:114
 +#: ../reporting/rep204.php:84
 +#: ../reporting/rep303.php:121
 +#: ../reporting/rep303.php:127
 +#: ../reporting/rep304.php:114
 +#: ../reporting/rep305.php:101
 +#: ../reporting/rep306.php:141
 +#: ../reporting/rep307.php:117
 +#: ../reporting/rep308.php:149
 +#: ../reporting/rep309.php:98
 +#: ../reporting/rep401.php:71
 +#: ../sales/create_recurrent_invoices.php:134
 +#: ../sales/manage/credit_status.php:97
 +#: ../sales/manage/recurrent_invoices.php:102
- #: ../sales/inquiry/sales_orders_view.php.orig:317
- #: ../sales/inquiry/sales_orders_view.php.orig:321
++#: ../sales/inquiry/sales_orders_view.php:318
++#: ../sales/inquiry/sales_orders_view.php:322
 +#: ../taxes/sav.tax_types.php:190
 +#: ../taxes/tax_groups.php:123
 +#: ../taxes/tax_types.php:115
  msgid "Description"
  msgstr ""
  
- #: ../admin/attachments.php:204
 -#: admin/attachments.php:207 admin/backups.php:63 admin/backups.php:149
++#: ../admin/attachments.php:207
 +#: ../admin/backups.php:63
 +#: ../admin/backups.php:149
  msgid "Filename"
  msgstr ""
  
- #: ../admin/attachments.php:205
 -#: admin/attachments.php:208
++#: ../admin/attachments.php:208
  msgid "Size"
  msgstr ""
  
- #: ../admin/attachments.php:206
 -#: admin/attachments.php:209
++#: ../admin/attachments.php:209
  msgid "Filetype"
  msgstr ""
  
- #: ../admin/attachments.php:207
 -#: admin/attachments.php:210
++#: ../admin/attachments.php:210
  msgid "Date Uploaded"
  msgstr ""
  
- #: ../admin/attachments.php:241
- #: ../admin/attachments.php:246
 -#: admin/attachments.php:244 admin/attachments.php:249
++#: ../admin/attachments.php:244
++#: ../admin/attachments.php:249
  msgid "Transaction #"
  msgstr ""
  
- #: ../admin/attachments.php:248
 -#: admin/attachments.php:251
++#: ../admin/attachments.php:251
  msgid "Attached File"
  msgstr ""
  
@@@ -415,38 -310,21 +445,38 @@@ msgstr "
  msgid "Database backup failed."
  msgstr ""
  
 -#: admin/backups.php:98 admin/create_coy.php:265 admin/fiscalyears.php:155
 -#: admin/inst_lang.php:85 admin/inst_lang.php:97
 -#: admin/void_transaction.php:125 dimensions/inquiry/search_dimensions.php:107
 -#: gl/manage/bank_accounts.php:127 gl/manage/currencies.php:162
 -#: gl/manage/gl_account_classes.php:127 gl/manage/gl_quick_entries.php:230
 -#: includes/system_tests.inc:38 includes/system_tests.inc:113
 -#: includes/system_tests.inc:126 includes/ui/ui_lists.inc:1675
 -#: purchasing/manage/suppliers.php:120 reporting/rep101.php:114
 -#: reporting/rep102.php:114 reporting/rep102.php:116 reporting/rep104.php:105
 -#: reporting/rep106.php:75 reporting/rep114.php:74 reporting/rep201.php:106
 -#: reporting/rep202.php:118 reporting/rep202.php:120 reporting/rep203.php:89
 -#: reporting/rep303.php:113 reporting/rep303.php:117 reporting/rep501.php:113
 -#: sales/manage/sales_points.php:94 sales/manage/sales_points.php:95
 -#: sales/manage/sales_types.php:119 taxes/item_tax_types.php:129
 -#: taxes/tax_groups.php:139
 +#: ../admin/backups.php:98
 +#: ../admin/create_coy.php:265
 +#: ../admin/fiscalyears.php:155
 +#: ../admin/inst_lang.php:85
 +#: ../admin/inst_lang.php:97
 +#: ../dimensions/inquiry/search_dimensions.php:107
 +#: ../gl/manage/bank_accounts.php:130
 +#: ../gl/manage/currencies.php:162
 +#: ../gl/manage/gl_account_classes.php:127
 +#: ../gl/manage/gl_quick_entries.php:230
 +#: ../includes/system_tests.inc:38
 +#: ../includes/system_tests.inc:113
 +#: ../includes/system_tests.inc:126
 +#: ../includes/ui/ui_lists.inc:1679
- #: ../purchasing/manage/suppliers.php:122
- #: ../reporting/rep101.php:143
++#: ../purchasing/manage/suppliers.php:123
++#: ../reporting/rep101.php:114
 +#: ../reporting/rep102.php:114
 +#: ../reporting/rep102.php:116
 +#: ../reporting/rep104.php:105
 +#: ../reporting/rep106.php:75
 +#: ../reporting/rep114.php:74
- #: ../reporting/rep201.php:131
++#: ../reporting/rep201.php:106
 +#: ../reporting/rep202.php:118
 +#: ../reporting/rep202.php:120
 +#: ../reporting/rep203.php:89
 +#: ../reporting/rep303.php:113
 +#: ../reporting/rep303.php:117
 +#: ../reporting/rep501.php:113
 +#: ../sales/manage/sales_points.php:94
 +#: ../sales/manage/sales_points.php:95
 +#: ../sales/manage/sales_types.php:119
 +#: ../taxes/item_tax_types.php:129
  msgid "No"
  msgstr ""
  
@@@ -644,18 -509,14 +674,18 @@@ msgstr "
  msgid "Domicile:"
  msgstr ""
  
 -#: admin/company_preferences.php:168 admin/shipping_companies.php:138
 -#: purchasing/manage/suppliers.php:129 sales/manage/customer_branches.php:260
 +#: ../admin/company_preferences.php:168
 +#: ../admin/shipping_companies.php:138
- #: ../purchasing/manage/suppliers.php:135
++#: ../purchasing/manage/suppliers.php:137
 +#: ../sales/manage/customer_branches.php:262
  msgid "Phone Number:"
  msgstr ""
  
 -#: admin/company_preferences.php:169 includes/ui/contacts_view.inc:104
 -#: purchasing/manage/suppliers.php:159 sales/manage/customer_branches.php:262
 -#: sales/manage/customers.php:257
 +#: ../admin/company_preferences.php:169
 +#: ../includes/ui/contacts_view.inc:104
- #: ../purchasing/manage/suppliers.php:138
++#: ../purchasing/manage/suppliers.php:140
 +#: ../sales/manage/customer_branches.php:264
- #: ../sales/manage/customers.php:257
++#: ../sales/manage/customers.php:258
  msgid "Fax Number:"
  msgstr ""
  
@@@ -767,48 -625,28 +797,48 @@@ msgstr "
  msgid "Version Id"
  msgstr ""
  
 -#: admin/company_preferences.php:208 admin/display_prefs.php:143
 -#: admin/forms_setup.php:61 admin/gl_setup.php:226 admin/inst_chart.php:74
 -#: admin/inst_lang.php:103 admin/inst_module.php:137 admin/inst_module.php:155
 -#: admin/inst_module.php:198 admin/inst_theme.php:96
 -#: dimensions/dimension_entry.php:293 gl/gl_bank.php:413 gl/gl_budget.php:135
 -#: gl/manage/gl_quick_entries.php:60 gl/includes/ui/gl_bank_ui.inc:277
 -#: 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:207 includes/ui/ui_input.inc:905
 -#: inventory/adjustments.php:233 inventory/cost_update.php:136
 -#: inventory/reorder_level.php:111 inventory/transfers.php:234
 -#: inventory/includes/item_adjustments_ui.inc:157
 -#: inventory/includes/stock_transfers_ui.inc:137
 -#: inventory/manage/sales_kits.php:208 manufacturing/work_order_entry.php:459
 -#: manufacturing/includes/work_order_issue_ui.inc:131
 -#: purchasing/includes/ui/po_ui.inc:296 purchasing/includes/ui/po_ui.inc:439
 -#: purchasing/po_receive_items.php:334 sales/credit_note_entry.php:284
 -#: sales/customer_credit_invoice.php:380 sales/customer_delivery.php:533
 -#: sales/customer_invoice.php:591 sales/inquiry/sales_orders_view.php:323
 -#: sales/includes/ui/sales_credit_ui.inc:293
 -#: sales/includes/ui/sales_order_ui.inc:243
 -#: sales/includes/ui/sales_order_ui.inc:560
 +#: ../admin/company_preferences.php:208
 +#: ../admin/display_prefs.php:145
 +#: ../admin/forms_setup.php:61
 +#: ../admin/gl_setup.php:241
 +#: ../admin/inst_chart.php:74
 +#: ../admin/inst_lang.php:103
 +#: ../admin/inst_module.php:137
 +#: ../admin/inst_module.php:155
 +#: ../admin/inst_module.php:198
 +#: ../admin/inst_theme.php:96
 +#: ../dimensions/dimension_entry.php:293
- #: ../gl/gl_bank.php:416
++#: ../gl/gl_bank.php:417
 +#: ../gl/gl_budget.php:135
 +#: ../gl/manage/gl_quick_entries.php:60
 +#: ../gl/includes/ui/gl_bank_ui.inc:277
 +#: ../gl/includes/ui/gl_journal_ui.inc:257
 +#: ../includes/ui/db_pager_view.inc:174
 +#: ../includes/ui/simple_crud_class.inc:56
 +#: ../includes/ui/simple_crud_class.inc:227
 +#: ../includes/ui/ui_input.inc:208
 +#: ../includes/ui/ui_input.inc:906
 +#: ../inventory/adjustments.php:233
- #: ../inventory/cost_update.php.orig:138
- #: ../inventory/reorder_level.php.orig:114
++#: ../inventory/cost_update.php:134
++#: ../inventory/reorder_level.php:112
 +#: ../inventory/transfers.php:234
 +#: ../inventory/includes/item_adjustments_ui.inc:157
 +#: ../inventory/includes/stock_transfers_ui.inc:137
 +#: ../inventory/manage/sales_kits.php:208
 +#: ../manufacturing/work_order_entry.php:459
 +#: ../manufacturing/includes/work_order_issue_ui.inc:131
- #: ../purchasing/includes/ui/po_ui.inc:304
- #: ../purchasing/includes/ui/po_ui.inc:455
++#: ../purchasing/includes/ui/po_ui.inc:308
++#: ../purchasing/includes/ui/po_ui.inc:459
 +#: ../purchasing/po_receive_items.php:332
 +#: ../sales/credit_note_entry.php:284
 +#: ../sales/customer_credit_invoice.php:380
 +#: ../sales/customer_delivery.php:547
- #: ../sales/customer_invoice.php:684
- #: ../sales/inquiry/sales_orders_view.php.orig:349
++#: ../sales/customer_invoice.php:693
++#: ../sales/inquiry/sales_orders_view.php:350
 +#: ../sales/includes/ui/sales_credit_ui.inc:293
 +#: ../sales/includes/ui/sales_order_ui.inc:244
 +#: ../sales/includes/ui/sales_order_ui.inc:561
 +#: ../taxes/sav.tax_types.php:255
  msgid "Update"
  msgstr ""
  
@@@ -938,37 -761,20 +968,37 @@@ msgstr "
  msgid "Default"
  msgstr ""
  
 -#: admin/create_coy.php:263 admin/fiscalyears.php:159 admin/inst_lang.php:85
 -#: admin/inst_lang.php:97 dimensions/inquiry/search_dimensions.php:107
 -#: gl/manage/bank_accounts.php:125 gl/manage/currencies.php:162
 -#: gl/manage/gl_account_classes.php:127 gl/manage/gl_quick_entries.php:230
 -#: includes/system_tests.inc:38 includes/system_tests.inc:113
 -#: includes/system_tests.inc:126 includes/ui/ui_lists.inc:1676
 -#: purchasing/manage/suppliers.php:120 reporting/rep101.php:113
 -#: reporting/rep102.php:113 reporting/rep102.php:115 reporting/rep104.php:107
 -#: reporting/rep106.php:77 reporting/rep114.php:76 reporting/rep201.php:105
 -#: reporting/rep202.php:117 reporting/rep202.php:119 reporting/rep203.php:88
 -#: reporting/rep303.php:108 reporting/rep303.php:116 reporting/rep501.php:111
 -#: sales/manage/sales_points.php:94 sales/manage/sales_points.php:95
 -#: sales/manage/sales_types.php:119 taxes/item_tax_types.php:133
 -#: taxes/tax_groups.php:137
 +#: ../admin/create_coy.php:263
 +#: ../admin/fiscalyears.php:159
 +#: ../admin/inst_lang.php:85
 +#: ../admin/inst_lang.php:97
 +#: ../dimensions/inquiry/search_dimensions.php:107
 +#: ../gl/manage/bank_accounts.php:128
 +#: ../gl/manage/currencies.php:162
 +#: ../gl/manage/gl_account_classes.php:127
 +#: ../gl/manage/gl_quick_entries.php:230
 +#: ../includes/system_tests.inc:38
 +#: ../includes/system_tests.inc:113
 +#: ../includes/system_tests.inc:126
 +#: ../includes/ui/ui_lists.inc:1680
- #: ../purchasing/manage/suppliers.php:122
- #: ../reporting/rep101.php:142
++#: ../purchasing/manage/suppliers.php:123
++#: ../reporting/rep101.php:113
 +#: ../reporting/rep102.php:113
 +#: ../reporting/rep102.php:115
 +#: ../reporting/rep104.php:107
 +#: ../reporting/rep106.php:77
 +#: ../reporting/rep114.php:76
- #: ../reporting/rep201.php:130
++#: ../reporting/rep201.php:105
 +#: ../reporting/rep202.php:117
 +#: ../reporting/rep202.php:119
 +#: ../reporting/rep203.php:88
 +#: ../reporting/rep303.php:108
 +#: ../reporting/rep303.php:116
 +#: ../reporting/rep501.php:111
 +#: ../sales/manage/sales_points.php:94
 +#: ../sales/manage/sales_points.php:95
 +#: ../sales/manage/sales_types.php:119
 +#: ../taxes/item_tax_types.php:133
  msgid "Yes"
  msgstr ""
  
@@@ -992,18 -796,11 +1022,18 @@@ msgstr "
  msgid "Database Password"
  msgstr ""
  
 -#: admin/create_coy.php:344 admin/inst_chart.php:68 admin/inst_chart.php:70
 -#: admin/inst_lang.php:87 admin/inst_lang.php:90 admin/inst_module.php:126
 -#: admin/inst_theme.php:91 admin/inst_theme.php:93 admin/inst_upgrade.php:149
 -#: gl/manage/gl_account_types.php:190 includes/ui/allocation_cart.inc:314
 -#: includes/ui/mk.allocation_cart.inc:314
 +#: ../admin/create_coy.php:344
 +#: ../admin/inst_chart.php:68
 +#: ../admin/inst_chart.php:70
 +#: ../admin/inst_lang.php:87
 +#: ../admin/inst_lang.php:90
 +#: ../admin/inst_module.php:126
 +#: ../admin/inst_theme.php:91
 +#: ../admin/inst_theme.php:93
 +#: ../admin/inst_upgrade.php:153
 +#: ../gl/manage/gl_account_types.php:190
- #: ../includes/ui/allocation_cart.inc:315
++#: ../includes/ui/allocation_cart.inc:316
 +#: ../taxes/sav.tax_types.php:168
  msgid "None"
  msgstr ""
  
@@@ -1488,8 -1242,7 +1518,8 @@@ msgstr "
  msgid "Payable Account:"
  msgstr ""
  
 -#: admin/gl_setup.php:195 purchasing/manage/suppliers.php:126
 +#: ../admin/gl_setup.php:208
- #: ../purchasing/manage/suppliers.php:132
++#: ../purchasing/manage/suppliers.php:133
  msgid "Purchase Discount Account:"
  msgstr ""
  
@@@ -1585,9 -1322,7 +1615,9 @@@ msgstr "
  msgid "Available"
  msgstr ""
  
 -#: admin/inst_chart.php:50 admin/inst_lang.php:35 admin/inst_lang.php:220
 +#: ../admin/inst_chart.php:50
 +#: ../admin/inst_lang.php:35
- #: ../admin/inst_lang.php:218
++#: ../admin/inst_lang.php:220
  msgid "Encoding"
  msgstr ""
  
@@@ -1649,8 -1367,7 +1679,8 @@@ msgstr "
  msgid "Name"
  msgstr ""
  
 -#: admin/inst_lang.php:35 admin/inst_lang.php:222
 +#: ../admin/inst_lang.php:35
- #: ../admin/inst_lang.php:220
++#: ../admin/inst_lang.php:222
  msgid "Right To Left"
  msgstr ""
  
@@@ -1699,24 -1416,23 +1729,24 @@@ msgid "
  "install this language manually, uninstall standard language package first."
  msgstr ""
  
- #: ../admin/inst_lang.php:216
 -#: admin/inst_lang.php:218
++#: ../admin/inst_lang.php:218
  msgid "Language Code"
  msgstr ""
  
- #: ../admin/inst_lang.php:217
 -#: admin/inst_lang.php:219
++#: ../admin/inst_lang.php:219
  msgid "Language Name"
  msgstr ""
  
- #: ../admin/inst_lang.php:221
 -#: admin/inst_lang.php:223
++#: ../admin/inst_lang.php:223
  msgid "Default Language"
  msgstr ""
  
- #: ../admin/inst_lang.php:223
- #: ../admin/inst_lang.php:224
 -#: admin/inst_lang.php:225 admin/inst_lang.php:226
++#: ../admin/inst_lang.php:225
++#: ../admin/inst_lang.php:226
  msgid "Language File"
  msgstr ""
  
- #: ../admin/inst_lang.php:227
 -#: admin/inst_lang.php:229
++#: ../admin/inst_lang.php:229
  msgid "Select your language files from your local harddisk."
  msgstr ""
  
@@@ -1884,48 -1592,31 +1914,50 @@@ msgstr "
  msgid "Selected payment terms have been deleted"
  msgstr ""
  
 -#: admin/payment_terms.php:127 dimensions/dimension_entry.php:275
 -#: dimensions/inquiry/search_dimensions.php:75
 -#: dimensions/inquiry/search_dimensions.php:130
 -#: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:233
 -#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126
 -#: gl/inquiry/journal_inquiry.php:129 gl/inquiry/tax_inquiry.php:82
 -#: gl/manage/bank_accounts.php:106 gl/manage/gl_quick_entries.php:186
 -#: gl/view/accrual_trans.php:52 gl/includes/ui/gl_bank_ui.inc:93
 -#: includes/ui/ui_view.inc:547 inventory/inquiry/stock_movements.php:82
 -#: inventory/manage/item_categories.php:98
 -#: manufacturing/search_work_orders.php:161
 -#: manufacturing/includes/manufacturing_ui.inc:236
 -#: manufacturing/includes/manufacturing_ui.inc:276
 -#: manufacturing/includes/manufacturing_ui.inc:280
 -#: manufacturing/includes/manufacturing_ui.inc:331
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:126
 -#: purchasing/inquiry/supplier_inquiry.php:168 reporting/rep102.php:134
 -#: reporting/rep202.php:139 reporting/rep501.php:87 reporting/rep601.php:79
 -#: reporting/rep702.php:60 reporting/rep704.php:83 reporting/rep704.php:86
 -#: reporting/rep704.php:89 reporting/rep709.php:107 reporting/rep710.php:78
 -#: reporting/rep710.php:86 reporting/reports_main.php:327
 -#: reporting/reports_main.php:491 reporting/includes/doctext.inc:140
 -#: reporting/includes/doctext.inc:181 reporting/includes/doctext.inc:200
 -#: sales/inquiry/customer_allocation_inquiry.php:144
 -#: sales/inquiry/customer_inquiry.php:217
 +#: ../admin/payment_terms.php:127
 +#: ../dimensions/dimension_entry.php:275
 +#: ../dimensions/inquiry/search_dimensions.php:75
 +#: ../dimensions/inquiry/search_dimensions.php:130
 +#: ../dimensions/view/view_dimension.php:55
 +#: ../gl/bank_account_reconcile.php:231
 +#: ../gl/inquiry/bank_inquiry.php:70
 +#: ../gl/inquiry/gl_account_inquiry.php:126
 +#: ../gl/inquiry/journal_inquiry.php:129
 +#: ../gl/inquiry/tax_inquiry.php:82
 +#: ../gl/manage/bank_accounts.php:109
 +#: ../gl/manage/gl_quick_entries.php:186
 +#: ../gl/view/accrual_trans.php:52
 +#: ../gl/includes/ui/gl_bank_ui.inc:93
 +#: ../includes/ui/ui_view.inc:547
 +#: ../inventory/inquiry/stock_movements.php:78
 +#: ../inventory/manage/item_categories.php:98
 +#: ../manufacturing/search_work_orders.php:161
 +#: ../manufacturing/view/wo_costs_view.php:46
 +#: ../manufacturing/includes/manufacturing_ui.inc:236
 +#: ../manufacturing/includes/manufacturing_ui.inc:276
 +#: ../manufacturing/includes/manufacturing_ui.inc:280
 +#: ../manufacturing/includes/manufacturing_ui.inc:331
 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:126
 +#: ../purchasing/inquiry/supplier_inquiry.php:173
 +#: ../reporting/rep102.php:134
 +#: ../reporting/rep202.php:139
 +#: ../reporting/rep501.php:87
 +#: ../reporting/rep601.php:79
 +#: ../reporting/rep602.php:80
 +#: ../reporting/rep702.php:60
 +#: ../reporting/rep704.php:83
 +#: ../reporting/rep704.php:86
 +#: ../reporting/rep704.php:89
 +#: ../reporting/rep709.php:107
 +#: ../reporting/rep710.php:78
 +#: ../reporting/rep710.php:86
++#: ../reporting/reports_main.php:333
++#: ../reporting/reports_main.php:497
 +#: ../reporting/includes/doctext.inc:162
 +#: ../reporting/includes/doctext.inc:203
 +#: ../reporting/includes/doctext.inc:222
 +#: ../sales/inquiry/customer_allocation_inquiry.php:144
 +#: ../sales/inquiry/customer_inquiry.php:200
  msgid "Type"
  msgstr ""
  
@@@ -2120,11 -1808,9 +2152,11 @@@ msgstr "
  msgid "Role:"
  msgstr ""
  
 -#: admin/security_roles.php:180 gl/manage/gl_accounts.php:199
 -#: inventory/manage/items.php:433 purchasing/manage/suppliers.php:289
 -#: sales/manage/customers.php:329
 +#: ../admin/security_roles.php:180
 +#: ../gl/manage/gl_accounts.php:198
 +#: ../inventory/manage/items.php:444
- #: ../purchasing/manage/suppliers.php:291
- #: ../sales/manage/customers.php:329
++#: ../purchasing/manage/suppliers.php:293
++#: ../sales/manage/customers.php:330
  msgid "Show inactive:"
  msgstr ""
  
@@@ -2165,25 -1850,17 +2197,25 @@@ msgstr "
  msgid "Delete This Role"
  msgstr ""
  
 -#: admin/security_roles.php:249 admin/void_transaction.php:229
 -#: gl/manage/gl_quick_entries.php:61 gl/includes/ui/gl_bank_ui.inc:279
 -#: 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:589
 -#: includes/ui/ui_input.inc:210 inventory/includes/item_adjustments_ui.inc:159
 -#: inventory/includes/stock_transfers_ui.inc:139
 -#: inventory/manage/items.php:416
 -#: manufacturing/includes/work_order_issue_ui.inc:133
 -#: purchasing/includes/ui/po_ui.inc:441
 -#: sales/includes/ui/sales_credit_ui.inc:295
 -#: sales/includes/ui/sales_order_ui.inc:562
 +#: ../admin/security_roles.php:249
 +#: ../admin/void_transaction.php:229
 +#: ../gl/manage/gl_quick_entries.php:61
 +#: ../gl/includes/ui/gl_bank_ui.inc:279
 +#: ../gl/includes/ui/gl_journal_ui.inc:259
 +#: ../includes/ui/simple_crud_class.inc:58
 +#: ../includes/ui/simple_crud_class.inc:231
 +#: ../includes/ui/ui_controls.inc:596
 +#: ../includes/ui/ui_input.inc:211
 +#: ../inventory/includes/item_adjustments_ui.inc:159
 +#: ../inventory/includes/stock_transfers_ui.inc:139
 +#: ../inventory/manage/items.php:427
 +#: ../manufacturing/includes/work_order_issue_ui.inc:133
- #: ../purchasing/includes/ui/po_ui.inc:457
++#: ../purchasing/includes/ui/po_ui.inc:461
 +#: ../sales/includes/ui/sales_credit_ui.inc:295
 +#: ../sales/includes/ui/sales_order_ui.inc:563
 +#: ../taxes/sav.tax_types.php:173
 +#: ../taxes/sav.tax_types.php:253
 +#: ../taxes/sav.tax_types.php:256
  msgid "Cancel"
  msgstr ""
  
  msgid "Cancel Edition"
  msgstr ""
  
 -#: admin/shipping_companies.php:15 sales/customer_credit_invoice.php:254
 -#: sales/customer_delivery.php:368 sales/customer_invoice.php:431
 -#: sales/view/view_credit.php:74 sales/view/view_dispatch.php:92
 -#: sales/view/view_invoice.php:91
 +#: ../admin/shipping_companies.php:15
 +#: ../sales/customer_credit_invoice.php:254
 +#: ../sales/customer_delivery.php:382
- #: ../sales/customer_invoice.php:488
++#: ../sales/customer_invoice.php:497
 +#: ../sales/view/view_credit.php:74
 +#: ../sales/view/view_dispatch.php:92
 +#: ../sales/view/view_invoice.php:92
  msgid "Shipping Company"
  msgstr ""
  
@@@ -2256,17 -1925,14 +2288,18 @@@ msgstr "
  msgid "Name:"
  msgstr ""
  
 -#: admin/shipping_companies.php:136 purchasing/manage/suppliers.php:158
 -#: sales/manage/customer_branches.php:259
 +#: ../admin/shipping_companies.php:136
++#: ../purchasing/manage/suppliers.php:136
 +#: ../sales/manage/customer_branches.php:261
  msgid "Contact Person:"
  msgstr ""
  
 -#: admin/shipping_companies.php:140 includes/ui/contacts_view.inc:103
 -#: inventory/manage/locations.php:205 purchasing/manage/suppliers.php:130
 -#: sales/manage/customer_branches.php:261 sales/manage/customers.php:256
 +#: ../admin/shipping_companies.php:140
 +#: ../includes/ui/contacts_view.inc:103
 +#: ../inventory/manage/locations.php:205
- #: ../purchasing/manage/suppliers.php:136
++#: ../purchasing/manage/suppliers.php:138
 +#: ../sales/manage/customer_branches.php:263
- #: ../sales/manage/customers.php:256
++#: ../sales/manage/customers.php:257
  msgid "Secondary Phone Number:"
  msgstr ""
  
@@@ -2278,7 -1944,11 +2311,16 @@@ msgstr "
  msgid "Unspecified tag type"
  msgstr ""
  
 -#: admin/tags.php:40 reporting/reports_main.php:350
 -#: reporting/reports_main.php:359 reporting/reports_main.php:371
 -#: reporting/reports_main.php:402 reporting/reports_main.php:410
 -#: reporting/reports_main.php:421 reporting/reports_main.php:449
 -#: reporting/reports_main.php:456 reporting/reports_main.php:466
 +#: ../admin/tags.php:40
++#: ../reporting/reports_main.php:356
++#: ../reporting/reports_main.php:365
++#: ../reporting/reports_main.php:377
++#: ../reporting/reports_main.php:408
++#: ../reporting/reports_main.php:416
++#: ../reporting/reports_main.php:427
++#: ../reporting/reports_main.php:455
++#: ../reporting/reports_main.php:462
++#: ../reporting/reports_main.php:472
  msgid "Account Tags"
  msgstr ""
  
@@@ -2404,16 -2068,12 +2446,15 @@@ msgstr "
  msgid "View or Print Transactions"
  msgstr ""
  
 -#: admin/view_print_transaction.php:43 admin/view_print_transaction.php:45
 -#: admin/view_print_transaction.php:129 includes/ui/ui_controls.inc:188
 -#: purchasing/inquiry/po_search_completed.php:113
 -#: purchasing/inquiry/po_search.php:93 sales/inquiry/customer_inquiry.php:202
 -#: sales/inquiry/sales_deliveries_view.php:160
 -#: sales/inquiry/sales_orders_view.php:119
 +#: ../admin/view_print_transaction.php:43
 +#: ../admin/view_print_transaction.php:45
 +#: ../admin/view_print_transaction.php:129
 +#: ../includes/ui/ui_controls.inc:195
 +#: ../purchasing/inquiry/po_search_completed.php:112
 +#: ../purchasing/inquiry/po_search.php:93
 +#: ../sales/inquiry/customer_inquiry.php:185
 +#: ../sales/inquiry/sales_deliveries_view.php:160
 +#: ../sales/inquiry/sales_orders_view.php:125
- #: ../sales/inquiry/sales_orders_view.php.orig:125
  msgid "Print"
  msgstr ""
  
@@@ -2431,20 -2089,18 +2472,20 @@@ msgstr "
  msgid "to #:"
  msgstr ""
  
 -#: admin/view_print_transaction.php:83 admin/void_transaction.php:170
 -#: dimensions/inquiry/search_dimensions.php:88
 -#: gl/inquiry/journal_inquiry.php:53 manufacturing/search_work_orders.php:78
 -#: purchasing/includes/ui/invoice_ui.inc:466
 -#: purchasing/inquiry/po_search_completed.php:77
 -#: purchasing/inquiry/po_search.php:76
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:57
 -#: purchasing/inquiry/supplier_inquiry.php:58
 -#: sales/inquiry/customer_allocation_inquiry.php:51
 -#: sales/inquiry/customer_inquiry.php:58
 -#: sales/inquiry/sales_deliveries_view.php:116
 -#: sales/inquiry/sales_orders_view.php:247
 +#: ../admin/view_print_transaction.php:83
 +#: ../admin/void_transaction.php:170
 +#: ../dimensions/inquiry/search_dimensions.php:88
 +#: ../gl/inquiry/journal_inquiry.php:53
 +#: ../manufacturing/search_work_orders.php:78
 +#: ../purchasing/includes/ui/invoice_ui.inc:489
 +#: ../purchasing/inquiry/po_search_completed.php:74
 +#: ../purchasing/inquiry/po_search.php:76
 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:57
 +#: ../purchasing/inquiry/supplier_inquiry.php:55
 +#: ../sales/inquiry/customer_allocation_inquiry.php:51
 +#: ../sales/inquiry/customer_inquiry.php:54
 +#: ../sales/inquiry/sales_deliveries_view.php:116
- #: ../sales/inquiry/sales_orders_view.php.orig:269
++#: ../sales/inquiry/sales_orders_view.php:270
  msgid "Search"
  msgstr ""
  
@@@ -2460,127 -2116,87 +2501,128 @@@ msgid "
  "zero."
  msgstr ""
  
 -#: admin/view_print_transaction.php:127 admin/void_transaction.php:182
 -#: dimensions/inquiry/search_dimensions.php:128
 -#: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:235
 -#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/journal_inquiry.php:131
 -#: gl/view/bank_transfer_view.php:86 gl/view/gl_deposit_view.php:80
 -#: gl/view/gl_payment_view.php:78 gl/view/gl_trans_view.php:35
 -#: includes/ui/contacts_view.inc:41 inventory/inquiry/stock_movements.php:82
 -#: inventory/view/view_adjustment.php:44 inventory/view/view_transfer.php:44
 -#: manufacturing/search_work_orders.php:160
 -#: manufacturing/view/wo_issue_view.php:43
 -#: manufacturing/view/wo_production_view.php:44
 -#: manufacturing/includes/manufacturing_ui.inc:157
 -#: manufacturing/includes/manufacturing_ui.inc:200
 -#: manufacturing/includes/manufacturing_ui.inc:276
 -#: manufacturing/includes/manufacturing_ui.inc:280
 -#: manufacturing/includes/manufacturing_ui.inc:331
 -#: purchasing/includes/ui/grn_ui.inc:32 purchasing/includes/ui/grn_ui.inc:64
 -#: purchasing/includes/ui/po_ui.inc:311 purchasing/view/view_po.php:115
 -#: purchasing/view/view_supp_credit.php:43
 -#: purchasing/view/view_supp_invoice.php:46
 -#: purchasing/view/view_supp_payment.php:73
 -#: purchasing/inquiry/po_search_completed.php:122
 -#: purchasing/inquiry/po_search.php:131
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:128
 -#: purchasing/inquiry/supplier_inquiry.php:170
 -#: purchasing/allocations/supplier_allocation_main.php:96
 -#: reporting/rep501.php:87 reporting/rep601.php:79 reporting/rep702.php:53
 -#: reporting/includes/doctext.inc:199 sales/customer_credit_invoice.php:245
 -#: sales/customer_credit_invoice.php:247 sales/customer_delivery.php:348
 -#: sales/customer_delivery.php:350 sales/customer_invoice.php:403
 -#: sales/customer_invoice.php:405
 -#: sales/allocations/customer_allocation_main.php:95
 -#: sales/view/view_dispatch.php:85 sales/view/view_invoice.php:84
 -#: sales/view/view_receipt.php:39 sales/view/view_sales_order.php:81
 -#: sales/inquiry/customer_allocation_inquiry.php:146
 -#: sales/inquiry/customer_inquiry.php:220
 -#: sales/inquiry/sales_deliveries_view.php:184
 -#: sales/includes/ui/sales_credit_ui.inc:85
 -#: sales/includes/ui/sales_credit_ui.inc:87
 -#: sales/includes/ui/sales_order_ui.inc:378
 +#: ../admin/view_print_transaction.php:127
 +#: ../admin/void_transaction.php:182
 +#: ../dimensions/inquiry/search_dimensions.php:128
 +#: ../dimensions/view/view_dimension.php:55
 +#: ../gl/bank_account_reconcile.php:233
 +#: ../gl/inquiry/bank_inquiry.php:70
 +#: ../gl/inquiry/journal_inquiry.php:131
 +#: ../gl/view/bank_transfer_view.php:86
 +#: ../gl/view/gl_deposit_view.php:80
 +#: ../gl/view/gl_payment_view.php:78
 +#: ../gl/view/gl_trans_view.php:35
 +#: ../includes/ui/contacts_view.inc:41
 +#: ../inventory/inquiry/stock_movements.php:78
 +#: ../inventory/view/view_adjustment.php:44
 +#: ../inventory/view/view_transfer.php:44
 +#: ../manufacturing/search_work_orders.php:160
 +#: ../manufacturing/view/wo_issue_view.php:43
 +#: ../manufacturing/view/wo_production_view.php:44
 +#: ../manufacturing/includes/manufacturing_ui.inc:157
 +#: ../manufacturing/includes/manufacturing_ui.inc:200
 +#: ../manufacturing/includes/manufacturing_ui.inc:276
 +#: ../manufacturing/includes/manufacturing_ui.inc:280
 +#: ../manufacturing/includes/manufacturing_ui.inc:331
 +#: ../purchasing/includes/ui/grn_ui.inc:32
 +#: ../purchasing/includes/ui/grn_ui.inc:64
- #: ../purchasing/includes/ui/po_ui.inc:319
++#: ../purchasing/includes/ui/po_ui.inc:323
 +#: ../purchasing/view/view_po.php:115
 +#: ../purchasing/view/view_supp_credit.php:43
 +#: ../purchasing/view/view_supp_invoice.php:47
 +#: ../purchasing/view/view_supp_payment.php:73
 +#: ../purchasing/inquiry/po_search_completed.php:121
 +#: ../purchasing/inquiry/po_search.php:131
 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:128
 +#: ../purchasing/inquiry/supplier_inquiry.php:175
 +#: ../purchasing/allocations/supplier_allocation_main.php:96
 +#: ../reporting/rep501.php:87
 +#: ../reporting/rep601.php:79
 +#: ../reporting/rep602.php:80
 +#: ../reporting/rep702.php:53
 +#: ../reporting/includes/doctext.inc:221
 +#: ../sales/customer_credit_invoice.php:245
 +#: ../sales/customer_credit_invoice.php:247
 +#: ../sales/customer_delivery.php:362
 +#: ../sales/customer_delivery.php:364
- #: ../sales/customer_invoice.php:460
- #: ../sales/customer_invoice.php:462
++#: ../sales/customer_invoice.php:469
++#: ../sales/customer_invoice.php:471
 +#: ../sales/allocations/customer_allocation_main.php:95
 +#: ../sales/view/view_dispatch.php:85
 +#: ../sales/view/view_invoice.php:85
 +#: ../sales/view/view_receipt.php:39
 +#: ../sales/view/view_sales_order.php:94
 +#: ../sales/inquiry/customer_allocation_inquiry.php:146
 +#: ../sales/inquiry/customer_inquiry.php:203
 +#: ../sales/inquiry/sales_deliveries_view.php:184
 +#: ../sales/includes/ui/sales_credit_ui.inc:85
 +#: ../sales/includes/ui/sales_credit_ui.inc:87
 +#: ../sales/includes/ui/sales_order_ui.inc:379
  msgid "Reference"
  msgstr ""
  
 -#: admin/view_print_transaction.php:128 admin/void_transaction.php:183
 -#: dimensions/inquiry/search_dimensions.php:131
 -#: dimensions/view/view_dimension.php:55 gl/accruals.php:90
 -#: gl/accruals.php:195 gl/bank_account_reconcile.php:236
 -#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126
 -#: gl/inquiry/journal_inquiry.php:128 gl/view/accrual_trans.php:52
 -#: gl/view/bank_transfer_view.php:83 gl/view/gl_deposit_view.php:68
 -#: gl/view/gl_payment_view.php:66 gl/view/gl_trans_view.php:36
 -#: includes/ui/allocation_cart.inc:288 includes/ui/mk.allocation_cart.inc:288
 -#: includes/ui/ui_view.inc:547 inventory/inquiry/stock_movements.php:84
 -#: inventory/view/view_adjustment.php:45 inventory/view/view_transfer.php:47
 -#: manufacturing/search_work_orders.php:166
 -#: manufacturing/work_order_entry.php:419
 -#: manufacturing/work_order_entry.php:425
 -#: manufacturing/view/wo_production_view.php:45
 -#: manufacturing/includes/manufacturing_ui.inc:157
 -#: manufacturing/includes/manufacturing_ui.inc:200
 -#: manufacturing/includes/manufacturing_ui.inc:236
 -#: manufacturing/includes/manufacturing_ui.inc:277
 -#: manufacturing/includes/manufacturing_ui.inc:281
 -#: manufacturing/includes/manufacturing_ui.inc:332
 -#: purchasing/includes/ui/invoice_ui.inc:116
 -#: purchasing/includes/ui/po_ui.inc:325 purchasing/view/view_po.php:140
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:131
 -#: purchasing/inquiry/supplier_inquiry.php:173
 -#: purchasing/allocations/supplier_allocation_main.php:97
 -#: reporting/rep101.php:118 reporting/rep201.php:110 reporting/rep306.php:141
 -#: reporting/rep501.php:87 reporting/rep601.php:79 reporting/rep704.php:83
 -#: reporting/rep704.php:86 reporting/rep704.php:89 reporting/rep709.php:111
 -#: reporting/rep710.php:77 reporting/includes/doctext.inc:145
 -#: reporting/includes/doctext.inc:186 reporting/includes/doctext.inc:224
 -#: reporting/includes/header2.inc:135 sales/customer_delivery.php:378
 -#: sales/customer_invoice.php:441
 -#: sales/allocations/customer_allocation_main.php:96
 -#: sales/view/view_credit.php:69 sales/view/view_sales_order.php:96
 -#: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161
 -#: sales/inquiry/customer_allocation_inquiry.php:148
 -#: sales/inquiry/customer_inquiry.php:221
 +#: ../admin/view_print_transaction.php:128
 +#: ../admin/void_transaction.php:183
 +#: ../dimensions/inquiry/search_dimensions.php:131
 +#: ../dimensions/view/view_dimension.php:55
 +#: ../gl/accruals.php:94
 +#: ../gl/accruals.php:199
 +#: ../gl/bank_account_reconcile.php:234
 +#: ../gl/inquiry/bank_inquiry.php:70
 +#: ../gl/inquiry/gl_account_inquiry.php:126
 +#: ../gl/inquiry/journal_inquiry.php:128
 +#: ../gl/view/accrual_trans.php:52
 +#: ../gl/view/bank_transfer_view.php:83
 +#: ../gl/view/gl_deposit_view.php:68
 +#: ../gl/view/gl_payment_view.php:66
 +#: ../gl/view/gl_trans_view.php:36
- #: ../includes/ui/allocation_cart.inc:289
++#: ../includes/ui/allocation_cart.inc:290
 +#: ../includes/ui/ui_view.inc:547
 +#: ../inventory/inquiry/stock_movements.php:80
 +#: ../inventory/view/view_adjustment.php:45
 +#: ../inventory/view/view_transfer.php:47
 +#: ../manufacturing/search_work_orders.php:166
 +#: ../manufacturing/work_order_entry.php:419
 +#: ../manufacturing/work_order_entry.php:425
 +#: ../manufacturing/view/wo_costs_view.php:46
 +#: ../manufacturing/view/wo_production_view.php:45
 +#: ../manufacturing/includes/manufacturing_ui.inc:157
 +#: ../manufacturing/includes/manufacturing_ui.inc:200
 +#: ../manufacturing/includes/manufacturing_ui.inc:236
 +#: ../manufacturing/includes/manufacturing_ui.inc:277
 +#: ../manufacturing/includes/manufacturing_ui.inc:281
 +#: ../manufacturing/includes/manufacturing_ui.inc:332
 +#: ../purchasing/includes/ui/invoice_ui.inc:129
- #: ../purchasing/includes/ui/po_ui.inc:333
++#: ../purchasing/includes/ui/po_ui.inc:337
 +#: ../purchasing/view/view_po.php:140
 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:131
 +#: ../purchasing/inquiry/supplier_inquiry.php:178
 +#: ../purchasing/allocations/supplier_allocation_main.php:97
- #: ../reporting/rep101.php:147
- #: ../reporting/rep201.php:135
++#: ../reporting/rep101.php:118
++#: ../reporting/rep107.php:202
++#: ../reporting/rep201.php:110
 +#: ../reporting/rep306.php:141
 +#: ../reporting/rep501.php:87
 +#: ../reporting/rep601.php:79
 +#: ../reporting/rep602.php:80
 +#: ../reporting/rep704.php:83
 +#: ../reporting/rep704.php:86
 +#: ../reporting/rep704.php:89
 +#: ../reporting/rep709.php:111
 +#: ../reporting/rep710.php:77
 +#: ../reporting/includes/doctext.inc:167
 +#: ../reporting/includes/doctext.inc:208
 +#: ../reporting/includes/doctext.inc:246
 +#: ../reporting/includes/header2.inc:135
 +#: ../sales/customer_delivery.php:392
- #: ../sales/customer_invoice.php:503
++#: ../sales/customer_invoice.php:512
 +#: ../sales/allocations/customer_allocation_main.php:96
 +#: ../sales/view/view_credit.php:69
 +#: ../sales/view/view_sales_order.php:109
 +#: ../sales/view/view_sales_order.php:142
 +#: ../sales/view/view_sales_order.php:179
 +#: ../sales/inquiry/customer_allocation_inquiry.php:148
 +#: ../sales/inquiry/customer_inquiry.php:204
  msgid "Date"
  msgstr ""
  
@@@ -2614,22 -2223,14 +2656,22 @@@ msgstr "
  msgid "Voiding Date:"
  msgstr ""
  
 -#: admin/void_transaction.php:208 dimensions/dimension_entry.php:283
 -#: gl/bank_transfer.php:98 gl/inquiry/journal_inquiry.php:56
 -#: gl/manage/revaluate_currencies.php:106 includes/ui/ui_view.inc:344
 -#: manufacturing/work_order_add_finished.php:210
 -#: manufacturing/work_order_entry.php:451
 -#: manufacturing/work_order_release.php:103
 -#: purchasing/includes/ui/invoice_ui.inc:174 purchasing/po_entry_items.php:529
 -#: purchasing/supplier_payment.php:325 sales/customer_payments.php:399
 +#: ../admin/void_transaction.php:208
 +#: ../dimensions/dimension_entry.php:283
 +#: ../gl/bank_transfer.php:98
 +#: ../gl/inquiry/journal_inquiry.php:56
 +#: ../gl/manage/revaluate_currencies.php:106
 +#: ../includes/ui/ui_view.inc:344
 +#: ../manufacturing/work_order_add_finished.php:210
 +#: ../manufacturing/work_order_costs.php:146
 +#: ../manufacturing/work_order_entry.php:451
 +#: ../manufacturing/work_order_release.php:103
 +#: ../purchasing/includes/ui/invoice_ui.inc:195
- #: ../purchasing/includes/ui/po_ui.inc:490
- #: ../purchasing/po_entry_items.php:566
- #: ../purchasing/supplier_payment.php.orig:321
- #: ../sales/customer_invoice.php:680
- #: ../sales/customer_payments.php.orig:409
++#: ../purchasing/includes/ui/po_ui.inc:494
++#: ../purchasing/po_entry_items.php:485
++#: ../purchasing/supplier_payment.php:325
++#: ../sales/customer_invoice.php:689
++#: ../sales/customer_payments.php:402
  msgid "Memo:"
  msgstr ""
  
@@@ -2658,22 -2256,15 +2700,22 @@@ msgstr "
  msgid "The selected transaction was closed for edition and cannot be voided."
  msgstr ""
  
 -#: admin/void_transaction.php:248 gl/accruals.php:32 gl/bank_transfer.php:115
 -#: gl/gl_journal.php:156 gl/manage/exchange_rates.php:33
 -#: gl/manage/revaluate_currencies.php:53
 -#: manufacturing/work_order_add_finished.php:98
 -#: manufacturing/work_order_costs.php:83 purchasing/po_receive_items.php:174
 -#: purchasing/supplier_payment.php:185 sales/customer_credit_invoice.php:91
 -#: sales/sales_order_entry.php:353 sales/manage/recurrent_invoices.php:41
 -#: sales/manage/recurrent_invoices.php:46
 -#: sales/manage/recurrent_invoices.php:51
 +#: ../admin/void_transaction.php:248
 +#: ../gl/accruals.php:32
 +#: ../gl/bank_transfer.php:115
- #: ../gl/gl_journal.php:161
++#: ../gl/gl_journal.php:162
 +#: ../gl/manage/close_period.php:34
 +#: ../gl/manage/exchange_rates.php:33
 +#: ../gl/manage/revaluate_currencies.php:53
 +#: ../manufacturing/work_order_add_finished.php:98
 +#: ../manufacturing/work_order_costs.php:80
 +#: ../purchasing/po_receive_items.php:174
- #: ../purchasing/supplier_payment.php.orig:175
++#: ../purchasing/supplier_payment.php:185
 +#: ../sales/customer_credit_invoice.php:91
- #: ../sales/sales_order_entry.php:360
++#: ../sales/sales_order_entry.php:363
 +#: ../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 ""
  
@@@ -2693,7 -2293,11 +2735,11 @@@ msgstr "
  msgid "Selected transaction has been voided."
  msgstr ""
  
 -#: admin/db/attachments_db.inc:67
++#: ../admin/db/attachments_db.inc:67
+ msgid "Attached File:"
+ msgstr ""
 -#: admin/db/fiscalyears_db.inc:136
 +#: ../admin/db/fiscalyears_db.inc:136
  msgid ""
  "The Retained Earnings Account or the Profit and Loss Year Account has not "
  "been set in System and General GL Setup"
@@@ -2704,8 -2307,8 +2750,10 @@@ msgstr "
  msgid "Closing Year"
  msgstr ""
  
- #: ../admin/db/fiscalyears_db.inc:214
 -#: admin/db/fiscalyears_db.inc:219 reporting/rep101.php:175
 -#: reporting/rep201.php:170 reporting/rep706.php:185
++#: ../admin/db/fiscalyears_db.inc:219
++#: ../reporting/rep101.php:175
++#: ../reporting/rep201.php:170
 +#: ../reporting/rep706.php:185
  msgid "Open Balance"
  msgstr ""
  
@@@ -2751,17 -2348,18 +2799,16 @@@ msgstr "
  msgid "SQL script execution failed in line %d: %s"
  msgstr ""
  
- #: ../admin/db/users_db.inc:210
 -#: admin/db/users_db.inc:210
++#: ../admin/db/users_db.inc:221
  msgid "user online"
  msgstr ""
  
- #: ../admin/db/users_db.inc:210
 -#: admin/db/users_db.inc:210
++#: ../admin/db/users_db.inc:221
  msgid "users online"
  msgstr ""
  
 -#: admin/db/voiding_db.inc:114
 -#: manufacturing/includes/db/work_orders_db.inc:446
 -#: manufacturing/includes/db/work_orders_db.inc:462
 -#: sales/includes/db/sales_invoice_db.inc:208
 +#: ../admin/db/voiding_db.inc:114
- #: ../manufacturing/includes/db/work_orders_db.inc.orig:261
 +#: ../sales/includes/db/sales_invoice_db.inc:251
  msgid "Voided."
  msgstr ""
  
@@@ -2974,7 -2558,8 +3021,10 @@@ msgstr "
  msgid "Ta&x Inquiry"
  msgstr ""
  
 -#: applications/generalledger.php:44 reporting/reports_main.php:377
 -#: reporting/reports_main.php:427 reporting/reports_main.php:472
 +#: ../applications/generalledger.php:44
++#: ../reporting/reports_main.php:383
++#: ../reporting/reports_main.php:433
++#: ../reporting/reports_main.php:478
  msgid "Trial &Balance"
  msgstr ""
  
@@@ -3346,30 -2924,18 +3396,29 @@@ msgstr "
  msgid "The dimension reference must be entered."
  msgstr ""
  
 -#: dimensions/dimension_entry.php:123 gl/bank_transfer.php:176
 -#: gl/gl_bank.php:254 gl/gl_journal.php:176
 -#: gl/manage/revaluate_currencies.php:72 inventory/adjustments.php:101
 -#: inventory/transfers.php:97 manufacturing/work_order_add_finished.php:84
 -#: manufacturing/work_order_entry.php:139
 -#: manufacturing/work_order_issue.php:96 purchasing/po_entry_items.php:366
 -#: purchasing/po_receive_items.php:195 purchasing/supplier_credit.php:156
 -#: purchasing/supplier_invoice.php:165 purchasing/supplier_payment.php:214
 -#: sales/create_recurrent_invoices.php:57 sales/credit_note_entry.php:181
 -#: sales/customer_credit_invoice.php:205 sales/customer_delivery.php:312
 -#: sales/customer_invoice.php:328 sales/customer_payments.php:169
 -#: sales/customer_payments.php:176 sales/sales_order_entry.php:445
 +#: ../dimensions/dimension_entry.php:123
 +#: ../gl/bank_transfer.php:176
 +#: ../gl/gl_bank.php:257
- #: ../gl/gl_journal.php:181
++#: ../gl/gl_journal.php:182
 +#: ../gl/manage/revaluate_currencies.php:72
 +#: ../inventory/adjustments.php:101
 +#: ../inventory/transfers.php:97
 +#: ../manufacturing/work_order_add_finished.php:84
 +#: ../manufacturing/work_order_entry.php:139
 +#: ../manufacturing/work_order_issue.php:97
- #: ../purchasing/po_entry_items.php:368
++#: ../purchasing/po_entry_items.php:365
 +#: ../purchasing/po_receive_items.php:193
- #: ../purchasing/supplier_credit.php:172
- #: ../purchasing/supplier_invoice.php:179
- #: ../purchasing/supplier_payment.php.orig:204
++#: ../purchasing/supplier_credit.php:182
++#: ../purchasing/supplier_invoice.php:190
++#: ../purchasing/supplier_payment.php:214
 +#: ../sales/create_recurrent_invoices.php:57
 +#: ../sales/credit_note_entry.php:181
 +#: ../sales/customer_credit_invoice.php:205
 +#: ../sales/customer_delivery.php:324
- #: ../sales/customer_invoice.php:379
- #: ../sales/customer_payments.php.orig:164
- #: ../sales/customer_payments.php.orig:171
- #: ../sales/customer_payments.php.orig:247
- #: ../sales/sales_order_entry.php:458
++#: ../sales/customer_invoice.php:388
++#: ../sales/customer_payments.php:169
++#: ../sales/customer_payments.php:176
++#: ../sales/sales_order_entry.php:461
  msgid "The entered reference is already in use."
  msgstr ""
  
  msgid "The dimension name must be entered."
  msgstr ""
  
 -#: dimensions/dimension_entry.php:138 manufacturing/work_order_entry.php:154
 -#: manufacturing/work_order_entry.php:234 purchasing/po_entry_items.php:238
 +#: ../dimensions/dimension_entry.php:138
 +#: ../manufacturing/work_order_entry.php:154
 +#: ../manufacturing/work_order_entry.php:234
- #: ../purchasing/po_entry_items.php:241
++#: ../purchasing/po_entry_items.php:238
  msgid "The date entered is in an invalid format."
  msgstr ""
  
@@@ -3401,19 -2964,20 +3450,35 @@@ msgstr "
  msgid "Dimension Reference:"
  msgstr ""
  
 -#: dimensions/dimension_entry.php:277 reporting/reports_main.php:34
 -#: reporting/reports_main.php:64 reporting/reports_main.php:80
 -#: reporting/reports_main.php:89 reporting/reports_main.php:151
 -#: reporting/reports_main.php:233 reporting/reports_main.php:242
 -#: reporting/reports_main.php:248 reporting/reports_main.php:258
 -#: reporting/reports_main.php:266 reporting/reports_main.php:274
 -#: reporting/reports_main.php:311 reporting/reports_main.php:325
 -#: reporting/reports_main.php:337 reporting/reports_main.php:355
 -#: reporting/reports_main.php:366 reporting/reports_main.php:378
 -#: reporting/reports_main.php:391 reporting/reports_main.php:407
 -#: reporting/reports_main.php:417 reporting/reports_main.php:428
 -#: reporting/reports_main.php:440 reporting/reports_main.php:454
 -#: reporting/reports_main.php:463 reporting/reports_main.php:473
 -#: reporting/reports_main.php:482 reporting/reports_main.php:489
 +#: ../dimensions/dimension_entry.php:277
 +#: ../reporting/reports_main.php:34
 +#: ../reporting/reports_main.php:64
 +#: ../reporting/reports_main.php:80
 +#: ../reporting/reports_main.php:89
 +#: ../reporting/reports_main.php:151
 +#: ../reporting/reports_main.php:233
 +#: ../reporting/reports_main.php:242
 +#: ../reporting/reports_main.php:248
 +#: ../reporting/reports_main.php:258
 +#: ../reporting/reports_main.php:266
 +#: ../reporting/reports_main.php:274
 +#: ../reporting/reports_main.php:311
++#: ../reporting/reports_main.php:319
++#: ../reporting/reports_main.php:331
++#: ../reporting/reports_main.php:343
++#: ../reporting/reports_main.php:361
++#: ../reporting/reports_main.php:372
++#: ../reporting/reports_main.php:384
++#: ../reporting/reports_main.php:397
++#: ../reporting/reports_main.php:413
++#: ../reporting/reports_main.php:423
++#: ../reporting/reports_main.php:434
++#: ../reporting/reports_main.php:446
++#: ../reporting/reports_main.php:460
++#: ../reporting/reports_main.php:469
++#: ../reporting/reports_main.php:479
++#: ../reporting/reports_main.php:488
++#: ../reporting/reports_main.php:495
  msgid "Start Date"
  msgstr ""
  
@@@ -3475,106 -3036,61 +3540,106 @@@ msgstr "
  msgid "Balance for this Dimension"
  msgstr ""
  
 -#: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:90
 -#: gl/inquiry/gl_account_inquiry.php:129 gl/inquiry/gl_trial_balance.php:185
 -#: gl/manage/gl_quick_entries.php:241 gl/manage/gl_quick_entries.php:333
 -#: includes/sysnames.inc:164 purchasing/includes/ui/invoice_ui.inc:258
 -#: purchasing/includes/ui/invoice_ui.inc:260
 -#: purchasing/includes/ui/invoice_ui.inc:262 reporting/rep701.php:111
 -#: reporting/rep705.php:238 reporting/rep706.php:185 reporting/rep707.php:210
 -#: reporting/rep708.php:192
 +#: ../dimensions/includes/dimensions_ui.inc:31
 +#: ../gl/accruals.php:94
 +#: ../gl/inquiry/gl_account_inquiry.php:129
- #: ../gl/inquiry/gl_trial_balance.php.orig:179
++#: ../gl/inquiry/gl_trial_balance.php:184
 +#: ../gl/manage/gl_quick_entries.php:241
 +#: ../gl/manage/gl_quick_entries.php:333
 +#: ../includes/sysnames.inc:165
 +#: ../purchasing/includes/ui/invoice_ui.inc:280
 +#: ../purchasing/includes/ui/invoice_ui.inc:282
 +#: ../purchasing/includes/ui/invoice_ui.inc:284
 +#: ../reporting/rep701.php:111
 +#: ../reporting/rep705.php:238
 +#: ../reporting/rep706.php:185
 +#: ../reporting/rep707.php:210
 +#: ../reporting/rep708.php:192
  msgid "Account"
  msgstr ""
  
 -#: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:98
 -#: gl/bank_account_reconcile.php:237 gl/inquiry/bank_inquiry.php:71
 -#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
 -#: gl/inquiry/gl_trial_balance.php:191 gl/inquiry/gl_trial_balance.php:193
 -#: gl/inquiry/gl_trial_balance.php:195 gl/view/accrual_trans.php:60
 -#: gl/view/gl_trans_view.php:64 gl/view/gl_trans_view.php:67
 -#: gl/view/gl_trans_view.php:70 gl/includes/ui/gl_journal_ui.inc:84
 -#: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:134
 -#: purchasing/inquiry/supplier_inquiry.php:176 reporting/rep601.php:80
 -#: reporting/rep702.php:54 reporting/rep704.php:84 reporting/rep704.php:87
 -#: reporting/rep704.php:90 reporting/rep708.php:192 reporting/rep708.php:193
 -#: sales/inquiry/customer_allocation_inquiry.php:152
 -#: sales/inquiry/customer_inquiry.php:226
 +#: ../dimensions/includes/dimensions_ui.inc:31
 +#: ../gl/accruals.php:102
 +#: ../gl/bank_account_reconcile.php:235
 +#: ../gl/inquiry/bank_inquiry.php:71
 +#: ../gl/inquiry/gl_account_inquiry.php:141
 +#: ../gl/inquiry/gl_account_inquiry.php:143
- #: ../gl/inquiry/gl_trial_balance.php.orig:185
- #: ../gl/inquiry/gl_trial_balance.php.orig:187
- #: ../gl/inquiry/gl_trial_balance.php.orig:189
++#: ../gl/inquiry/gl_trial_balance.php:190
++#: ../gl/inquiry/gl_trial_balance.php:192
++#: ../gl/inquiry/gl_trial_balance.php:194
 +#: ../gl/view/accrual_trans.php:60
 +#: ../gl/view/gl_trans_view.php:69
 +#: ../gl/view/gl_trans_view.php:72
 +#: ../gl/view/gl_trans_view.php:75
 +#: ../gl/includes/ui/gl_journal_ui.inc:87
 +#: ../gl/includes/ui/gl_journal_ui.inc:90
 +#: ../gl/includes/ui/gl_journal_ui.inc:93
 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:134
 +#: ../purchasing/inquiry/supplier_inquiry.php:181
 +#: ../reporting/rep601.php:80
 +#: ../reporting/rep602.php:81
 +#: ../reporting/rep702.php:54
 +#: ../reporting/rep704.php:84
 +#: ../reporting/rep704.php:87
 +#: ../reporting/rep704.php:90
 +#: ../reporting/rep708.php:192
 +#: ../reporting/rep708.php:193
 +#: ../sales/inquiry/customer_allocation_inquiry.php:152
 +#: ../sales/inquiry/customer_inquiry.php:209
  msgid "Debit"
  msgstr ""
  
 -#: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:98
 -#: gl/bank_account_reconcile.php:238 gl/inquiry/bank_inquiry.php:71
 -#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
 -#: gl/inquiry/gl_trial_balance.php:192 gl/inquiry/gl_trial_balance.php:194
 -#: gl/inquiry/gl_trial_balance.php:196 gl/view/accrual_trans.php:60
 -#: gl/view/gl_trans_view.php:64 gl/view/gl_trans_view.php:67
 -#: gl/view/gl_trans_view.php:70 gl/includes/ui/gl_journal_ui.inc:84
 -#: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90
 -#: includes/sysnames.inc:85
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:135
 -#: purchasing/inquiry/supplier_inquiry.php:177 reporting/rep601.php:80
 -#: reporting/rep702.php:54 reporting/rep704.php:84 reporting/rep704.php:87
 -#: reporting/rep704.php:90 reporting/rep708.php:192 reporting/rep708.php:193
 -#: sales/inquiry/customer_allocation_inquiry.php:153
 -#: sales/inquiry/customer_inquiry.php:227
 +#: ../dimensions/includes/dimensions_ui.inc:31
 +#: ../gl/accruals.php:102
 +#: ../gl/bank_account_reconcile.php:236
 +#: ../gl/inquiry/bank_inquiry.php:71
 +#: ../gl/inquiry/gl_account_inquiry.php:141
 +#: ../gl/inquiry/gl_account_inquiry.php:143
- #: ../gl/inquiry/gl_trial_balance.php.orig:186
- #: ../gl/inquiry/gl_trial_balance.php.orig:188
- #: ../gl/inquiry/gl_trial_balance.php.orig:190
++#: ../gl/inquiry/gl_trial_balance.php:191
++#: ../gl/inquiry/gl_trial_balance.php:193
++#: ../gl/inquiry/gl_trial_balance.php:195
 +#: ../gl/view/accrual_trans.php:60
 +#: ../gl/view/gl_trans_view.php:69
 +#: ../gl/view/gl_trans_view.php:72
 +#: ../gl/view/gl_trans_view.php:75
 +#: ../gl/includes/ui/gl_journal_ui.inc:87
 +#: ../gl/includes/ui/gl_journal_ui.inc:90
 +#: ../gl/includes/ui/gl_journal_ui.inc:93
 +#: ../includes/sysnames.inc:85
 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:135
 +#: ../purchasing/inquiry/supplier_inquiry.php:182
 +#: ../reporting/rep601.php:80
 +#: ../reporting/rep602.php:81
 +#: ../reporting/rep702.php:54
 +#: ../reporting/rep704.php:84
 +#: ../reporting/rep704.php:87
 +#: ../reporting/rep704.php:90
 +#: ../reporting/rep708.php:192
 +#: ../reporting/rep708.php:193
 +#: ../sales/inquiry/customer_allocation_inquiry.php:153
 +#: ../sales/inquiry/customer_inquiry.php:210
  msgid "Credit"
  msgstr ""
  
 -#: dimensions/includes/dimensions_ui.inc:45
 -#: dimensions/inquiry/search_dimensions.php:134 gl/inquiry/bank_inquiry.php:71
 -#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_trial_balance.php:189
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:137
 -#: reporting/rep101.php:122 reporting/rep201.php:114 reporting/rep203.php:94
 -#: reporting/rep204.php:84 reporting/rep307.php:117 reporting/rep601.php:80
 -#: reporting/rep701.php:111 reporting/rep704.php:84 reporting/rep704.php:87
 -#: reporting/rep704.php:90 reporting/rep708.php:185
 -#: sales/inquiry/customer_allocation_inquiry.php:155
 +#: ../dimensions/includes/dimensions_ui.inc:45
 +#: ../dimensions/inquiry/search_dimensions.php:134
 +#: ../gl/inquiry/bank_inquiry.php:71
 +#: ../gl/inquiry/gl_account_inquiry.php:141
- #: ../gl/inquiry/gl_trial_balance.php.orig:183
++#: ../gl/inquiry/gl_trial_balance.php:188
 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:137
- #: ../reporting/rep101.php:151
- #: ../reporting/rep201.php:139
++#: ../reporting/rep101.php:122
++#: ../reporting/rep201.php:114
 +#: ../reporting/rep203.php:94
 +#: ../reporting/rep204.php:84
 +#: ../reporting/rep307.php:117
 +#: ../reporting/rep601.php:80
 +#: ../reporting/rep602.php:81
 +#: ../reporting/rep701.php:111
 +#: ../reporting/rep704.php:84
 +#: ../reporting/rep704.php:87
 +#: ../reporting/rep704.php:90
 +#: ../reporting/rep708.php:185
 +#: ../sales/inquiry/customer_allocation_inquiry.php:155
  msgid "Balance"
  msgstr ""
  
@@@ -3586,91 -3102,55 +3651,89 @@@ msgstr "
  msgid "Search Dimensions"
  msgstr ""
  
 -#: dimensions/inquiry/search_dimensions.php:73 gl/bank_transfer.php:79
 -#: gl/inquiry/journal_inquiry.php:45 gl/manage/revaluate_currencies.php:105
 -#: gl/includes/ui/gl_bank_ui.inc:26 gl/includes/ui/gl_journal_ui.inc:30
 -#: includes/ui/contacts_view.inc:94
 -#: inventory/includes/item_adjustments_ui.inc:35
 -#: inventory/includes/stock_transfers_ui.inc:40
 -#: manufacturing/search_work_orders.php:67
 -#: manufacturing/work_order_add_finished.php:198
 -#: manufacturing/work_order_entry.php:378
 -#: manufacturing/work_order_entry.php:385
 -#: manufacturing/includes/work_order_issue_ui.inc:156
 -#: purchasing/includes/ui/invoice_ui.inc:105
 -#: purchasing/includes/ui/po_ui.inc:176 purchasing/includes/ui/po_ui.inc:181
 -#: purchasing/supplier_payment.php:298 sales/customer_payments.php:368
 +#: ../dimensions/inquiry/search_dimensions.php:73
 +#: ../gl/bank_transfer.php:79
 +#: ../gl/inquiry/journal_inquiry.php:45
 +#: ../gl/manage/revaluate_currencies.php:105
 +#: ../gl/includes/ui/gl_bank_ui.inc:26
 +#: ../gl/includes/ui/gl_journal_ui.inc:30
 +#: ../includes/ui/contacts_view.inc:94
 +#: ../inventory/includes/item_adjustments_ui.inc:35
 +#: ../inventory/includes/stock_transfers_ui.inc:40
 +#: ../manufacturing/search_work_orders.php:67
 +#: ../manufacturing/work_order_add_finished.php:198
 +#: ../manufacturing/work_order_costs.php:134
 +#: ../manufacturing/work_order_entry.php:378
 +#: ../manufacturing/work_order_entry.php:385
 +#: ../manufacturing/includes/work_order_issue_ui.inc:156
 +#: ../purchasing/includes/ui/invoice_ui.inc:119
- #: ../purchasing/includes/ui/po_ui.inc:184
- #: ../purchasing/includes/ui/po_ui.inc:189
- #: ../purchasing/supplier_payment.php.orig:294
- #: ../sales/customer_payments.php.orig:378
++#: ../purchasing/includes/ui/po_ui.inc:188
++#: ../purchasing/includes/ui/po_ui.inc:193
++#: ../purchasing/supplier_payment.php:298
++#: ../sales/customer_payments.php:371
  msgid "Reference:"
  msgstr ""
  
 -#: dimensions/inquiry/search_dimensions.php:75
 -#: includes/ui/allocation_cart.inc:312 includes/ui/mk.allocation_cart.inc:312
 -#: includes/ui/ui_lists.inc:1923 reporting/rep101.php:100
 -#: reporting/rep102.php:96 reporting/rep104.php:97 reporting/rep104.php:101
 -#: reporting/rep105.php:95 reporting/rep105.php:99 reporting/rep201.php:92
 -#: reporting/rep202.php:100 reporting/rep203.php:74 reporting/rep204.php:77
 -#: reporting/rep301.php:92 reporting/rep301.php:99 reporting/rep302.php:105
 -#: reporting/rep302.php:112 reporting/rep303.php:96 reporting/rep303.php:103
 -#: reporting/rep304.php:98 reporting/rep304.php:103 reporting/rep304.php:108
 -#: reporting/rep306.php:120 reporting/rep306.php:125 reporting/rep306.php:130
 -#: reporting/rep306.php:135 reporting/rep307.php:103 reporting/rep307.php:110
 -#: reporting/rep308.php:138 reporting/rep308.php:143 reporting/rep309.php:92
 -#: reporting/rep702.php:61 reporting/rep710.php:86 reporting/rep710.php:87
 +#: ../dimensions/inquiry/search_dimensions.php:75
- #: ../includes/ui/allocation_cart.inc:313
++#: ../includes/ui/allocation_cart.inc:314
 +#: ../includes/ui/ui_lists.inc:1927
- #: ../reporting/rep101.php:129
++#: ../reporting/rep101.php:100
 +#: ../reporting/rep102.php:96
 +#: ../reporting/rep104.php:97
 +#: ../reporting/rep104.php:101
 +#: ../reporting/rep105.php:95
 +#: ../reporting/rep105.php:99
- #: ../reporting/rep201.php:117
++#: ../reporting/rep201.php:92
 +#: ../reporting/rep202.php:100
 +#: ../reporting/rep203.php:74
 +#: ../reporting/rep204.php:77
 +#: ../reporting/rep301.php:92
 +#: ../reporting/rep301.php:99
 +#: ../reporting/rep302.php:105
 +#: ../reporting/rep302.php:112
 +#: ../reporting/rep303.php:96
 +#: ../reporting/rep303.php:103
 +#: ../reporting/rep304.php:98
 +#: ../reporting/rep304.php:103
 +#: ../reporting/rep304.php:108
 +#: ../reporting/rep306.php:120
 +#: ../reporting/rep306.php:125
 +#: ../reporting/rep306.php:130
 +#: ../reporting/rep306.php:135
 +#: ../reporting/rep307.php:103
 +#: ../reporting/rep307.php:110
 +#: ../reporting/rep308.php:138
 +#: ../reporting/rep308.php:143
 +#: ../reporting/rep309.php:92
 +#: ../reporting/rep702.php:61
 +#: ../reporting/rep710.php:86
 +#: ../reporting/rep710.php:87
  msgid "All"
  msgstr ""
  
 -#: dimensions/inquiry/search_dimensions.php:76 gl/inquiry/bank_inquiry.php:49
 -#: gl/inquiry/gl_trial_balance.php:54 gl/inquiry/journal_inquiry.php:48
 -#: gl/inquiry/profit_loss.php:168 gl/includes/ui/gl_bank_ui.inc:52
 -#: gl/includes/ui/gl_bank_ui.inc:120 inventory/inquiry/stock_movements.php:62
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:50
 -#: purchasing/inquiry/supplier_inquiry.php:53
 -#: sales/inquiry/customer_inquiry.php:50
 +#: ../dimensions/inquiry/search_dimensions.php:76
 +#: ../gl/inquiry/bank_inquiry.php:49
 +#: ../gl/inquiry/gl_trial_balance.php:54
- #: ../gl/inquiry/gl_trial_balance.php.orig:49
 +#: ../gl/inquiry/journal_inquiry.php:48
 +#: ../gl/inquiry/profit_loss.php:168
 +#: ../gl/includes/ui/gl_bank_ui.inc:52
 +#: ../gl/includes/ui/gl_bank_ui.inc:120
 +#: ../inventory/inquiry/stock_movements.php:58
 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:50
 +#: ../purchasing/inquiry/supplier_inquiry.php:50
 +#: ../sales/inquiry/customer_inquiry.php:46
  msgid "From:"
  msgstr ""
  
 -#: dimensions/inquiry/search_dimensions.php:77 gl/inquiry/bank_inquiry.php:50
 -#: gl/inquiry/gl_trial_balance.php:55 gl/inquiry/journal_inquiry.php:49
 -#: gl/inquiry/profit_loss.php:169 inventory/inquiry/stock_movements.php:63
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:51
 -#: purchasing/inquiry/supplier_inquiry.php:54
 -#: sales/inquiry/customer_inquiry.php:51
 +#: ../dimensions/inquiry/search_dimensions.php:77
 +#: ../gl/inquiry/bank_inquiry.php:50
 +#: ../gl/inquiry/gl_trial_balance.php:55
- #: ../gl/inquiry/gl_trial_balance.php.orig:50
 +#: ../gl/inquiry/journal_inquiry.php:49
 +#: ../gl/inquiry/profit_loss.php:169
 +#: ../inventory/inquiry/stock_movements.php:59
 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:51
 +#: ../purchasing/inquiry/supplier_inquiry.php:51
 +#: ../sales/inquiry/customer_inquiry.php:47
  msgid "To:"
  msgstr ""
  
@@@ -3684,30 -3164,23 +3747,30 @@@ msgstr "
  msgid "Only Open:"
  msgstr ""
  
 -#: dimensions/inquiry/search_dimensions.php:132
 -#: dimensions/view/view_dimension.php:55 includes/ui/allocation_cart.inc:288
 -#: includes/ui/mk.allocation_cart.inc:288
 -#: purchasing/includes/ui/invoice_ui.inc:125
 -#: purchasing/view/view_supp_credit.php:48
 -#: purchasing/view/view_supp_invoice.php:51
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:132
 -#: purchasing/inquiry/supplier_inquiry.php:174 reporting/rep101.php:118
 -#: reporting/rep201.php:110 reporting/rep203.php:93 reporting/rep501.php:87
 -#: reporting/includes/doctext.inc:100 reporting/includes/doctext.inc:122
 -#: reporting/includes/doctext.inc:143 reporting/includes/doctext.inc:145
 -#: reporting/includes/doctext.inc:184 reporting/includes/doctext.inc:186
 -#: sales/customer_invoice.php:448 sales/view/view_dispatch.php:97
 -#: sales/view/view_invoice.php:96
 -#: sales/inquiry/customer_allocation_inquiry.php:149
 -#: sales/inquiry/customer_inquiry.php:222
 -#: sales/includes/ui/sales_order_ui.inc:601
 +#: ../dimensions/inquiry/search_dimensions.php:132
 +#: ../dimensions/view/view_dimension.php:55
- #: ../includes/ui/allocation_cart.inc:289
++#: ../includes/ui/allocation_cart.inc:290
 +#: ../purchasing/includes/ui/invoice_ui.inc:138
 +#: ../purchasing/view/view_supp_credit.php:48
 +#: ../purchasing/view/view_supp_invoice.php:52
 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:132
 +#: ../purchasing/inquiry/supplier_inquiry.php:179
- #: ../reporting/rep101.php:147
- #: ../reporting/rep201.php:135
++#: ../reporting/rep101.php:118
++#: ../reporting/rep201.php:110
 +#: ../reporting/rep203.php:93
 +#: ../reporting/rep501.php:87
 +#: ../reporting/includes/doctext.inc:112
 +#: ../reporting/includes/doctext.inc:144
 +#: ../reporting/includes/doctext.inc:165
 +#: ../reporting/includes/doctext.inc:167
 +#: ../reporting/includes/doctext.inc:206
 +#: ../reporting/includes/doctext.inc:208
- #: ../sales/customer_invoice.php:510
++#: ../sales/customer_invoice.php:519
 +#: ../sales/view/view_dispatch.php:97
 +#: ../sales/view/view_invoice.php:96
 +#: ../sales/inquiry/customer_allocation_inquiry.php:149
 +#: ../sales/inquiry/customer_inquiry.php:205
 +#: ../sales/includes/ui/sales_order_ui.inc:602
  msgid "Due Date"
  msgstr ""
  
@@@ -3727,38 -3200,28 +3790,35 @@@ msgstr "
  msgid "This dimension is closed."
  msgstr ""
  
 -#: dimensions/view/view_dimension.php:85 gl/inquiry/gl_account_inquiry.php:71
 -#: gl/inquiry/tax_inquiry.php:61 purchasing/inquiry/po_search_completed.php:65
 -#: purchasing/inquiry/po_search.php:64
 -#: sales/inquiry/customer_allocation_inquiry.php:44
 -#: sales/inquiry/sales_deliveries_view.php:104
 -#: sales/inquiry/sales_orders_view.php:229
 +#: ../dimensions/view/view_dimension.php:85
 +#: ../gl/inquiry/gl_account_inquiry.php:71
 +#: ../gl/inquiry/tax_inquiry.php:61
 +#: ../purchasing/inquiry/po_search_completed.php:62
 +#: ../purchasing/inquiry/po_search.php:64
 +#: ../sales/inquiry/customer_allocation_inquiry.php:44
 +#: ../sales/inquiry/sales_deliveries_view.php:104
 +#: ../sales/inquiry/sales_orders_view.php:251
- #: ../sales/inquiry/sales_orders_view.php.orig:251
  msgid "from:"
  msgstr ""
  
 -#: dimensions/view/view_dimension.php:86 gl/inquiry/gl_account_inquiry.php:72
 -#: gl/inquiry/tax_inquiry.php:62 purchasing/inquiry/po_search_completed.php:66
 -#: purchasing/inquiry/po_search.php:65
 -#: sales/inquiry/customer_allocation_inquiry.php:45
 -#: sales/inquiry/sales_deliveries_view.php:105
 -#: sales/inquiry/sales_orders_view.php:230
 +#: ../dimensions/view/view_dimension.php:86
 +#: ../gl/inquiry/gl_account_inquiry.php:72
 +#: ../gl/inquiry/tax_inquiry.php:62
 +#: ../purchasing/inquiry/po_search_completed.php:63
 +#: ../purchasing/inquiry/po_search.php:65
 +#: ../sales/inquiry/customer_allocation_inquiry.php:45
 +#: ../sales/inquiry/sales_deliveries_view.php:105
 +#: ../sales/inquiry/sales_orders_view.php:252
- #: ../sales/inquiry/sales_orders_view.php.orig:252
  msgid "to:"
  msgstr ""
  
 -#: dimensions/view/view_dimension.php:87 gl/inquiry/balance_sheet.php:131
 -#: gl/inquiry/bank_inquiry.php:52 gl/inquiry/gl_account_inquiry.php:85
 -#: gl/inquiry/gl_trial_balance.php:63 gl/inquiry/profit_loss.php:183
 -#: gl/inquiry/tax_inquiry.php:63
 +#: ../dimensions/view/view_dimension.php:87
 +#: ../gl/inquiry/balance_sheet.php:131
 +#: ../gl/inquiry/bank_inquiry.php:52
 +#: ../gl/inquiry/gl_account_inquiry.php:85
 +#: ../gl/inquiry/gl_trial_balance.php:63
- #: ../gl/inquiry/gl_trial_balance.php.orig:58
 +#: ../gl/inquiry/profit_loss.php:183
 +#: ../gl/inquiry/tax_inquiry.php:63
  msgid "Show"
  msgstr ""
  
  msgid "Revenue / Cost Accruals"
  msgstr ""
  
 -#: gl/accruals.php:44
 +#: ../gl/accruals.php:38
 +#: ../gl/bank_transfer.php:121
 +#: ../gl/gl_bank.php:269
- #: ../gl/gl_journal.php:167
++#: ../gl/gl_journal.php:168
 +#: ../gl/manage/revaluate_currencies.php:59
 +#: ../inventory/adjustments.php:114
 +#: ../inventory/transfers.php:109
 +#: ../manufacturing/work_order_add_finished.php:104
 +#: ../manufacturing/work_order_costs.php:86
 +#: ../manufacturing/work_order_entry.php:160
 +#: ../manufacturing/work_order_issue.php:84
- #: ../purchasing/po_entry_items.php:345
++#: ../purchasing/po_entry_items.php:342
 +#: ../purchasing/po_receive_items.php:179
- #: ../purchasing/supplier_credit.php:192
- #: ../purchasing/supplier_invoice.php:199
- #: ../purchasing/supplier_payment.php.orig:181
++#: ../purchasing/supplier_credit.php:202
++#: ../purchasing/supplier_invoice.php:210
++#: ../purchasing/supplier_payment.php:191
 +#: ../sales/create_recurrent_invoices.php:121
 +#: ../sales/credit_note_entry.php:157
 +#: ../sales/customer_credit_invoice.php:95
 +#: ../sales/customer_delivery.php:165
- #: ../sales/customer_invoice.php:318
- #: ../sales/customer_payments.php.orig:151
- #: ../sales/sales_order_entry.php:365
++#: ../sales/customer_invoice.php:327
++#: ../sales/customer_payments.php:156
++#: ../sales/sales_order_entry.php:368
 +msgid ""
 +"The entered date is out of fiscal year or is closed for further data entry."
 +msgstr ""
 +
 +#: ../gl/accruals.php:44
  msgid "The amount can not be 0."
  msgstr ""
  
@@@ -3813,86 -3248,50 +3873,99 @@@ msgstr "
  msgid "Accruals for %s"
  msgstr ""
  
 -#: gl/accruals.php:92 gl/accruals.php:94 gl/accruals.php:203
 -#: gl/accruals.php:205 gl/gl_budget.php:71 gl/gl_budget.php:72
 -#: gl/gl_budget.php:76 gl/inquiry/balance_sheet.php:128
 -#: gl/inquiry/balance_sheet.php:130 gl/inquiry/gl_account_inquiry.php:79
 -#: gl/inquiry/gl_account_inquiry.php:81 gl/inquiry/gl_account_inquiry.php:134
 -#: gl/inquiry/gl_account_inquiry.php:136 gl/inquiry/gl_trial_balance.php:57
 -#: gl/inquiry/gl_trial_balance.php:59 gl/inquiry/profit_loss.php:179
 -#: gl/inquiry/profit_loss.php:181 gl/manage/gl_quick_entries.php:261
 -#: gl/manage/gl_quick_entries.php:263 gl/manage/gl_quick_entries.php:343
 -#: gl/manage/gl_quick_entries.php:345 gl/view/accrual_trans.php:54
 -#: gl/view/accrual_trans.php:56 gl/view/gl_deposit_view.php:104
 -#: gl/view/gl_deposit_view.php:107 gl/view/gl_payment_view.php:103
 -#: gl/view/gl_payment_view.php:106 gl/view/gl_trans_view.php:63
 -#: gl/view/gl_trans_view.php:66 gl/includes/ui/gl_bank_ui.inc:152
 -#: gl/includes/ui/gl_bank_ui.inc:153 gl/includes/ui/gl_bank_ui.inc:155
 -#: gl/includes/ui/gl_journal_ui.inc:83 gl/includes/ui/gl_journal_ui.inc:84
 -#: gl/includes/ui/gl_journal_ui.inc:86 includes/sysnames.inc:43
 -#: includes/sysnames.inc:165 inventory/manage/item_categories.php:216
 -#: inventory/manage/item_categories.php:218 inventory/manage/items.php:343
 -#: inventory/manage/items.php:345 purchasing/includes/ui/invoice_ui.inc:258
 -#: purchasing/includes/ui/invoice_ui.inc:260
 -#: purchasing/manage/suppliers.php:137 purchasing/manage/suppliers.php:138
 -#: purchasing/manage/suppliers.php:140 reporting/rep103.php:243
 -#: reporting/rep103.php:255 reporting/rep205.php:161 reporting/rep205.php:173
 -#: reporting/rep501.php:92 reporting/rep704.php:83 reporting/rep704.php:86
 -#: reporting/rep704.php:97 reporting/rep704.php:99 reporting/rep704.php:107
 -#: reporting/rep705.php:249 reporting/rep705.php:251 reporting/rep705.php:262
 -#: reporting/rep706.php:194 reporting/rep706.php:196 reporting/rep706.php:204
 -#: reporting/rep707.php:218 reporting/rep707.php:220 reporting/rep707.php:228
 -#: reporting/rep708.php:201 reporting/rep708.php:203 reporting/rep708.php:210
 -#: reporting/reports_main.php:341 reporting/reports_main.php:342
 -#: reporting/reports_main.php:348 reporting/reports_main.php:349
 -#: reporting/reports_main.php:357 reporting/reports_main.php:358
 -#: reporting/reports_main.php:369 reporting/reports_main.php:370
 -#: reporting/reports_main.php:382 reporting/reports_main.php:383
 -#: reporting/reports_main.php:395 reporting/reports_main.php:401
 -#: reporting/reports_main.php:409 reporting/reports_main.php:420
 -#: reporting/reports_main.php:432 sales/customer_delivery.php:395
 -#: sales/customer_delivery.php:403 sales/customer_invoice.php:418
 -#: sales/customer_invoice.php:456 sales/manage/customers.php:273
 -#: sales/manage/customers.php:275 sales/includes/ui/sales_credit_ui.inc:132
 -#: sales/includes/ui/sales_credit_ui.inc:137
 -#: sales/includes/ui/sales_order_ui.inc:456
 -#: sales/includes/ui/sales_order_ui.inc:461
 +#: ../gl/accruals.php:96
 +#: ../gl/accruals.php:98
 +#: ../gl/accruals.php:207
 +#: ../gl/accruals.php:209
 +#: ../gl/gl_budget.php:71
 +#: ../gl/gl_budget.php:72
 +#: ../gl/gl_budget.php:76
 +#: ../gl/inquiry/balance_sheet.php:128
 +#: ../gl/inquiry/balance_sheet.php:130
 +#: ../gl/inquiry/gl_account_inquiry.php:79
 +#: ../gl/inquiry/gl_account_inquiry.php:81
 +#: ../gl/inquiry/gl_account_inquiry.php:134
 +#: ../gl/inquiry/gl_account_inquiry.php:136
 +#: ../gl/inquiry/gl_trial_balance.php:57
 +#: ../gl/inquiry/gl_trial_balance.php:59
- #: ../gl/inquiry/gl_trial_balance.php.orig:52
- #: ../gl/inquiry/gl_trial_balance.php.orig:54
 +#: ../gl/inquiry/profit_loss.php:179
 +#: ../gl/inquiry/profit_loss.php:181
 +#: ../gl/manage/gl_quick_entries.php:261
 +#: ../gl/manage/gl_quick_entries.php:263
 +#: ../gl/manage/gl_quick_entries.php:343
 +#: ../gl/manage/gl_quick_entries.php:345
 +#: ../gl/view/accrual_trans.php:54
 +#: ../gl/view/accrual_trans.php:56
 +#: ../gl/view/gl_deposit_view.php:104
 +#: ../gl/view/gl_deposit_view.php:107
 +#: ../gl/view/gl_payment_view.php:103
 +#: ../gl/view/gl_payment_view.php:106
 +#: ../gl/view/gl_trans_view.php:68
 +#: ../gl/view/gl_trans_view.php:71
 +#: ../gl/includes/ui/gl_bank_ui.inc:152
 +#: ../gl/includes/ui/gl_bank_ui.inc:153
 +#: ../gl/includes/ui/gl_bank_ui.inc:155
 +#: ../gl/includes/ui/gl_journal_ui.inc:86
 +#: ../gl/includes/ui/gl_journal_ui.inc:87
 +#: ../gl/includes/ui/gl_journal_ui.inc:89
 +#: ../includes/sysnames.inc:43
 +#: ../includes/sysnames.inc:166
 +#: ../inventory/manage/item_categories.php:220
 +#: ../inventory/manage/item_categories.php:222
 +#: ../inventory/manage/items.php:354
 +#: ../inventory/manage/items.php:356
 +#: ../purchasing/includes/ui/invoice_ui.inc:280
 +#: ../purchasing/includes/ui/invoice_ui.inc:282
- #: ../purchasing/manage/suppliers.php:145
- #: ../purchasing/manage/suppliers.php:146
++#: ../purchasing/manage/suppliers.php:147
 +#: ../purchasing/manage/suppliers.php:148
++#: ../purchasing/manage/suppliers.php:150
 +#: ../reporting/rep103.php:243
 +#: ../reporting/rep103.php:255
 +#: ../reporting/rep205.php:161
 +#: ../reporting/rep205.php:173
 +#: ../reporting/rep501.php:92
 +#: ../reporting/rep704.php:83
 +#: ../reporting/rep704.php:86
 +#: ../reporting/rep704.php:97
 +#: ../reporting/rep704.php:99
 +#: ../reporting/rep704.php:107
 +#: ../reporting/rep705.php:249
 +#: ../reporting/rep705.php:251
 +#: ../reporting/rep705.php:262
 +#: ../reporting/rep706.php:194
 +#: ../reporting/rep706.php:196
 +#: ../reporting/rep706.php:204
 +#: ../reporting/rep707.php:218
 +#: ../reporting/rep707.php:220
 +#: ../reporting/rep707.php:228
 +#: ../reporting/rep708.php:201
 +#: ../reporting/rep708.php:203
 +#: ../reporting/rep708.php:210
++#: ../reporting/reports_main.php:347
++#: ../reporting/reports_main.php:348
++#: ../reporting/reports_main.php:354
++#: ../reporting/reports_main.php:355
++#: ../reporting/reports_main.php:363
++#: ../reporting/reports_main.php:364
++#: ../reporting/reports_main.php:375
++#: ../reporting/reports_main.php:376
++#: ../reporting/reports_main.php:388
++#: ../reporting/reports_main.php:389
++#: ../reporting/reports_main.php:401
++#: ../reporting/reports_main.php:407
++#: ../reporting/reports_main.php:415
++#: ../reporting/reports_main.php:426
++#: ../reporting/reports_main.php:438
 +#: ../sales/customer_delivery.php:409
 +#: ../sales/customer_delivery.php:417
- #: ../sales/customer_invoice.php:475
- #: ../sales/customer_invoice.php:518
- #: ../sales/manage/customers.php:273
- #: ../sales/manage/customers.php:275
++#: ../sales/customer_invoice.php:484
++#: ../sales/customer_invoice.php:527
++#: ../sales/manage/customers.php:274
++#: ../sales/manage/customers.php:276
 +#: ../sales/includes/ui/sales_credit_ui.inc:132
 +#: ../sales/includes/ui/sales_credit_ui.inc:137
 +#: ../sales/includes/ui/sales_order_ui.inc:457
 +#: ../sales/includes/ui/sales_order_ui.inc:462
  msgid "Dimension"
  msgstr ""
  
@@@ -3973,48 -3356,29 +4046,51 @@@ msgstr "
  msgid "Revenue / Cost Account"
  msgstr ""
  
 -#: gl/accruals.php:208 gl/gl_budget.php:91 gl/gl_budget.php:93
 -#: gl/inquiry/journal_inquiry.php:132 gl/inquiry/tax_inquiry.php:82
 -#: gl/manage/gl_quick_entries.php:261 gl/manage/gl_quick_entries.php:263
 -#: gl/manage/gl_quick_entries.php:265 gl/manage/gl_quick_entries.php:339
 -#: gl/view/bank_transfer_view.php:70 gl/view/bank_transfer_view.php:80
 -#: gl/view/gl_deposit_view.php:67 gl/view/gl_deposit_view.php:105
 -#: gl/view/gl_deposit_view.php:108 gl/view/gl_deposit_view.php:111
 -#: gl/view/gl_payment_view.php:65 gl/view/gl_payment_view.php:104
 -#: gl/view/gl_payment_view.php:107 gl/view/gl_payment_view.php:110
 -#: gl/includes/ui/gl_bank_ui.inc:153 gl/includes/ui/gl_bank_ui.inc:156
 -#: gl/includes/ui/gl_bank_ui.inc:159 includes/sysnames.inc:132
 -#: includes/ui/allocation_cart.inc:288 includes/ui/mk.allocation_cart.inc:288
 -#: includes/ui/ui_lists.inc:1187
 -#: manufacturing/includes/manufacturing_ui.inc:236
 -#: purchasing/includes/ui/invoice_ui.inc:258
 -#: purchasing/includes/ui/invoice_ui.inc:260
 -#: purchasing/includes/ui/invoice_ui.inc:262
 -#: purchasing/view/view_supp_payment.php:60
 -#: purchasing/view/view_supp_payment.php:72 reporting/rep102.php:245
 -#: reporting/rep107.php:184 reporting/rep109.php:189 reporting/rep110.php:193
 -#: reporting/rep111.php:174 reporting/rep113.php:178 reporting/rep202.php:253
 -#: reporting/rep209.php:192 reporting/rep706.php:309 reporting/rep707.php:327
 -#: reporting/rep710.php:78 sales/view/view_receipt.php:44
 +#: ../gl/accruals.php:212
 +#: ../gl/gl_budget.php:91
 +#: ../gl/gl_budget.php:93
 +#: ../gl/inquiry/journal_inquiry.php:132
 +#: ../gl/inquiry/tax_inquiry.php:82
 +#: ../gl/manage/gl_quick_entries.php:261
 +#: ../gl/manage/gl_quick_entries.php:263
 +#: ../gl/manage/gl_quick_entries.php:265
 +#: ../gl/manage/gl_quick_entries.php:339
 +#: ../gl/view/bank_transfer_view.php:70
 +#: ../gl/view/bank_transfer_view.php:80
 +#: ../gl/view/gl_deposit_view.php:67
 +#: ../gl/view/gl_deposit_view.php:105
 +#: ../gl/view/gl_deposit_view.php:108
 +#: ../gl/view/gl_deposit_view.php:111
 +#: ../gl/view/gl_payment_view.php:65
 +#: ../gl/view/gl_payment_view.php:104
 +#: ../gl/view/gl_payment_view.php:107
 +#: ../gl/view/gl_payment_view.php:110
 +#: ../gl/includes/ui/gl_bank_ui.inc:153
 +#: ../gl/includes/ui/gl_bank_ui.inc:156
 +#: ../gl/includes/ui/gl_bank_ui.inc:159
 +#: ../includes/sysnames.inc:133
- #: ../includes/ui/allocation_cart.inc:289
++#: ../includes/ui/allocation_cart.inc:290
 +#: ../includes/ui/ui_lists.inc:1185
 +#: ../manufacturing/view/wo_costs_view.php:46
 +#: ../manufacturing/includes/manufacturing_ui.inc:236
 +#: ../purchasing/includes/ui/invoice_ui.inc:280
 +#: ../purchasing/includes/ui/invoice_ui.inc:282
 +#: ../purchasing/includes/ui/invoice_ui.inc:284
 +#: ../purchasing/view/view_supp_payment.php:60
 +#: ../purchasing/view/view_supp_payment.php:72
++#: ../reporting/rep102.php:245
++#: ../reporting/rep107.php:204
++#: ../reporting/rep107.php:265
 +#: ../reporting/rep109.php:195
 +#: ../reporting/rep110.php:193
 +#: ../reporting/rep111.php:174
 +#: ../reporting/rep113.php:178
 +#: ../reporting/rep202.php:253
 +#: ../reporting/rep209.php:195
 +#: ../reporting/rep706.php:309
 +#: ../reporting/rep707.php:327
 +#: ../reporting/rep710.php:78
 +#: ../sales/view/view_receipt.php:44
  msgid "Amount"
  msgstr ""
  
@@@ -4046,14 -3410,9 +4122,12 @@@ msgstr "
  msgid "Reconcile Bank Account"
  msgstr ""
  
 -#: gl/bank_account_reconcile.php:35 gl/bank_transfer.php:30 gl/gl_bank.php:49
 -#: gl/inquiry/bank_inquiry.php:30 purchasing/supplier_payment.php:42
 -#: sales/customer_payments.php:38
 +#: ../gl/bank_account_reconcile.php:35
 +#: ../gl/bank_transfer.php:30
 +#: ../gl/gl_bank.php:49
 +#: ../gl/inquiry/bank_inquiry.php:30
 +#: ../purchasing/supplier_payment.php:42
- #: ../purchasing/supplier_payment.php.orig:42
 +#: ../sales/customer_payments.php:38
- #: ../sales/customer_payments.php.orig:39
  msgid "There are no bank accounts defined in the system."
  msgstr ""
  
@@@ -4156,16 -3505,13 +4230,16 @@@ msgstr "
  msgid "Transfer Date:"
  msgstr ""
  
 -#: gl/bank_transfer.php:87 gl/bank_transfer.php:94
 -#: sales/customer_payments.php:397
 +#: ../gl/bank_transfer.php:87
 +#: ../gl/bank_transfer.php:94
- #: ../sales/customer_payments.php.orig:407
++#: ../sales/customer_payments.php:400
  msgid "Amount:"
  msgstr ""
  
 -#: gl/bank_transfer.php:88 gl/bank_transfer.php:95
 -#: purchasing/supplier_payment.php:313 sales/customer_payments.php:383
 +#: ../gl/bank_transfer.php:88
 +#: ../gl/bank_transfer.php:95
- #: ../purchasing/supplier_payment.php.orig:307
- #: ../sales/customer_payments.php.orig:392
++#: ../purchasing/supplier_payment.php:313
++#: ../sales/customer_payments.php:386
  msgid "Bank Charge:"
  msgstr ""
  
@@@ -4177,11 -3523,8 +4251,11 @@@ msgstr "
  msgid "Enter Transfer"
  msgstr ""
  
 -#: gl/bank_transfer.php:128 gl/bank_transfer.php:158 gl/bank_transfer.php:190
 -#: purchasing/supplier_payment.php:135 purchasing/supplier_payment.php:141
 +#: ../gl/bank_transfer.php:128
 +#: ../gl/bank_transfer.php:158
 +#: ../gl/bank_transfer.php:190
- #: ../purchasing/supplier_payment.php.orig:126
- #: ../purchasing/supplier_payment.php.orig:132
++#: ../purchasing/supplier_payment.php:135
++#: ../purchasing/supplier_payment.php:141
  msgid "The entered amount is invalid or less than zero."
  msgstr ""
  
@@@ -4203,30 -3544,21 +4277,30 @@@ msgid "
  "for transaction: %s #%s on %s."
  msgstr ""
  
 -#: gl/bank_transfer.php:163 purchasing/supplier_payment.php:149
 -#: sales/customer_payments.php:195
 +#: ../gl/bank_transfer.php:163
- #: ../purchasing/supplier_payment.php.orig:140
- #: ../sales/customer_payments.php.orig:190
++#: ../purchasing/supplier_payment.php:149
++#: ../sales/customer_payments.php:195
  msgid ""
  "The Bank Charge Account has not been set in System and General GL Setup."
  msgstr ""
  
 -#: gl/bank_transfer.php:169 gl/gl_bank.php:248 gl/gl_journal.php:168
 -#: gl/manage/revaluate_currencies.php:65 inventory/adjustments.php:94
 -#: inventory/transfers.php:91 manufacturing/work_order_add_finished.php:77
 -#: manufacturing/work_order_entry.php:132
 -#: manufacturing/work_order_issue.php:89 purchasing/po_receive_items.php:188
 -#: purchasing/supplier_payment.php:207 sales/credit_note_entry.php:147
 -#: sales/customer_credit_invoice.php:102 sales/customer_delivery.php:166
 -#: sales/customer_invoice.php:289 sales/customer_payments.php:162
 -#: sales/sales_order_entry.php:416
 +#: ../gl/bank_transfer.php:169
 +#: ../gl/gl_bank.php:251
- #: ../gl/gl_journal.php:173
++#: ../gl/gl_journal.php:174
 +#: ../gl/manage/revaluate_currencies.php:65
 +#: ../inventory/adjustments.php:94
 +#: ../inventory/transfers.php:91
 +#: ../manufacturing/work_order_add_finished.php:77
 +#: ../manufacturing/work_order_entry.php:132
 +#: ../manufacturing/work_order_issue.php:90
 +#: ../purchasing/po_receive_items.php:186
- #: ../purchasing/supplier_payment.php.orig:197
++#: ../purchasing/supplier_payment.php:207
 +#: ../sales/credit_note_entry.php:147
 +#: ../sales/customer_credit_invoice.php:102
 +#: ../sales/customer_delivery.php:178
- #: ../sales/customer_invoice.php:332
- #: ../sales/customer_payments.php.orig:157
- #: ../sales/sales_order_entry.php:429
++#: ../sales/customer_invoice.php:341
++#: ../sales/customer_payments.php:162
++#: ../sales/sales_order_entry.php:432
  msgid "You must enter a reference."
  msgstr ""
  
@@@ -4274,18 -3603,12 +4348,18 @@@ msgstr "
  msgid "Enter A &Deposit"
  msgstr ""
  
 -#: gl/gl_bank.php:82 gl/gl_journal.php:61 inventory/adjustments.php:50
 -#: manufacturing/work_order_entry.php:68 purchasing/po_entry_items.php:112
 -#: purchasing/po_entry_items.php:136 purchasing/supplier_credit.php:49
 -#: purchasing/supplier_invoice.php:53 sales/credit_note_entry.php:77
 -#: sales/customer_credit_invoice.php:62 sales/customer_invoice.php:75
 -#: sales/sales_order_entry.php:237
 +#: ../gl/gl_bank.php:85
- #: ../gl/gl_journal.php:63
++#: ../gl/gl_journal.php:64
 +#: ../inventory/adjustments.php:50
 +#: ../manufacturing/work_order_entry.php:68
 +#: ../purchasing/po_entry_items.php:115
- #: ../purchasing/po_entry_items.php:139
++#: ../purchasing/po_entry_items.php:136
 +#: ../purchasing/supplier_credit.php:83
- #: ../purchasing/supplier_invoice.php:75
++#: ../purchasing/supplier_invoice.php:76
 +#: ../sales/credit_note_entry.php:77
 +#: ../sales/customer_credit_invoice.php:62
- #: ../sales/customer_invoice.php:69
- #: ../sales/sales_order_entry.php:240
++#: ../sales/customer_invoice.php:78
++#: ../sales/sales_order_entry.php:243
  msgid "Add an Attachment"
  msgstr ""
  
@@@ -4332,8 -3655,7 +4406,8 @@@ msgstr "
  msgid "You must enter at least one payment line."
  msgstr ""
  
 -#: gl/gl_bank.php:235 purchasing/supplier_payment.php:200
 +#: ../gl/gl_bank.php:238
- #: ../purchasing/supplier_payment.php.orig:190
++#: ../purchasing/supplier_payment.php:200
  #, php-format
  msgid "The total bank amount exceeds allowed limit (%s)."
  msgstr ""
@@@ -4354,28 -3676,27 +4428,28 @@@ msgstr "
  msgid "Settled amount have to be positive number."
  msgstr ""
  
- #: ../gl/gl_bank.php:332
 -#: gl/gl_bank.php:329
++#: ../gl/gl_bank.php:333
  msgid "The amount entered is not a valid number or is less than zero."
  msgstr ""
  
- #: ../gl/gl_bank.php:338
 -#: gl/gl_bank.php:335 gl/manage/exchange_rates.php:39
++#: ../gl/gl_bank.php:339
 +#: ../gl/manage/exchange_rates.php:39
  msgid "The exchange rate cannot be zero or a negative number."
  msgstr ""
  
- #: ../gl/gl_bank.php:410
 -#: gl/gl_bank.php:407
++#: ../gl/gl_bank.php:411
  msgid "Payment Items"
  msgstr ""
  
- #: ../gl/gl_bank.php:410
 -#: gl/gl_bank.php:407
++#: ../gl/gl_bank.php:411
  msgid "Deposit Items"
  msgstr ""
  
- #: ../gl/gl_bank.php:418
 -#: gl/gl_bank.php:415
++#: ../gl/gl_bank.php:419
  msgid "Process Payment"
  msgstr ""
  
- #: ../gl/gl_bank.php:418
 -#: gl/gl_bank.php:415
++#: ../gl/gl_bank.php:419
  msgid "Process Deposit"
  msgstr ""
  
@@@ -4409,40 -3727,18 +4483,40 @@@ msgstr "
  msgid "Get"
  msgstr ""
  
 -#: gl/gl_budget.php:91 gl/gl_budget.php:93 gl/inquiry/profit_loss.php:236
 -#: gl/manage/gl_quick_entries.php:240 reporting/rep101.php:126
 -#: reporting/rep105.php:118 reporting/rep106.php:92 reporting/rep114.php:90
 -#: reporting/rep201.php:118 reporting/rep304.php:121 reporting/rep305.php:106
 -#: reporting/rep306.php:148 reporting/rep307.php:122 reporting/rep308.php:155
 -#: reporting/rep309.php:103 reporting/rep601.php:85 reporting/rep702.php:59
 -#: reporting/rep704.php:95 reporting/rep704.php:105 reporting/rep704.php:113
 -#: reporting/rep706.php:185 reporting/rep706.php:193 reporting/rep706.php:203
 -#: reporting/rep706.php:211 reporting/rep707.php:210 reporting/rep707.php:217
 -#: reporting/rep707.php:227 reporting/rep707.php:235 reporting/rep708.php:200
 -#: reporting/rep708.php:209 reporting/rep708.php:216 reporting/rep709.php:106
 -#: reporting/rep710.php:85
 +#: ../gl/gl_budget.php:91
 +#: ../gl/gl_budget.php:93
 +#: ../gl/inquiry/profit_loss.php:236
 +#: ../gl/manage/gl_quick_entries.php:240
- #: ../reporting/rep101.php:155
++#: ../reporting/rep101.php:126
 +#: ../reporting/rep105.php:118
 +#: ../reporting/rep106.php:92
 +#: ../reporting/rep114.php:90
- #: ../reporting/rep201.php:143
++#: ../reporting/rep201.php:118
 +#: ../reporting/rep304.php:121
 +#: ../reporting/rep305.php:106
 +#: ../reporting/rep306.php:148
 +#: ../reporting/rep307.php:122
 +#: ../reporting/rep308.php:155
 +#: ../reporting/rep309.php:103
 +#: ../reporting/rep601.php:85
 +#: ../reporting/rep602.php:86
 +#: ../reporting/rep702.php:59
 +#: ../reporting/rep704.php:95
 +#: ../reporting/rep704.php:105
 +#: ../reporting/rep704.php:113
 +#: ../reporting/rep706.php:185
 +#: ../reporting/rep706.php:193
 +#: ../reporting/rep706.php:203
 +#: ../reporting/rep706.php:211
 +#: ../reporting/rep707.php:210
 +#: ../reporting/rep707.php:217
 +#: ../reporting/rep707.php:227
 +#: ../reporting/rep707.php:235
 +#: ../reporting/rep708.php:200
 +#: ../reporting/rep708.php:209
 +#: ../reporting/rep708.php:216
 +#: ../reporting/rep709.php:106
 +#: ../reporting/rep710.php:85
  msgid "Period"
  msgstr ""
  
@@@ -4455,164 -3750,129 +4529,172 @@@ msgstr "
  msgid "Last Year"
  msgstr ""
  
 -#: gl/gl_budget.php:127 gl/inquiry/balance_sheet.php:98
 -#: gl/inquiry/balance_sheet.php:205 gl/inquiry/balance_sheet.php:236
 -#: gl/inquiry/gl_trial_balance.php:224 gl/inquiry/profit_loss.php:115
 -#: gl/inquiry/profit_loss.php:288 gl/view/gl_deposit_view.php:137
 -#: gl/view/gl_payment_view.php:136 gl/view/gl_trans_view.php:106
 -#: gl/includes/ui/gl_bank_ui.inc:202 gl/includes/ui/gl_journal_ui.inc:141
 -#: inventory/includes/item_adjustments_ui.inc:63
 -#: inventory/includes/item_adjustments_ui.inc:102
 -#: manufacturing/includes/manufacturing_ui.inc:178
 -#: purchasing/includes/ui/invoice_ui.inc:322
 -#: purchasing/includes/ui/invoice_ui.inc:487
 -#: purchasing/includes/ui/invoice_ui.inc:557
 -#: purchasing/po_receive_items.php:63 purchasing/view/view_po.php:140
 -#: purchasing/allocations/supplier_allocation_main.php:100
 -#: reporting/rep101.php:234 reporting/rep106.php:84 reporting/rep106.php:119
 -#: reporting/rep106.php:162 reporting/rep114.php:161 reporting/rep201.php:223
 -#: reporting/rep203.php:94 reporting/rep203.php:171 reporting/rep204.php:113
 -#: reporting/rep204.php:141 reporting/rep301.php:133 reporting/rep301.php:170
 -#: reporting/rep304.php:146 reporting/rep304.php:188 reporting/rep305.php:101
 -#: reporting/rep305.php:127 reporting/rep305.php:183 reporting/rep306.php:141
 -#: reporting/rep306.php:176 reporting/rep306.php:196 reporting/rep306.php:212
 -#: reporting/rep306.php:261 reporting/rep306.php:276 reporting/rep306.php:287
 -#: reporting/rep309.php:126 reporting/rep309.php:153 reporting/rep702.php:142
 -#: reporting/rep705.php:152 reporting/rep705.php:315 reporting/rep706.php:106
 -#: reporting/rep706.php:255 reporting/rep706.php:290 reporting/rep707.php:115
 -#: reporting/rep707.php:297 reporting/rep708.php:253
 -#: reporting/includes/doctext.inc:30 reporting/includes/doctext.inc:170
 -#: sales/customer_credit_invoice.php:281 sales/customer_delivery.php:433
 -#: sales/customer_invoice.php:479
 -#: sales/allocations/customer_allocation_main.php:99
 -#: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113
 -#: sales/view/view_invoice.php:114 sales/view/view_sales_order.php:96
 -#: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161
 -#: sales/view/view_sales_order.php:202
 -#: sales/includes/ui/sales_credit_ui.inc:168
 -#: sales/includes/ui/sales_order_ui.inc:146
 +#: ../gl/gl_budget.php:127
 +#: ../gl/inquiry/balance_sheet.php:98
 +#: ../gl/inquiry/balance_sheet.php:205
 +#: ../gl/inquiry/balance_sheet.php:236
- #: ../gl/inquiry/gl_trial_balance.php.orig:218
++#: ../gl/inquiry/gl_trial_balance.php:223
 +#: ../gl/inquiry/profit_loss.php:115
 +#: ../gl/inquiry/profit_loss.php:288
 +#: ../gl/view/gl_deposit_view.php:137
 +#: ../gl/view/gl_payment_view.php:136
 +#: ../gl/view/gl_trans_view.php:115
 +#: ../gl/includes/ui/gl_bank_ui.inc:202
 +#: ../gl/includes/ui/gl_journal_ui.inc:153
 +#: ../inventory/includes/item_adjustments_ui.inc:63
 +#: ../inventory/includes/item_adjustments_ui.inc:102
 +#: ../manufacturing/includes/manufacturing_ui.inc:178
 +#: ../purchasing/includes/ui/invoice_ui.inc:344
 +#: ../purchasing/includes/ui/invoice_ui.inc:510
 +#: ../purchasing/includes/ui/invoice_ui.inc:581
 +#: ../purchasing/po_receive_items.php:63
 +#: ../purchasing/view/view_po.php:140
 +#: ../purchasing/allocations/supplier_allocation_main.php:100
++#: ../reporting/rep101.php:234
 +#: ../reporting/rep106.php:84
 +#: ../reporting/rep106.php:119
 +#: ../reporting/rep106.php:162
 +#: ../reporting/rep114.php:161
++#: ../reporting/rep201.php:223
 +#: ../reporting/rep203.php:94
 +#: ../reporting/rep203.php:171
 +#: ../reporting/rep204.php:113
 +#: ../reporting/rep204.php:141
 +#: ../reporting/rep301.php:133
 +#: ../reporting/rep301.php:170
 +#: ../reporting/rep304.php:146
 +#: ../reporting/rep304.php:188
 +#: ../reporting/rep305.php:101
 +#: ../reporting/rep305.php:127
 +#: ../reporting/rep305.php:183
 +#: ../reporting/rep306.php:141
++#: ../reporting/rep306.php:176
++#: ../reporting/rep306.php:196
++#: ../reporting/rep306.php:212
++#: ../reporting/rep306.php:261
++#: ../reporting/rep306.php:276
++#: ../reporting/rep306.php:287
 +#: ../reporting/rep309.php:126
 +#: ../reporting/rep309.php:153
 +#: ../reporting/rep702.php:142
 +#: ../reporting/rep705.php:152
 +#: ../reporting/rep705.php:315
 +#: ../reporting/rep706.php:106
 +#: ../reporting/rep706.php:255
 +#: ../reporting/rep706.php:290
 +#: ../reporting/rep707.php:115
 +#: ../reporting/rep707.php:297
 +#: ../reporting/rep708.php:253
 +#: ../reporting/includes/doctext.inc:30
 +#: ../reporting/includes/doctext.inc:192
 +#: ../sales/customer_credit_invoice.php:281
 +#: ../sales/customer_delivery.php:447
- #: ../sales/customer_invoice.php:542
- #: ../sales/customer_invoice.php:545
++#: ../sales/customer_invoice.php:551
++#: ../sales/customer_invoice.php:554
 +#: ../sales/allocations/customer_allocation_main.php:99
 +#: ../sales/view/view_credit.php:91
 +#: ../sales/view/view_dispatch.php:113
 +#: ../sales/view/view_invoice.php:116
 +#: ../sales/view/view_sales_order.php:109
 +#: ../sales/view/view_sales_order.php:142
 +#: ../sales/view/view_sales_order.php:179
 +#: ../sales/view/view_sales_order.php:220
 +#: ../sales/includes/ui/sales_credit_ui.inc:168
 +#: ../sales/includes/ui/sales_order_ui.inc:147
  msgid "Total"
  msgstr ""
  
- #: ../gl/gl_journal.php:32
 -#: gl/gl_journal.php:32
++#: ../gl/gl_journal.php:33
  #, php-format
  msgid "Modifying Journal Transaction # %d."
  msgstr ""
  
- #: ../gl/gl_journal.php:36
 -#: gl/gl_journal.php:36 includes/sysnames.inc:22 includes/sysnames.inc:149
++#: ../gl/gl_journal.php:37
 +#: ../includes/sysnames.inc:22
 +#: ../includes/sysnames.inc:150
  msgid "Journal Entry"
  msgstr ""
  
- #: ../gl/gl_journal.php:56
 -#: gl/gl_journal.php:54
++#: ../gl/gl_journal.php:57
  msgid "Journal entry has been entered"
  msgstr ""
  
- #: ../gl/gl_journal.php:58
- #: ../gl/gl_journal.php:73
 -#: gl/gl_journal.php:56 gl/gl_journal.php:71
++#: ../gl/gl_journal.php:59
++#: ../gl/gl_journal.php:74
  msgid "&View this Journal Entry"
  msgstr ""
  
- #: ../gl/gl_journal.php:61
 -#: gl/gl_journal.php:59
++#: ../gl/gl_journal.php:62
  msgid "Enter &New Journal Entry"
  msgstr ""
  
- #: ../gl/gl_journal.php:71
 -#: gl/gl_journal.php:69
++#: ../gl/gl_journal.php:72
  msgid "Journal entry has been updated"
  msgstr ""
  
- #: ../gl/gl_journal.php:75
 -#: gl/gl_journal.php:73
++#: ../gl/gl_journal.php:76
  msgid "Return to Journal &Inquiry"
  msgstr ""
  
- #: ../gl/gl_journal.php:90
 -#: gl/gl_journal.php:86
++#: ../gl/gl_journal.php:91
  msgid ""
  "You can edit directly only journal entries created via Journal Entry page."
  msgstr ""
  
- #: ../gl/gl_journal.php:91
 -#: gl/gl_journal.php:87
++#: ../gl/gl_journal.php:92
  msgid "Entry &New Journal Entry"
  msgstr ""
  
- #: ../gl/gl_journal.php:148
 -#: gl/gl_journal.php:143
++#: ../gl/gl_journal.php:149
  msgid "You must enter at least one journal line."
  msgstr ""
  
- #: ../gl/gl_journal.php:154
 -#: gl/gl_journal.php:149
++#: ../gl/gl_journal.php:155
 +#: ../includes/ui/gl_cart.inc:128
  msgid ""
  "The journal must balance (debits equal to credits) before it can be "
  "processed."
  msgstr ""
  
- #: ../gl/gl_journal.php:216
- #: ../gl/gl_journal.php:223
 -#: gl/gl_journal.php:211 gl/gl_journal.php:218
++#: ../gl/gl_journal.php:217
++#: ../gl/gl_journal.php:224
  msgid "Dimension is closed."
  msgstr ""
  
- #: ../gl/gl_journal.php:230
 -#: gl/gl_journal.php:225
++#: ../gl/gl_journal.php:231
  msgid "You must enter either a debit amount or a credit amount."
  msgstr ""
  
- #: ../gl/gl_journal.php:237
 -#: gl/gl_journal.php:232
++#: ../gl/gl_journal.php:238
  msgid "The debit amount entered is not a valid number or is less than zero."
  msgstr ""
  
- #: ../gl/gl_journal.php:242
 -#: gl/gl_journal.php:237
++#: ../gl/gl_journal.php:243
  msgid "The credit amount entered is not a valid number or is less than zero."
  msgstr ""
  
- #: ../gl/gl_journal.php:248
 -#: gl/gl_journal.php:243 includes/ui/ui_view.inc:732
 -#: purchasing/supplier_credit.php:119 purchasing/supplier_invoice.php:129
++#: ../gl/gl_journal.php:249
 +#: ../includes/ui/ui_view.inc:733
- #: ../purchasing/supplier_credit.php:135
- #: ../purchasing/supplier_invoice.php:144
++#: ../purchasing/supplier_credit.php:144
++#: ../purchasing/supplier_invoice.php:154
  msgid "Cannot post to GL account used by more than one tax type."
  msgstr ""
  
- #: ../gl/gl_journal.php:255
 -#: gl/gl_journal.php:250
++#: ../gl/gl_journal.php:256
  msgid ""
  "You cannot make a journal entry for a bank account. Please use one of the "
  "banking functions for bank transactions."
  msgstr ""
  
- #: ../gl/gl_journal.php:334
 -#: gl/gl_journal.php:329
++#: ../gl/gl_journal.php:335
  msgid "Rows"
  msgstr ""
  
- #: ../gl/gl_journal.php:340
 -#: gl/gl_journal.php:335
++#: ../gl/gl_journal.php:341
  msgid "Process Journal Entry"
  msgstr ""
  
- #: ../gl/gl_journal.php:341
 -#: gl/gl_journal.php:336
++#: ../gl/gl_journal.php:342
  msgid "Process journal entry only if debits equal to credits"
  msgstr ""
  
@@@ -4663,13 -3912,9 +4745,13 @@@ msgstr "
  msgid "Opening Balance"
  msgstr ""
  
 -#: gl/inquiry/bank_inquiry.php:124 gl/inquiry/gl_account_inquiry.php:213
 -#: gl/inquiry/gl_trial_balance.php:234 reporting/rep601.php:157
 -#: reporting/rep704.php:192 reporting/rep708.php:262
 +#: ../gl/inquiry/bank_inquiry.php:124
- #: ../gl/inquiry/gl_account_inquiry.php:211
- #: ../gl/inquiry/gl_trial_balance.php.orig:228
++#: ../gl/inquiry/gl_account_inquiry.php:213
++#: ../gl/inquiry/gl_trial_balance.php:233
 +#: ../reporting/rep601.php:157
 +#: ../reporting/rep602.php:157
 +#: ../reporting/rep704.php:192
 +#: ../reporting/rep708.php:262
  msgid "Ending Balance"
  msgstr ""
  
@@@ -4689,73 -3934,56 +4771,73 @@@ msgstr "
  msgid "Amount max:"
  msgstr ""
  
- #: ../gl/inquiry/gl_account_inquiry.php:220
 -#: gl/inquiry/gl_account_inquiry.php:222
++#: ../gl/inquiry/gl_account_inquiry.php:222
  msgid ""
  "No general ledger transactions have been created for the specified criteria."
  msgstr ""
  
 -#: gl/inquiry/gl_trial_balance.php:28 reporting/rep708.php:219
 +#: ../gl/inquiry/gl_trial_balance.php:28
- #: ../gl/inquiry/gl_trial_balance.php.orig:28
 +#: ../reporting/rep708.php:219
  msgid "Trial Balance"
  msgstr ""
  
 -#: gl/inquiry/gl_trial_balance.php:60
 +#: ../gl/inquiry/gl_trial_balance.php:60
- #: ../gl/inquiry/gl_trial_balance.php.orig:55
  msgid "No zero values"
  msgstr ""
  
 -#: gl/inquiry/gl_trial_balance.php:61 reporting/reports_main.php:381
 -#: reporting/reports_main.php:431 reporting/reports_main.php:476
 +#: ../gl/inquiry/gl_trial_balance.php:61
- #: ../gl/inquiry/gl_trial_balance.php.orig:56
++#: ../reporting/reports_main.php:387
++#: ../reporting/reports_main.php:437
++#: ../reporting/reports_main.php:482
  msgid "Only balances"
  msgstr ""
  
- #: ../gl/inquiry/gl_trial_balance.php.orig:88
- #: ../gl/inquiry/gl_trial_balance.php.orig:149
 -#: gl/inquiry/gl_trial_balance.php:95 gl/inquiry/gl_trial_balance.php:156
 -#: reporting/rep706.php:308 reporting/rep707.php:326 reporting/rep708.php:51
 -#: reporting/rep708.php:126 sales/create_recurrent_invoices.php:134
 -#: sales/manage/recurrent_invoices.php:102
++#: ../gl/inquiry/gl_trial_balance.php:93
++#: ../gl/inquiry/gl_trial_balance.php:154
 +#: ../reporting/rep706.php:308
 +#: ../reporting/rep707.php:326
 +#: ../reporting/rep708.php:51
 +#: ../reporting/rep708.php:126
 +#: ../sales/create_recurrent_invoices.php:134
 +#: ../sales/manage/recurrent_invoices.php:102
  msgid "Group"
  msgstr ""
  
- #: ../gl/inquiry/gl_trial_balance.php.orig:167
 -#: gl/inquiry/gl_trial_balance.php:173
++#: ../gl/inquiry/gl_trial_balance.php:172
  msgid "The from date cannot be bigger than the fiscal year end."
  msgstr ""
  
- #: ../gl/inquiry/gl_trial_balance.php.orig:180
 -#: gl/inquiry/gl_trial_balance.php:186 gl/manage/bank_accounts.php:106
 -#: gl/view/gl_trans_view.php:63 gl/view/gl_trans_view.php:66
 -#: gl/view/gl_trans_view.php:69 reporting/rep701.php:111
 -#: reporting/rep702.php:53 reporting/rep705.php:238 reporting/rep706.php:185
 -#: reporting/rep707.php:210 reporting/rep708.php:192
++#: ../gl/inquiry/gl_trial_balance.php:185
 +#: ../gl/manage/bank_accounts.php:109
 +#: ../gl/view/gl_trans_view.php:68
 +#: ../gl/view/gl_trans_view.php:71
 +#: ../gl/view/gl_trans_view.php:74
 +#: ../reporting/rep701.php:111
 +#: ../reporting/rep702.php:53
 +#: ../reporting/rep705.php:238
 +#: ../reporting/rep706.php:185
 +#: ../reporting/rep707.php:210
 +#: ../reporting/rep708.php:192
  msgid "Account Name"
  msgstr ""
  
- #: ../gl/inquiry/gl_trial_balance.php.orig:181
 -#: gl/inquiry/gl_trial_balance.php:187 reporting/rep708.php:185
++#: ../gl/inquiry/gl_trial_balance.php:186
 +#: ../reporting/rep708.php:185
  msgid "Brought Forward"
  msgstr ""
  
- #: ../gl/inquiry/gl_trial_balance.php.orig:182
 -#: gl/inquiry/gl_trial_balance.php:188 reporting/rep708.php:185
++#: ../gl/inquiry/gl_trial_balance.php:187
 +#: ../reporting/rep708.php:185
  msgid "This Period"
  msgstr ""
  
- #: ../gl/inquiry/gl_trial_balance.php.orig:201
 -#: gl/inquiry/gl_trial_balance.php:207 gl/manage/gl_account_types.php:128
++#: ../gl/inquiry/gl_trial_balance.php:206
 +#: ../gl/manage/gl_account_types.php:128
  msgid "Class"
  msgstr ""
  
- #: ../gl/inquiry/gl_trial_balance.php.orig:236
 -#: gl/inquiry/gl_trial_balance.php:242 reporting/rep708.php:283
++#: ../gl/inquiry/gl_trial_balance.php:241
 +#: ../reporting/rep708.php:283
  msgid ""
  "The Opening Balance is not in balance, probably due to a non closed Previous "
  "Fiscalyear."
@@@ -4781,9 -4009,8 +4863,10 @@@ msgstr "
  msgid "Trans #"
  msgstr ""
  
 -#: gl/inquiry/journal_inquiry.php:134 reporting/rep710.php:77
 -#: reporting/rep710.php:87 reporting/reports_main.php:492
 +#: ../gl/inquiry/journal_inquiry.php:134
 +#: ../reporting/rep710.php:77
 +#: ../reporting/rep710.php:87
++#: ../reporting/reports_main.php:498
  msgid "User"
  msgstr ""
  
@@@ -4809,7 -4033,8 +4892,10 @@@ msgstr "
  msgid "Budget"
  msgstr ""
  
 -#: gl/inquiry/profit_loss.php:174 reporting/reports_main.php:368
 -#: reporting/reports_main.php:419 reporting/reports_main.php:465
 +#: ../gl/inquiry/profit_loss.php:174
++#: ../reporting/reports_main.php:374
++#: ../reporting/reports_main.php:425
++#: ../reporting/reports_main.php:471
  msgid "Compare to"
  msgstr ""
  
@@@ -4863,8 -4082,7 +4949,9 @@@ msgstr "
  msgid "Total payable or refund"
  msgstr ""
  
 -#: gl/manage/bank_accounts.php:16 reporting/reports_main.php:310
 +#: ../gl/manage/bank_accounts.php:16
 +#: ../reporting/reports_main.php:310
++#: ../reporting/reports_main.php:318
  msgid "Bank Accounts"
  msgstr ""
  
@@@ -4900,49 -4118,37 +4987,49 @@@ msgstr "
  msgid "Selected bank account has been deleted"
  msgstr ""
  
 -#: gl/manage/bank_accounts.php:106 gl/view/bank_transfer_view.php:69
 -#: gl/view/bank_transfer_view.php:78 gl/view/gl_deposit_view.php:66
 -#: gl/view/gl_payment_view.php:64 inventory/prices.php:146
 -#: inventory/purchasing_data.php:147 purchasing/view/view_supp_credit.php:49
 -#: purchasing/view/view_supp_invoice.php:53
 -#: purchasing/inquiry/po_search_completed.php:127
 -#: purchasing/inquiry/po_search.php:136
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:133
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:143
 -#: purchasing/inquiry/supplier_inquiry.php:76
 -#: purchasing/inquiry/supplier_inquiry.php:175
 -#: purchasing/inquiry/supplier_inquiry.php:186
 -#: purchasing/allocations/supplier_allocation_main.php:99
 -#: purchasing/allocations/supplier_allocation_main.php:107
 -#: reporting/rep101.php:128 reporting/rep102.php:133 reporting/rep102.php:139
 -#: reporting/rep103.php:232 reporting/rep104.php:116 reporting/rep201.php:120
 -#: reporting/rep202.php:138 reporting/rep203.php:101 reporting/rep205.php:150
 -#: sales/customer_credit_invoice.php:237 sales/customer_delivery.php:340
 -#: sales/customer_invoice.php:413
 -#: sales/allocations/customer_allocation_main.php:98
 -#: sales/allocations/customer_allocation_main.php:106
 -#: sales/view/view_credit.php:70 sales/view/view_dispatch.php:86
 -#: sales/view/view_invoice.php:85
 -#: sales/inquiry/customer_allocation_inquiry.php:151
 -#: sales/inquiry/customer_allocation_inquiry.php:161
 -#: sales/inquiry/customer_inquiry.php:80
 -#: sales/inquiry/customer_inquiry.php:225
 -#: sales/inquiry/customer_inquiry.php:238
 -#: sales/inquiry/sales_deliveries_view.php:189
 -#: sales/inquiry/sales_orders_view.php:272
 -#: sales/inquiry/sales_orders_view.php:286
 +#: ../gl/manage/bank_accounts.php:109
 +#: ../gl/view/bank_transfer_view.php:69
 +#: ../gl/view/bank_transfer_view.php:78
 +#: ../gl/view/gl_deposit_view.php:66
 +#: ../gl/view/gl_payment_view.php:64
- #: ../inventory/prices.php.orig:149
- #: ../inventory/purchasing_data.php.orig:149
++#: ../inventory/prices.php:147
++#: ../inventory/purchasing_data.php:148
 +#: ../purchasing/view/view_supp_credit.php:49
 +#: ../purchasing/view/view_supp_invoice.php:54
 +#: ../purchasing/inquiry/po_search_completed.php:126
 +#: ../purchasing/inquiry/po_search.php:136
 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:133
 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:143
 +#: ../purchasing/inquiry/supplier_inquiry.php:73
 +#: ../purchasing/inquiry/supplier_inquiry.php:180
 +#: ../purchasing/inquiry/supplier_inquiry.php:192
 +#: ../purchasing/allocations/supplier_allocation_main.php:99
 +#: ../purchasing/allocations/supplier_allocation_main.php:107
- #: ../reporting/rep101.php:157
++#: ../reporting/rep101.php:128
 +#: ../reporting/rep102.php:133
 +#: ../reporting/rep102.php:139
 +#: ../reporting/rep103.php:232
 +#: ../reporting/rep104.php:116
- #: ../reporting/rep201.php:145
++#: ../reporting/rep201.php:120
 +#: ../reporting/rep202.php:138
 +#: ../reporting/rep203.php:101
 +#: ../reporting/rep205.php:150
 +#: ../sales/customer_credit_invoice.php:237
 +#: ../sales/customer_delivery.php:354
- #: ../sales/customer_invoice.php:470
++#: ../sales/customer_invoice.php:479
 +#: ../sales/allocations/customer_allocation_main.php:98
 +#: ../sales/allocations/customer_allocation_main.php:106
 +#: ../sales/view/view_credit.php:70
 +#: ../sales/view/view_dispatch.php:86
 +#: ../sales/view/view_invoice.php:86
 +#: ../sales/inquiry/customer_allocation_inquiry.php:151
 +#: ../sales/inquiry/customer_allocation_inquiry.php:161
 +#: ../sales/inquiry/customer_inquiry.php:76
 +#: ../sales/inquiry/customer_inquiry.php:208
 +#: ../sales/inquiry/customer_inquiry.php:221
 +#: ../sales/inquiry/sales_deliveries_view.php:189
- #: ../sales/inquiry/sales_orders_view.php.orig:294
- #: ../sales/inquiry/sales_orders_view.php.orig:308
++#: ../sales/inquiry/sales_orders_view.php:295
++#: ../sales/inquiry/sales_orders_view.php:309
  msgid "Currency"
  msgstr ""
  
@@@ -5546,10 -4693,8 +5633,10 @@@ msgstr "
  msgid "Posted"
  msgstr ""
  
 -#: gl/manage/gl_quick_entries.php:329 sales/customer_delivery.php:433
 -#: sales/customer_invoice.php:479
 +#: ../gl/manage/gl_quick_entries.php:329
 +#: ../sales/customer_delivery.php:447
- #: ../sales/customer_invoice.php:542
- #: ../sales/customer_invoice.php:545
++#: ../sales/customer_invoice.php:551
++#: ../sales/customer_invoice.php:554
  msgid "Tax Type"
  msgstr ""
  
@@@ -5775,9 -4878,7 +5862,8 @@@ msgstr "
  msgid "To"
  msgstr ""
  
 -#: gl/includes/db/gl_db_banking.inc:445
 +#: ../gl/includes/db/gl_db_banking.inc:444
 +#: ../purchasing/includes/db/invoice_db.inc:136
- #: ../purchasing/includes/db/invoice_db.inc.orig:136
  msgid "Document reentered."
  msgstr ""
  
@@@ -5806,14 -4906,10 +5892,14 @@@ msgstr "
  msgid "To the Order of:"
  msgstr ""
  
 -#: gl/includes/ui/gl_bank_ui.inc:64 inventory/purchasing_data.php:208
 -#: inventory/purchasing_data.php:212 purchasing/includes/ui/invoice_ui.inc:86
 -#: purchasing/includes/ui/invoice_ui.inc:93
 -#: purchasing/includes/ui/po_ui.inc:127 purchasing/includes/ui/po_ui.inc:132
 +#: ../gl/includes/ui/gl_bank_ui.inc:64
- #: ../inventory/purchasing_data.php.orig:210
- #: ../inventory/purchasing_data.php.orig:214
++#: ../inventory/purchasing_data.php:208
++#: ../inventory/purchasing_data.php:212
 +#: ../purchasing/includes/ui/invoice_ui.inc:95
 +#: ../purchasing/includes/ui/invoice_ui.inc:103
 +#: ../purchasing/includes/ui/invoice_ui.inc:105
- #: ../purchasing/includes/ui/po_ui.inc:133
- #: ../purchasing/includes/ui/po_ui.inc:138
++#: ../purchasing/includes/ui/po_ui.inc:137
++#: ../purchasing/includes/ui/po_ui.inc:142
  msgid "Supplier:"
  msgstr ""
  
  msgid "Customer:"
  msgstr ""
  
 -#: gl/includes/ui/gl_bank_ui.inc:71 sales/customer_payments.php:345
 -#: sales/manage/recurrent_invoices.php:172
 -#: sales/includes/ui/sales_credit_ui.inc:37
 -#: sales/includes/ui/sales_order_ui.inc:291
 +#: ../gl/includes/ui/gl_bank_ui.inc:71
- #: ../sales/customer_payments.php.orig:359
++#: ../sales/customer_payments.php:348
 +#: ../sales/manage/recurrent_invoices.php:172
 +#: ../sales/includes/ui/sales_credit_ui.inc:37
 +#: ../sales/includes/ui/sales_order_ui.inc:292
  msgid "Branch:"
  msgstr ""
  
 -#: gl/includes/ui/gl_bank_ui.inc:85 gl/includes/ui/gl_bank_ui.inc:88
 -#: sales/customer_payments.php:361
 +#: ../gl/includes/ui/gl_bank_ui.inc:85
 +#: ../gl/includes/ui/gl_bank_ui.inc:88
- #: ../sales/customer_payments.php.orig:368
++#: ../sales/customer_payments.php:364
  msgid "This customer account is on hold."
  msgstr ""
  
@@@ -5849,72 -4941,67 +5935,72 @@@ msgstr "
  msgid "Into:"
  msgstr ""
  
 -#: gl/includes/ui/gl_bank_ui.inc:187 includes/ui/simple_crud_class.inc:52
 -#: inventory/includes/item_adjustments_ui.inc:88
 -#: inventory/includes/stock_transfers_ui.inc:80
 -#: manufacturing/includes/work_order_issue_ui.inc:59
 -#: purchasing/includes/ui/invoice_ui.inc:533
 -#: purchasing/includes/ui/po_ui.inc:264
 -#: sales/includes/ui/sales_credit_ui.inc:198
 -#: sales/includes/ui/sales_order_ui.inc:209
 +#: ../gl/includes/ui/gl_bank_ui.inc:187
 +#: ../includes/ui/simple_crud_class.inc:52
 +#: ../inventory/includes/item_adjustments_ui.inc:88
 +#: ../inventory/includes/stock_transfers_ui.inc:80
 +#: ../manufacturing/includes/work_order_issue_ui.inc:59
 +#: ../purchasing/includes/ui/invoice_ui.inc:557
- #: ../purchasing/includes/ui/po_ui.inc:272
++#: ../purchasing/includes/ui/po_ui.inc:276
 +#: ../sales/includes/ui/sales_credit_ui.inc:198
 +#: ../sales/includes/ui/sales_order_ui.inc:210
  msgid "Edit document line"
  msgstr ""
  
 -#: gl/includes/ui/gl_bank_ui.inc:189 includes/ui/simple_crud_class.inc:54
 -#: inventory/includes/item_adjustments_ui.inc:90
 -#: inventory/includes/stock_transfers_ui.inc:82
 -#: manufacturing/includes/work_order_issue_ui.inc:61
 -#: purchasing/includes/ui/invoice_ui.inc:298
 -#: purchasing/includes/ui/po_ui.inc:266
 -#: sales/includes/ui/sales_credit_ui.inc:200
 -#: sales/includes/ui/sales_order_ui.inc:211
 +#: ../gl/includes/ui/gl_bank_ui.inc:189
 +#: ../includes/ui/simple_crud_class.inc:54
 +#: ../inventory/includes/item_adjustments_ui.inc:90
 +#: ../inventory/includes/stock_transfers_ui.inc:82
 +#: ../manufacturing/includes/work_order_issue_ui.inc:61
 +#: ../purchasing/includes/ui/invoice_ui.inc:320
- #: ../purchasing/includes/ui/po_ui.inc:274
++#: ../purchasing/includes/ui/po_ui.inc:278
 +#: ../sales/includes/ui/sales_credit_ui.inc:200
 +#: ../sales/includes/ui/sales_order_ui.inc:212
  msgid "Remove line from document"
  msgstr ""
  
 -#: gl/includes/ui/gl_bank_ui.inc:278 gl/includes/ui/gl_journal_ui.inc:222
 -#: includes/ui/simple_crud_class.inc:56
 -#: inventory/includes/item_adjustments_ui.inc:158
 -#: inventory/includes/stock_transfers_ui.inc:138
 -#: manufacturing/includes/work_order_issue_ui.inc:132
 -#: purchasing/includes/ui/po_ui.inc:440
 -#: sales/includes/ui/sales_credit_ui.inc:294
 -#: sales/includes/ui/sales_order_ui.inc:561
 +#: ../gl/includes/ui/gl_bank_ui.inc:278
 +#: ../gl/includes/ui/gl_journal_ui.inc:258
 +#: ../includes/ui/simple_crud_class.inc:56
 +#: ../inventory/includes/item_adjustments_ui.inc:158
 +#: ../inventory/includes/stock_transfers_ui.inc:138
 +#: ../manufacturing/includes/work_order_issue_ui.inc:132
- #: ../purchasing/includes/ui/po_ui.inc:456
++#: ../purchasing/includes/ui/po_ui.inc:460
 +#: ../sales/includes/ui/sales_credit_ui.inc:294
 +#: ../sales/includes/ui/sales_order_ui.inc:562
  msgid "Confirm changes"
  msgstr ""
  
 -#: gl/includes/ui/gl_bank_ui.inc:280 gl/includes/ui/gl_journal_ui.inc:224
 -#: includes/ui/simple_crud_class.inc:58
 -#: inventory/includes/item_adjustments_ui.inc:160
 -#: inventory/includes/stock_transfers_ui.inc:140
 -#: manufacturing/includes/work_order_issue_ui.inc:134
 -#: purchasing/includes/ui/po_ui.inc:442
 -#: sales/includes/ui/sales_credit_ui.inc:296
 -#: sales/includes/ui/sales_order_ui.inc:563
 +#: ../gl/includes/ui/gl_bank_ui.inc:280
 +#: ../gl/includes/ui/gl_journal_ui.inc:260
 +#: ../includes/ui/simple_crud_class.inc:58
 +#: ../inventory/includes/item_adjustments_ui.inc:160
 +#: ../inventory/includes/stock_transfers_ui.inc:140
 +#: ../manufacturing/includes/work_order_issue_ui.inc:134
- #: ../purchasing/includes/ui/po_ui.inc:458
++#: ../purchasing/includes/ui/po_ui.inc:462
 +#: ../sales/includes/ui/sales_credit_ui.inc:296
 +#: ../sales/includes/ui/sales_order_ui.inc:564
  msgid "Cancel changes"
  msgstr ""
  
 -#: gl/includes/ui/gl_bank_ui.inc:285 gl/includes/ui/gl_journal_ui.inc:228
 -#: inventory/includes/item_adjustments_ui.inc:166
 -#: inventory/includes/stock_transfers_ui.inc:146
 -#: manufacturing/includes/work_order_issue_ui.inc:140
 -#: purchasing/includes/ui/po_ui.inc:448
 -#: sales/includes/ui/sales_credit_ui.inc:302
 -#: sales/includes/ui/sales_order_ui.inc:569
 +#: ../gl/includes/ui/gl_bank_ui.inc:285
 +#: ../gl/includes/ui/gl_journal_ui.inc:264
 +#: ../inventory/includes/item_adjustments_ui.inc:166
 +#: ../inventory/includes/stock_transfers_ui.inc:146
 +#: ../manufacturing/includes/work_order_issue_ui.inc:140
- #: ../purchasing/includes/ui/po_ui.inc:464
++#: ../purchasing/includes/ui/po_ui.inc:468
 +#: ../sales/includes/ui/sales_credit_ui.inc:302
 +#: ../sales/includes/ui/sales_order_ui.inc:570
  msgid "Add Item"
  msgstr ""
  
 -#: gl/includes/ui/gl_bank_ui.inc:286
 -#: inventory/includes/item_adjustments_ui.inc:167
 -#: inventory/includes/stock_transfers_ui.inc:147
 -#: manufacturing/includes/work_order_issue_ui.inc:141
 -#: purchasing/includes/ui/po_ui.inc:449
 -#: sales/includes/ui/sales_credit_ui.inc:303
 -#: sales/includes/ui/sales_order_ui.inc:570
 +#: ../gl/includes/ui/gl_bank_ui.inc:286
 +#: ../inventory/includes/item_adjustments_ui.inc:167
 +#: ../inventory/includes/stock_transfers_ui.inc:147
 +#: ../manufacturing/includes/work_order_issue_ui.inc:141
- #: ../purchasing/includes/ui/po_ui.inc:465
++#: ../purchasing/includes/ui/po_ui.inc:469
 +#: ../sales/includes/ui/sales_credit_ui.inc:303
 +#: ../sales/includes/ui/sales_order_ui.inc:571
  msgid "Add new item to document"
  msgstr ""
  
@@@ -6530,7 -5596,7 +6616,11 @@@ msgstr "
  msgid "System is available for site admin only until full database upgrade"
  msgstr ""
  
- #: ../includes/current_user.inc:544
 -#: includes/current_user.inc:523
++#: ../includes/current_user.inc:163
++msgid "New password for"
++msgstr ""
++
++#: ../includes/current_user.inc:570
  msgid "Requesting data..."
  msgstr ""
  
@@@ -6559,7 -5616,7 +6649,7 @@@ msgstr "
  msgid "DATABASE ERROR :"
  msgstr ""
  
- #: ../includes/errors.inc:212
 -#: includes/errors.inc:212
++#: ../includes/errors.inc:216
  msgid ""
  "The entered information is a duplicate. Please go back and enter different "
  "values."
@@@ -6626,50 -5680,50 +6716,72 @@@ msgstr "
  msgid "The user and password combination is not valid for the system."
  msgstr ""
  
 -#: includes/session.inc:139
 +#: ../includes/session.inc:139
++#: ../includes/session.inc:154
  msgid ""
  "If you are not an authorized user, please contact your system administrator "
  "to obtain an account to enable you to use the system."
  msgstr ""
  
 -#: includes/session.inc:140
 +#: ../includes/session.inc:140
++#: ../includes/session.inc:155
  msgid "Try again"
  msgstr ""
  
- #: ../includes/session.inc:180
 -#: includes/session.inc:180
++#: ../includes/session.inc:151
++msgid "Incorrect Email"
++msgstr ""
++
++#: ../includes/session.inc:152
++msgid "The email address does not exist in the system."
++msgstr ""
++
++#: ../includes/session.inc:166
++msgid "New password sent"
++msgstr ""
++
++#: ../includes/session.inc:167
++msgid "A new password has been sent to your mailbox."
++msgstr ""
++
++#: ../includes/session.inc:169
++msgid "Login here"
++msgstr ""
++
++#: ../includes/session.inc:209
  #, php-format
  msgid ""
  "Brute force attack on account '%s' detected. Access for non-logged users "
  "temporarily blocked."
  msgstr ""
  
- #: ../includes/session.inc:211
 -#: includes/session.inc:211
++#: ../includes/session.inc:240
  msgid "Security settings have not been defined for your user account."
  msgstr ""
  
- #: ../includes/session.inc:212
 -#: includes/session.inc:212
++#: ../includes/session.inc:241
  msgid "Please contact your system administrator."
  msgstr ""
  
- #: ../includes/session.inc:213
 -#: includes/session.inc:213
++#: ../includes/session.inc:242
  msgid ""
  "Please remove $security_groups and $security_headings arrays from config.php "
  "file!"
  msgstr ""
  
- #: ../includes/session.inc:215
 -#: includes/session.inc:215
++#: ../includes/session.inc:244
  msgid ""
  "Access to application has been blocked until database upgrade is completed "
  "by system administrator."
  msgstr ""
  
- #: ../includes/session.inc:229
 -#: includes/session.inc:229
++#: ../includes/session.inc:258
  msgid ""
  "The security settings on your account do not permit you to access this "
  "function"
  msgstr ""
  
- #: ../includes/session.inc:238
 -#: includes/session.inc:238
++#: ../includes/session.inc:267
  msgid ""
  "System is blocked after source upgrade until database is updated on System/"
  "Software Upgrade page"
@@@ -6714,9 -5765,8 +6826,9 @@@ msgstr "
  msgid "Inventory Adjustment"
  msgstr ""
  
 -#: includes/sysnames.inc:32 purchasing/includes/ui/po_ui.inc:320
 -#: purchasing/view/view_po.php:30
 +#: ../includes/sysnames.inc:32
- #: ../purchasing/includes/ui/po_ui.inc:328
++#: ../purchasing/includes/ui/po_ui.inc:332
 +#: ../purchasing/view/view_po.php:30
  msgid "Purchase Order"
  msgstr ""
  
@@@ -6752,16 -5798,12 +6864,14 @@@ msgstr "
  msgid "Work Order Production"
  msgstr ""
  
 -#: includes/sysnames.inc:40 sales/inquiry/sales_orders_view.php:139
 -#: sales/inquiry/sales_orders_view.php:161
 +#: ../includes/sysnames.inc:40
 +#: ../sales/inquiry/sales_orders_view.php:151
 +#: ../sales/inquiry/sales_orders_view.php:173
- #: ../sales/inquiry/sales_orders_view.php.orig:151
- #: ../sales/inquiry/sales_orders_view.php.orig:173
  msgid "Sales Order"
  msgstr ""
  
 -#: includes/sysnames.inc:41 sales/sales_order_entry.php:640
 +#: ../includes/sysnames.inc:41
- #: ../sales/sales_order_entry.php:653
++#: ../sales/sales_order_entry.php:657
  msgid "Sales Quotation"
  msgstr ""
  
@@@ -6797,8 -5839,7 +6907,8 @@@ msgstr "
  msgid "CP"
  msgstr ""
  
 -#: includes/sysnames.inc:54 sales/customer_invoice.php:482
 +#: ../includes/sysnames.inc:54
- #: ../sales/customer_invoice.php:547
++#: ../sales/customer_invoice.php:556
  msgid "DN"
  msgstr ""
  
@@@ -6890,70 -5927,47 +7000,70 @@@ msgstr "
  msgid "Cash"
  msgstr ""
  
 -#: includes/sysnames.inc:96 reporting/rep101.php:127 reporting/rep102.php:125
 -#: reporting/rep102.php:132 reporting/rep105.php:109 reporting/rep106.php:83
 -#: reporting/rep114.php:95 reporting/rep304.php:114 reporting/rep304.php:124
 -#: reporting/reports_main.php:32 reporting/reports_main.php:36
 -#: reporting/reports_main.php:45 reporting/reports_main.php:102
 -#: reporting/reports_main.php:121 reporting/reports_main.php:237
 -#: sales/create_recurrent_invoices.php:134
 -#: sales/customer_credit_invoice.php:235 sales/customer_delivery.php:338
 -#: sales/customer_invoice.php:389
 -#: sales/allocations/customer_allocation_main.php:97
 -#: sales/allocations/customer_allocation_main.php:105
 -#: sales/manage/recurrent_invoices.php:102 sales/view/view_credit.php:47
 -#: sales/inquiry/customer_allocation_inquiry.php:150
 -#: sales/inquiry/customer_allocation_inquiry.php:160
 -#: sales/inquiry/customer_inquiry.php:223
 -#: sales/inquiry/customer_inquiry.php:237
 -#: sales/inquiry/sales_deliveries_view.php:180
 -#: sales/inquiry/sales_orders_view.php:264
 -#: sales/inquiry/sales_orders_view.php:278
 +#: ../includes/sysnames.inc:96
 +#: ../includes/sysnames.inc:195
- #: ../reporting/rep101.php:156
++#: ../reporting/rep101.php:127
 +#: ../reporting/rep102.php:125
 +#: ../reporting/rep102.php:132
 +#: ../reporting/rep105.php:109
 +#: ../reporting/rep106.php:83
 +#: ../reporting/rep114.php:95
 +#: ../reporting/rep304.php:114
 +#: ../reporting/rep304.php:124
 +#: ../reporting/reports_main.php:32
 +#: ../reporting/reports_main.php:36
 +#: ../reporting/reports_main.php:45
 +#: ../reporting/reports_main.php:102
 +#: ../reporting/reports_main.php:121
 +#: ../reporting/reports_main.php:237
 +#: ../sales/create_recurrent_invoices.php:134
 +#: ../sales/customer_credit_invoice.php:235
 +#: ../sales/customer_delivery.php:352
- #: ../sales/customer_invoice.php:446
++#: ../sales/customer_invoice.php:455
 +#: ../sales/allocations/customer_allocation_main.php:97
 +#: ../sales/allocations/customer_allocation_main.php:105
 +#: ../sales/manage/recurrent_invoices.php:102
 +#: ../sales/view/view_credit.php:47
 +#: ../sales/inquiry/customer_allocation_inquiry.php:150
 +#: ../sales/inquiry/customer_allocation_inquiry.php:160
 +#: ../sales/inquiry/customer_inquiry.php:206
 +#: ../sales/inquiry/customer_inquiry.php:220
 +#: ../sales/inquiry/sales_deliveries_view.php:180
- #: ../sales/inquiry/sales_orders_view.php.orig:286
- #: ../sales/inquiry/sales_orders_view.php.orig:300
++#: ../sales/inquiry/sales_orders_view.php:287
++#: ../sales/inquiry/sales_orders_view.php:301
  msgid "Customer"
  msgstr ""
  
 -#: includes/sysnames.inc:97 includes/sysnames.inc:172
 -#: inventory/purchasing_data.php:147 purchasing/includes/ui/grn_ui.inc:20
 -#: purchasing/includes/ui/grn_ui.inc:52 purchasing/includes/ui/po_ui.inc:313
 -#: purchasing/view/view_supp_credit.php:42
 -#: purchasing/view/view_supp_invoice.php:45
 -#: purchasing/inquiry/po_search_completed.php:123
 -#: purchasing/inquiry/po_search.php:132
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:129
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:142
 -#: purchasing/inquiry/supplier_inquiry.php:171
 -#: purchasing/inquiry/supplier_inquiry.php:185
 -#: purchasing/allocations/supplier_allocation_main.php:98
 -#: purchasing/allocations/supplier_allocation_main.php:106
 -#: reporting/rep201.php:119 reporting/rep202.php:130 reporting/rep202.php:137
 -#: reporting/rep203.php:100 reporting/rep204.php:90 reporting/rep306.php:141
 -#: reporting/rep306.php:151 reporting/reports_main.php:149
 -#: reporting/reports_main.php:153 reporting/reports_main.php:162
 -#: reporting/reports_main.php:173 reporting/reports_main.php:180
 -#: reporting/reports_main.php:252
 +#: ../includes/sysnames.inc:97
 +#: ../includes/sysnames.inc:173
 +#: ../includes/sysnames.inc:196
- #: ../inventory/purchasing_data.php.orig:149
++#: ../inventory/purchasing_data.php:148
 +#: ../purchasing/includes/ui/grn_ui.inc:20
 +#: ../purchasing/includes/ui/grn_ui.inc:52
- #: ../purchasing/includes/ui/po_ui.inc:321
++#: ../purchasing/includes/ui/po_ui.inc:325
 +#: ../purchasing/view/view_supp_credit.php:42
 +#: ../purchasing/view/view_supp_invoice.php:46
 +#: ../purchasing/inquiry/po_search_completed.php:122
 +#: ../purchasing/inquiry/po_search.php:132
 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:129
 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:142
 +#: ../purchasing/inquiry/supplier_inquiry.php:176
 +#: ../purchasing/inquiry/supplier_inquiry.php:191
 +#: ../purchasing/allocations/supplier_allocation_main.php:98
 +#: ../purchasing/allocations/supplier_allocation_main.php:106
- #: ../reporting/rep201.php:144
++#: ../reporting/rep201.php:119
 +#: ../reporting/rep202.php:130
 +#: ../reporting/rep202.php:137
 +#: ../reporting/rep203.php:100
 +#: ../reporting/rep204.php:90
 +#: ../reporting/rep306.php:141
 +#: ../reporting/rep306.php:151
 +#: ../reporting/reports_main.php:149
 +#: ../reporting/reports_main.php:153
 +#: ../reporting/reports_main.php:162
 +#: ../reporting/reports_main.php:173
 +#: ../reporting/reports_main.php:180
 +#: ../reporting/reports_main.php:252
  msgid "Supplier"
  msgstr ""
  
@@@ -7381,46 -6369,37 +7491,66 @@@ msgstr "
  msgid "Value"
  msgstr ""
  
 -#: includes/system_tests.inc:420 reporting/reports_main.php:40
 -#: reporting/reports_main.php:51 reporting/reports_main.php:60
 -#: reporting/reports_main.php:67 reporting/reports_main.php:76
 -#: reporting/reports_main.php:85 reporting/reports_main.php:92
 -#: reporting/reports_main.php:101 reporting/reports_main.php:111
 -#: reporting/reports_main.php:118 reporting/reports_main.php:125
 -#: reporting/reports_main.php:133 reporting/reports_main.php:140
 -#: reporting/reports_main.php:146 reporting/reports_main.php:157
 -#: reporting/reports_main.php:168 reporting/reports_main.php:176
 -#: reporting/reports_main.php:181 reporting/reports_main.php:188
 -#: reporting/reports_main.php:196 reporting/reports_main.php:203
 -#: reporting/reports_main.php:212 reporting/reports_main.php:218
 -#: reporting/reports_main.php:229 reporting/reports_main.php:238
 -#: reporting/reports_main.php:244 reporting/reports_main.php:254
 -#: reporting/reports_main.php:262 reporting/reports_main.php:270
 -#: reporting/reports_main.php:277 reporting/reports_main.php:285
 -#: reporting/reports_main.php:292 reporting/reports_main.php:301
 -#: reporting/reports_main.php:314 reporting/reports_main.php:321
 -#: reporting/reports_main.php:328 reporting/reports_main.php:343
 -#: reporting/reports_main.php:351 reporting/reports_main.php:362
 -#: reporting/reports_main.php:374 reporting/reports_main.php:384
 -#: reporting/reports_main.php:396 reporting/reports_main.php:403
 -#: reporting/reports_main.php:413 reporting/reports_main.php:424
 -#: reporting/reports_main.php:433 reporting/reports_main.php:444
 -#: reporting/reports_main.php:450 reporting/reports_main.php:459
 -#: reporting/reports_main.php:469 reporting/reports_main.php:477
 -#: reporting/reports_main.php:485 reporting/reports_main.php:493
 -#: reporting/includes/excel_report.inc:295
 -#: reporting/includes/excel_report.inc:428
 -#: reporting/includes/pdf_report.inc:346 reporting/includes/pdf_report.inc:619
 -#: sales/view/view_sales_order.php:85
 +#: ../includes/system_tests.inc:420
 +#: ../reporting/reports_main.php:40
 +#: ../reporting/reports_main.php:51
 +#: ../reporting/reports_main.php:60
 +#: ../reporting/reports_main.php:67
 +#: ../reporting/reports_main.php:76
 +#: ../reporting/reports_main.php:85
 +#: ../reporting/reports_main.php:92
 +#: ../reporting/reports_main.php:101
 +#: ../reporting/reports_main.php:111
 +#: ../reporting/reports_main.php:118
 +#: ../reporting/reports_main.php:125
 +#: ../reporting/reports_main.php:133
 +#: ../reporting/reports_main.php:140
 +#: ../reporting/reports_main.php:146
 +#: ../reporting/reports_main.php:157
 +#: ../reporting/reports_main.php:168
 +#: ../reporting/reports_main.php:176
 +#: ../reporting/reports_main.php:181
 +#: ../reporting/reports_main.php:188
 +#: ../reporting/reports_main.php:196
 +#: ../reporting/reports_main.php:203
 +#: ../reporting/reports_main.php:212
 +#: ../reporting/reports_main.php:218
 +#: ../reporting/reports_main.php:229
 +#: ../reporting/reports_main.php:238
 +#: ../reporting/reports_main.php:244
 +#: ../reporting/reports_main.php:254
 +#: ../reporting/reports_main.php:262
 +#: ../reporting/reports_main.php:270
 +#: ../reporting/reports_main.php:277
 +#: ../reporting/reports_main.php:285
 +#: ../reporting/reports_main.php:292
 +#: ../reporting/reports_main.php:301
 +#: ../reporting/reports_main.php:314
++#: ../reporting/reports_main.php:321
++#: ../reporting/reports_main.php:327
++#: ../reporting/reports_main.php:334
++#: ../reporting/reports_main.php:349
++#: ../reporting/reports_main.php:357
++#: ../reporting/reports_main.php:368
++#: ../reporting/reports_main.php:380
++#: ../reporting/reports_main.php:390
++#: ../reporting/reports_main.php:402
++#: ../reporting/reports_main.php:409
++#: ../reporting/reports_main.php:419
++#: ../reporting/reports_main.php:430
++#: ../reporting/reports_main.php:439
++#: ../reporting/reports_main.php:450
++#: ../reporting/reports_main.php:456
++#: ../reporting/reports_main.php:465
++#: ../reporting/reports_main.php:475
++#: ../reporting/reports_main.php:483
++#: ../reporting/reports_main.php:491
++#: ../reporting/reports_main.php:499
 +#: ../reporting/includes/excel_report.inc:295
 +#: ../reporting/includes/excel_report.inc:428
 +#: ../reporting/includes/pdf_report.inc:346
- #: ../reporting/includes/pdf_report.inc:619
++#: ../reporting/includes/pdf_report.inc:618
 +#: ../sales/view/view_sales_order.php:98
  msgid "Comments"
  msgstr ""
  
@@@ -7444,75 -6423,65 +7574,74 @@@ msgstr "
  msgid "Zero/negative inventory handling"
  msgstr ""
  
- #: ../includes/ui/allocation_cart.inc:287
 -#: includes/ui/allocation_cart.inc:286 includes/ui/mk.allocation_cart.inc:286
++#: ../includes/ui/allocation_cart.inc:288
  #, php-format
  msgid "Allocated amounts in %s:"
  msgstr ""
  
- #: ../includes/ui/allocation_cart.inc:289
 -#: includes/ui/allocation_cart.inc:288 includes/ui/mk.allocation_cart.inc:288
 -#: purchasing/allocations/supplier_allocation_main.php:94
 -#: sales/allocations/customer_allocation_main.php:93
++#: ../includes/ui/allocation_cart.inc:290
 +#: ../purchasing/allocations/supplier_allocation_main.php:94
 +#: ../sales/allocations/customer_allocation_main.php:93
  msgid "Transaction Type"
  msgstr ""
  
- #: ../includes/ui/allocation_cart.inc:289
 -#: includes/ui/allocation_cart.inc:288 includes/ui/mk.allocation_cart.inc:288
++#: ../includes/ui/allocation_cart.inc:290
  msgid "Supplier Ref"
  msgstr ""
  
- #: ../includes/ui/allocation_cart.inc:289
 -#: includes/ui/allocation_cart.inc:288 includes/ui/mk.allocation_cart.inc:288
 -#: reporting/rep704.php:83 reporting/rep704.php:86 reporting/rep704.php:89
 -#: reporting/rep709.php:111 sales/view/view_credit.php:68
 -#: sales/view/view_sales_order.php:96 sales/view/view_sales_order.php:129
 -#: sales/view/view_sales_order.php:161 sales/inquiry/sales_orders_view.php:226
 -#: sales/inquiry/sales_orders_view.php:263
 -#: sales/inquiry/sales_orders_view.php:277
++#: ../includes/ui/allocation_cart.inc:290
 +#: ../reporting/rep704.php:83
 +#: ../reporting/rep704.php:86
 +#: ../reporting/rep704.php:89
 +#: ../reporting/rep709.php:111
 +#: ../sales/view/view_credit.php:68
 +#: ../sales/view/view_sales_order.php:109
 +#: ../sales/view/view_sales_order.php:142
 +#: ../sales/view/view_sales_order.php:179
 +#: ../sales/inquiry/sales_orders_view.php:248
- #: ../sales/inquiry/sales_orders_view.php.orig:248
- #: ../sales/inquiry/sales_orders_view.php.orig:285
- #: ../sales/inquiry/sales_orders_view.php.orig:299
++#: ../sales/inquiry/sales_orders_view.php:286
++#: ../sales/inquiry/sales_orders_view.php:300
  msgid "Ref"
  msgstr ""
  
- #: ../includes/ui/allocation_cart.inc:290
 -#: includes/ui/allocation_cart.inc:289 includes/ui/mk.allocation_cart.inc:289
++#: ../includes/ui/allocation_cart.inc:291
  msgid "Other Allocations"
  msgstr ""
  
- #: ../includes/ui/allocation_cart.inc:290
- #: ../includes/ui/allocation_cart.inc:343
 -#: includes/ui/allocation_cart.inc:289 includes/ui/allocation_cart.inc:342
 -#: includes/ui/mk.allocation_cart.inc:289
 -#: includes/ui/mk.allocation_cart.inc:343 includes/ui/ui_view.inc:548
 -#: purchasing/allocations/supplier_allocation_main.php:101
 -#: reporting/rep112.php:157 reporting/rep210.php:164
 -#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186
 -#: sales/allocations/customer_allocation_main.php:100
++#: ../includes/ui/allocation_cart.inc:291
++#: ../includes/ui/allocation_cart.inc:344
 +#: ../includes/ui/ui_view.inc:548
 +#: ../purchasing/allocations/supplier_allocation_main.php:101
 +#: ../reporting/rep112.php:145
 +#: ../reporting/rep210.php:152
 +#: ../reporting/includes/doctext.inc:167
 +#: ../reporting/includes/doctext.inc:208
 +#: ../sales/allocations/customer_allocation_main.php:100
  msgid "Left to Allocate"
  msgstr ""
  
- #: ../includes/ui/allocation_cart.inc:290
 -#: includes/ui/allocation_cart.inc:289 includes/ui/mk.allocation_cart.inc:289
 -#: includes/ui/ui_view.inc:548 reporting/includes/doctext.inc:145
 -#: reporting/includes/doctext.inc:186
++#: ../includes/ui/allocation_cart.inc:291
 +#: ../includes/ui/ui_view.inc:548
 +#: ../reporting/includes/doctext.inc:167
 +#: ../reporting/includes/doctext.inc:208
  msgid "This Allocation"
  msgstr ""
  
- #: ../includes/ui/allocation_cart.inc:323
 -#: includes/ui/allocation_cart.inc:322 includes/ui/mk.allocation_cart.inc:322
 -#: reporting/rep112.php:154 reporting/rep210.php:161
++#: ../includes/ui/allocation_cart.inc:324
 +#: ../reporting/rep112.php:142
 +#: ../reporting/rep210.php:149
  msgid "Total Allocated"
  msgstr ""
  
- #: ../includes/ui/allocation_cart.inc:365
 -#: includes/ui/allocation_cart.inc:363 includes/ui/mk.allocation_cart.inc:364
++#: ../includes/ui/allocation_cart.inc:366
  msgid "The entry for one or more amounts is invalid or negative."
  msgstr ""
  
- #: ../includes/ui/allocation_cart.inc:376
 -#: includes/ui/allocation_cart.inc:374 includes/ui/mk.allocation_cart.inc:375
++#: ../includes/ui/allocation_cart.inc:377
  msgid "At least one transaction is overallocated."
  msgstr ""
  
- #: ../includes/ui/allocation_cart.inc:395
 -#: includes/ui/allocation_cart.inc:393 includes/ui/mk.allocation_cart.inc:395
++#: ../includes/ui/allocation_cart.inc:396
  msgid ""
  "These allocations cannot be processed because the amount allocated is more "
  "than the total amount left to allocate."
@@@ -7554,23 -6521,18 +7683,23 @@@ msgstr "
  msgid "Contact active for:"
  msgstr ""
  
 -#: includes/ui/contacts_view.inc:102 sales/manage/customers.php:255
 +#: ../includes/ui/contacts_view.inc:102
- #: ../sales/manage/customers.php:255
++#: ../sales/manage/customers.php:256
  msgid "Phone:"
  msgstr ""
  
 -#: includes/ui/contacts_view.inc:105 inventory/manage/locations.php:207
 -#: purchasing/manage/suppliers.php:160 sales/manage/customer_branches.php:263
 -#: sales/manage/customers.php:258 sales/manage/sales_people.php:158
 +#: ../includes/ui/contacts_view.inc:105
 +#: ../inventory/manage/locations.php:207
- #: ../purchasing/manage/suppliers.php:139
++#: ../purchasing/manage/suppliers.php:141
 +#: ../sales/manage/customer_branches.php:265
- #: ../sales/manage/customers.php:258
++#: ../sales/manage/customers.php:259
 +#: ../sales/manage/sales_people.php:158
  msgid "E-mail:"
  msgstr ""
  
 -#: includes/ui/contacts_view.inc:110 purchasing/manage/suppliers.php:161
 -#: sales/manage/customer_branches.php:264
 +#: ../includes/ui/contacts_view.inc:110
- #: ../purchasing/manage/suppliers.php:140
++#: ../purchasing/manage/suppliers.php:142
 +#: ../sales/manage/customer_branches.php:266
  msgid "Document Language:"
  msgstr ""
  
@@@ -7670,11 -6625,7 +7799,7 @@@ msgstr "
  msgid "to continue"
  msgstr ""
  
- #: ../includes/ui/ui_controls.inc:194
- msgid "View Attachment"
- msgstr ""
 -#: includes/ui/ui_controls.inc:190
 +#: ../includes/ui/ui_controls.inc:197
  msgid "Close"
  msgstr ""
  
@@@ -7708,14 -6654,10 +7833,16 @@@ msgstr "
  msgid "Click Here to Pick up the date"
  msgstr ""
  
 -#: includes/ui/ui_input.inc:915 includes/ui/ui_lists.inc:2156
 -#: reporting/rep301.php:155 reporting/rep302.php:170 reporting/rep303.php:184
 -#: reporting/rep304.php:170 reporting/rep304.php:174 reporting/rep306.php:235
 -#: reporting/rep306.php:242 sales/manage/customer_branches.php:302
 +#: ../includes/ui/ui_input.inc:916
 +#: ../includes/ui/ui_lists.inc:2160
 +#: ../reporting/rep301.php:155
 +#: ../reporting/rep302.php:170
 +#: ../reporting/rep303.php:184
 +#: ../reporting/rep304.php:170
 +#: ../reporting/rep304.php:174
++#: ../reporting/rep306.php:235
++#: ../reporting/rep306.php:242
 +#: ../sales/manage/customer_branches.php:304
  msgid "Inactive"
  msgstr ""
  
@@@ -7909,24 -6837,16 +8036,26 @@@ msgstr "
  msgid "Date Voided:"
  msgstr ""
  
 -#: includes/ui/ui_view.inc:443 reporting/rep107.php:175
 -#: reporting/rep109.php:180 reporting/rep110.php:184 reporting/rep111.php:165
 -#: reporting/rep113.php:169 reporting/rep209.php:183
 +#: ../includes/ui/ui_view.inc:443
++#: ../reporting/rep107.php:256
 +#: ../reporting/rep109.php:186
 +#: ../reporting/rep110.php:184
 +#: ../reporting/rep111.php:165
 +#: ../reporting/rep113.php:169
 +#: ../reporting/rep209.php:186
  msgid "Total Tax Excluded"
  msgstr ""
  
 -#: includes/ui/ui_view.inc:449 includes/ui/ui_view.inc:468
 -#: includes/ui/ui_view.inc:492 includes/ui/ui_view.inc:509
 -#: reporting/rep107.php:184 reporting/rep109.php:189 reporting/rep110.php:193
 -#: reporting/rep111.php:174 reporting/rep113.php:178 reporting/rep209.php:192
 +#: ../includes/ui/ui_view.inc:449
 +#: ../includes/ui/ui_view.inc:468
 +#: ../includes/ui/ui_view.inc:492
 +#: ../includes/ui/ui_view.inc:509
++#: ../reporting/rep107.php:265
 +#: ../reporting/rep109.php:195
 +#: ../reporting/rep110.php:193
 +#: ../reporting/rep111.php:174
 +#: ../reporting/rep113.php:178
 +#: ../reporting/rep209.php:195
  msgid "Included"
  msgstr ""
  
@@@ -8135,9 -7046,8 +8264,9 @@@ msgstr "
  msgid "Enter &Another Adjustment"
  msgstr ""
  
 -#: inventory/adjustments.php:88 inventory/transfers.php:85
 -#: sales/sales_order_entry.php:363
 +#: ../inventory/adjustments.php:88
 +#: ../inventory/transfers.php:85
- #: ../sales/sales_order_entry.php:370
++#: ../sales/sales_order_entry.php:373
  msgid "You must enter at least one non empty item line."
  msgstr ""
  
@@@ -8169,321 -7077,256 +8298,299 @@@ msgstr "
  msgid "Process Adjustment"
  msgstr ""
  
- #: ../inventory/cost_update.php:31
- #: ../inventory/cost_update.php.orig:31
 -#: inventory/cost_update.php:31
++#: ../inventory/cost_update.php:29
  msgid "Inventory Item Cost Update"
  msgstr ""
  
- #: ../inventory/cost_update.php:36
- #: ../inventory/cost_update.php.orig:36
 -#: inventory/cost_update.php:36
++#: ../inventory/cost_update.php:33
  msgid ""
  "There are no costable inventory items defined in the system (Purchased or "
  "manufactured items)."
  msgstr ""
  
- #: ../inventory/cost_update.php:57
- #: ../inventory/cost_update.php.orig:57
 -#: inventory/cost_update.php:57
++#: ../inventory/cost_update.php:54
  msgid "The entered cost is not numeric."
  msgstr ""
  
- #: ../inventory/cost_update.php:63
- #: ../inventory/cost_update.php.orig:63
 -#: inventory/cost_update.php:63
++#: ../inventory/cost_update.php:60
  msgid "The new cost is the same as the old cost. Cost was not updated."
  msgstr ""
  
- #: ../inventory/cost_update.php:73
- #: ../inventory/cost_update.php.orig:73
 -#: inventory/cost_update.php:73
++#: ../inventory/cost_update.php:70
  msgid "Cost has been updated."
  msgstr ""
  
- #: ../inventory/cost_update.php:77
- #: ../inventory/cost_update.php.orig:77
 -#: inventory/cost_update.php:77
++#: ../inventory/cost_update.php:74
  msgid "View the GL Journal Entries for this Cost Update"
  msgstr ""
  
- #: ../inventory/cost_update.php.orig:97
- #: ../inventory/prices.php.orig:64
- #: ../inventory/purchasing_data.php.orig:119
- #: ../inventory/reorder_level.php.orig:51
 -#: inventory/cost_update.php:95 inventory/prices.php:61
 -#: inventory/purchasing_data.php:117 inventory/reorder_level.php:48
 -#: inventory/inquiry/stock_movements.php:53
 -#: inventory/inquiry/stock_status.php:47 inventory/manage/item_codes.php:105
 -#: manufacturing/work_order_entry.php:396
 -#: manufacturing/work_order_entry.php:401 purchasing/inquiry/po_search.php:74
 -#: sales/inquiry/sales_deliveries_view.php:114
 -#: sales/inquiry/sales_orders_view.php:241
++#: ../inventory/cost_update.php:94
++#: ../inventory/prices.php:62
++#: ../inventory/purchasing_data.php:118
++#: ../inventory/reorder_level.php:50
 +#: ../inventory/inquiry/stock_movements.php:49
 +#: ../inventory/inquiry/stock_status.php:41
 +#: ../inventory/manage/item_codes.php:105
 +#: ../manufacturing/work_order_entry.php:396
 +#: ../manufacturing/work_order_entry.php:401
 +#: ../purchasing/inquiry/po_search.php:74
 +#: ../sales/inquiry/sales_deliveries_view.php:114
 +#: ../sales/inquiry/sales_orders_view.php:263
- #: ../sales/inquiry/sales_orders_view.php.orig:263
  msgid "Item:"
  msgstr ""
  
- #: ../inventory/cost_update.php.orig:118
 -#: inventory/cost_update.php:116
++#: ../inventory/cost_update.php:115
  msgid "Standard Material Cost Per Unit"
  msgstr ""
  
- #: ../inventory/cost_update.php.orig:127
 -#: inventory/cost_update.php:125
++#: ../inventory/cost_update.php:123
  msgid "Standard Labour Cost Per Unit"
  msgstr ""
  
- #: ../inventory/cost_update.php.orig:128
 -#: inventory/cost_update.php:126
++#: ../inventory/cost_update.php:124
  msgid "Standard Overhead Cost Per Unit"
  msgstr ""
  
- #: ../inventory/prices.php:26
- #: ../inventory/prices.php.orig:26
 -#: inventory/prices.php:26
++#: ../inventory/prices.php:25
  msgid "Inventory Item Sales prices"
  msgstr ""
  
- #: ../inventory/prices.php:30
- #: ../inventory/prices.php.orig:30
 -#: inventory/prices.php:30 inventory/inquiry/stock_movements.php:32
 -#: inventory/inquiry/stock_status.php:37 inventory/manage/sales_kits.php:24
 -#: manufacturing/inquiry/where_used_inquiry.php:21
 -#: sales/credit_note_entry.php:49
++#: ../inventory/prices.php:29
 +#: ../inventory/inquiry/stock_movements.php:29
 +#: ../inventory/inquiry/stock_status.php:32
 +#: ../inventory/manage/sales_kits.php:24
 +#: ../manufacturing/inquiry/where_used_inquiry.php:21
 +#: ../sales/credit_note_entry.php:49
  msgid "There are no items defined in the system."
  msgstr ""
  
- #: ../inventory/prices.php:32
- #: ../inventory/prices.php.orig:32
 -#: inventory/prices.php:32
++#: ../inventory/prices.php:31
  msgid ""
  "There are no sales types in the system. Please set up sales types befor "
  "entering pricing."
  msgstr ""
  
- #: ../inventory/prices.php.orig:80
 -#: inventory/prices.php:77
++#: ../inventory/prices.php:78
  msgid "The price entered must be numeric."
  msgstr ""
  
- #: ../inventory/prices.php.orig:86
 -#: inventory/prices.php:83
++#: ../inventory/prices.php:84
  msgid ""
  "The sales pricing for this item, sales type and currency has already been "
  "added."
  msgstr ""
  
- #: ../inventory/prices.php.orig:99
 -#: inventory/prices.php:96
++#: ../inventory/prices.php:97
  msgid "This price has been updated."
  msgstr ""
  
- #: ../inventory/prices.php.orig:107
 -#: inventory/prices.php:104
++#: ../inventory/prices.php:105
  msgid "The new price has been added."
  msgstr ""
  
- #: ../inventory/prices.php.orig:121
 -#: inventory/prices.php:118
++#: ../inventory/prices.php:119
  msgid "The selected price has been deleted."
  msgstr ""
  
- #: ../inventory/prices.php.orig:149
 -#: inventory/prices.php:146 reporting/rep104.php:118
 -#: sales/customer_delivery.php:355 sales/customer_invoice.php:411
 -#: 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
++#: ../inventory/prices.php:147
 +#: ../reporting/rep104.php:118
 +#: ../sales/customer_delivery.php:369
- #: ../sales/customer_invoice.php:468
++#: ../sales/customer_invoice.php:477
 +#: ../sales/view/view_credit.php:73
 +#: ../sales/view/view_dispatch.php:93
 +#: ../sales/view/view_invoice.php:93
 +#: ../sales/includes/ui/sales_credit_ui.inc:102
  msgid "Sales Type"
  msgstr ""
  
- #: ../inventory/prices.php.orig:149
- #: ../inventory/purchasing_data.php.orig:149
 -#: inventory/prices.php:146 inventory/purchasing_data.php:147
 -#: purchasing/includes/ui/invoice_ui.inc:497
 -#: purchasing/po_receive_items.php:63 purchasing/view/view_grn.php:41
 -#: purchasing/view/view_po.php:45 reporting/rep104.php:111
 -#: reporting/includes/doctext.inc:30 reporting/includes/doctext.inc:170
 -#: sales/customer_credit_invoice.php:281 sales/customer_delivery.php:433
 -#: sales/customer_invoice.php:479 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
++#: ../inventory/prices.php:147
++#: ../inventory/purchasing_data.php:148
 +#: ../purchasing/includes/ui/invoice_ui.inc:520
 +#: ../purchasing/po_receive_items.php:63
 +#: ../purchasing/view/view_grn.php:41
 +#: ../purchasing/view/view_po.php:45
 +#: ../reporting/rep104.php:111
 +#: ../reporting/includes/doctext.inc:30
 +#: ../reporting/includes/doctext.inc:192
 +#: ../sales/customer_credit_invoice.php:281
 +#: ../sales/customer_delivery.php:447
- #: ../sales/customer_invoice.php:542
- #: ../sales/customer_invoice.php:545
++#: ../sales/customer_invoice.php:551
++#: ../sales/customer_invoice.php:554
 +#: ../sales/view/view_credit.php:91
 +#: ../sales/view/view_dispatch.php:113
 +#: ../sales/view/view_invoice.php:116
 +#: ../sales/view/view_sales_order.php:220
 +#: ../sales/includes/ui/sales_credit_ui.inc:168
  msgid "Price"
  msgstr ""
  
- #: ../inventory/prices.php.orig:171
 -#: inventory/prices.php:168
++#: ../inventory/prices.php:169
  msgid "There are no prices set up for this part."
  msgstr ""
  
- #: ../inventory/prices.php.orig:195
 -#: inventory/prices.php:192
++#: ../inventory/prices.php:192
  msgid "Currency:"
  msgstr ""
  
- #: ../inventory/prices.php.orig:197
 -#: inventory/prices.php:194
++#: ../inventory/prices.php:194
  msgid "Sales Type:"
  msgstr ""
  
- #: ../inventory/prices.php.orig:205
- #: ../inventory/purchasing_data.php.orig:217
 -#: inventory/prices.php:202 inventory/purchasing_data.php:215
++#: ../inventory/prices.php:202
++#: ../inventory/purchasing_data.php:215
  msgid "Price:"
  msgstr ""
  
- #: ../inventory/prices.php.orig:205
 -#: inventory/prices.php:202
++#: ../inventory/prices.php:202
  msgid "per"
  msgstr ""
  
- #: ../inventory/prices.php.orig:209
 -#: inventory/prices.php:206
++#: ../inventory/prices.php:206
  msgid "The price is calculated."
  msgstr ""
  
- #: ../inventory/purchasing_data.php:25
- #: ../inventory/purchasing_data.php.orig:25
 -#: inventory/purchasing_data.php:25
++#: ../inventory/purchasing_data.php:24
  msgid "Supplier Purchasing Data"
  msgstr ""
  
- #: ../inventory/purchasing_data.php:27
- #: ../inventory/purchasing_data.php.orig:27
 -#: inventory/purchasing_data.php:27 purchasing/po_entry_items.php:67
++#: ../inventory/purchasing_data.php:26
 +#: ../purchasing/po_entry_items.php:70
  msgid "There are no purchasable inventory items defined in the system."
  msgstr ""
  
- #: ../inventory/purchasing_data.php:28
- #: ../inventory/purchasing_data.php.orig:28
 -#: inventory/purchasing_data.php:28 purchasing/po_entry_items.php:65
 -#: purchasing/supplier_credit.php:32 purchasing/supplier_invoice.php:32
 -#: purchasing/supplier_payment.php:40
++#: ../inventory/purchasing_data.php:27
 +#: ../purchasing/po_entry_items.php:68
 +#: ../purchasing/supplier_credit.php:31
 +#: ../purchasing/supplier_invoice.php:30
 +#: ../purchasing/supplier_payment.php:40
- #: ../purchasing/supplier_payment.php.orig:40
  msgid "There are no suppliers defined in the system."
  msgstr ""
  
- #: ../inventory/purchasing_data.php:46
- #: ../inventory/purchasing_data.php.orig:46
 -#: inventory/purchasing_data.php:46 inventory/manage/item_codes.php:35
++#: ../inventory/purchasing_data.php:45
 +#: ../inventory/manage/item_codes.php:35
  msgid "There is no item selected."
  msgstr ""
  
- #: ../inventory/purchasing_data.php:52
- #: ../inventory/purchasing_data.php.orig:52
 -#: inventory/purchasing_data.php:52
++#: ../inventory/purchasing_data.php:51
  msgid "The price entered was not numeric."
  msgstr ""
  
- #: ../inventory/purchasing_data.php:58
- #: ../inventory/purchasing_data.php.orig:58
 -#: inventory/purchasing_data.php:58
++#: ../inventory/purchasing_data.php:57
  msgid ""
  "The conversion factor entered was not numeric. The conversion factor is the "
  "number by which the price must be divided by to get the unit price in our "
  "unit of measure."
  msgstr ""
  
- #: ../inventory/purchasing_data.php:64
- #: ../inventory/purchasing_data.php.orig:64
 -#: inventory/purchasing_data.php:64
++#: ../inventory/purchasing_data.php:63
  msgid "The purchasing data for this supplier has already been added."
  msgstr ""
  
- #: ../inventory/purchasing_data.php:73
- #: ../inventory/purchasing_data.php.orig:73
 -#: inventory/purchasing_data.php:73
++#: ../inventory/purchasing_data.php:72
  msgid "This supplier purchasing data has been added."
  msgstr ""
  
- #: ../inventory/purchasing_data.php:79
- #: ../inventory/purchasing_data.php.orig:79
 -#: inventory/purchasing_data.php:79
++#: ../inventory/purchasing_data.php:78
  msgid "Supplier purchasing data has been updated."
  msgstr ""
  
- #: ../inventory/purchasing_data.php:90
- #: ../inventory/purchasing_data.php.orig:90
 -#: inventory/purchasing_data.php:90
++#: ../inventory/purchasing_data.php:89
  msgid "The purchasing data item has been sucessfully deleted."
  msgstr ""
  
- #: ../inventory/purchasing_data.php.orig:134
 -#: inventory/purchasing_data.php:132
++#: ../inventory/purchasing_data.php:133
  msgid "Entered item is not defined. Please re-enter."
  msgstr ""
  
- #: ../inventory/purchasing_data.php.orig:143
 -#: inventory/purchasing_data.php:141
++#: ../inventory/purchasing_data.php:142
  msgid "There is no purchasing data set up for the part selected"
  msgstr ""
  
- #: ../inventory/purchasing_data.php.orig:150
 -#: inventory/purchasing_data.php:148
++#: ../inventory/purchasing_data.php:149
  msgid "Supplier's Unit"
  msgstr ""
  
- #: ../inventory/purchasing_data.php.orig:150
 -#: inventory/purchasing_data.php:148
++#: ../inventory/purchasing_data.php:149
  msgid "Conversion Factor"
  msgstr ""
  
- #: ../inventory/purchasing_data.php.orig:150
 -#: inventory/purchasing_data.php:148
++#: ../inventory/purchasing_data.php:149
  msgid "Supplier's Description"
  msgstr ""
  
- #: ../inventory/purchasing_data.php.orig:218
 -#: inventory/purchasing_data.php:216
++#: ../inventory/purchasing_data.php:216
  msgid "Suppliers Unit of Measure:"
  msgstr ""
  
- #: ../inventory/purchasing_data.php.orig:224
 -#: inventory/purchasing_data.php:222
++#: ../inventory/purchasing_data.php:222
  msgid "Conversion Factor (to our UOM):"
  msgstr ""
  
- #: ../inventory/purchasing_data.php.orig:226
 -#: inventory/purchasing_data.php:224
++#: ../inventory/purchasing_data.php:224
  msgid "Supplier's Code or Description:"
  msgstr ""
  
- #: ../inventory/reorder_level.php:25
- #: ../inventory/reorder_level.php.orig:25
 -#: inventory/reorder_level.php:25
++#: ../inventory/reorder_level.php:24
  msgid "Reorder Levels"
  msgstr ""
  
- #: ../inventory/reorder_level.php:27
- #: ../inventory/reorder_level.php.orig:27
 -#: inventory/reorder_level.php:27 inventory/transfers.php:32
++#: ../inventory/reorder_level.php:26
 +#: ../inventory/transfers.php:32
  msgid ""
  "There are no inventory items defined in the system (Purchased or "
  "manufactured items)."
  msgstr ""
  
- #: ../inventory/reorder_level.php.orig:68
 -#: inventory/reorder_level.php:65 inventory/inquiry/stock_movements.php:83
 -#: inventory/inquiry/stock_status.php:72 inventory/inquiry/stock_status.php:76
 -#: manufacturing/search_work_orders.php:162
 -#: manufacturing/inquiry/where_used_inquiry.php:45
 -#: manufacturing/manage/bom_edit.php:70
 -#: purchasing/inquiry/po_search_completed.php:124
 -#: purchasing/inquiry/po_search_completed.php:134
 -#: purchasing/inquiry/po_search.php:133 purchasing/inquiry/po_search.php:144
 -#: reporting/rep105.php:120 reporting/rep301.php:112 reporting/rep302.php:132
 -#: reporting/rep303.php:134 reporting/rep304.php:123 reporting/rep306.php:150
 -#: reporting/rep307.php:124 reporting/rep308.php:157
 -#: reporting/reports_main.php:210 reporting/reports_main.php:217
 -#: reporting/reports_main.php:223 reporting/reports_main.php:236
 -#: reporting/reports_main.php:251 reporting/reports_main.php:261
 -#: reporting/reports_main.php:269 sales/manage/sales_points.php:84
++#: ../inventory/reorder_level.php:67
 +#: ../inventory/inquiry/stock_movements.php:79
 +#: ../inventory/inquiry/stock_status.php:66
 +#: ../inventory/inquiry/stock_status.php:70
 +#: ../manufacturing/search_work_orders.php:162
 +#: ../manufacturing/inquiry/where_used_inquiry.php:45
 +#: ../manufacturing/manage/bom_edit.php:70
 +#: ../purchasing/inquiry/po_search_completed.php:123
 +#: ../purchasing/inquiry/po_search_completed.php:133
 +#: ../purchasing/inquiry/po_search.php:133
 +#: ../purchasing/inquiry/po_search.php:144
 +#: ../reporting/rep105.php:120
 +#: ../reporting/rep301.php:112
 +#: ../reporting/rep302.php:132
 +#: ../reporting/rep303.php:134
 +#: ../reporting/rep304.php:123
 +#: ../reporting/rep306.php:150
 +#: ../reporting/rep307.php:124
 +#: ../reporting/rep308.php:157
 +#: ../reporting/reports_main.php:210
 +#: ../reporting/reports_main.php:217
 +#: ../reporting/reports_main.php:223
 +#: ../reporting/reports_main.php:236
 +#: ../reporting/reports_main.php:251
 +#: ../reporting/reports_main.php:261
 +#: ../reporting/reports_main.php:269
 +#: ../sales/manage/sales_points.php:84
  msgid "Location"
  msgstr ""
  
- #: ../inventory/reorder_level.php.orig:68
 -#: inventory/reorder_level.php:65 inventory/inquiry/stock_movements.php:84
 -#: inventory/inquiry/stock_status.php:76 purchasing/supplier_credit.php:203
 -#: sales/sales_order_entry.php:518 sales/includes/ui/sales_order_ui.inc:181
++#: ../inventory/reorder_level.php:67
 +#: ../inventory/inquiry/stock_movements.php:80
 +#: ../inventory/inquiry/stock_status.php:70
- #: ../purchasing/supplier_credit.php:219
- #: ../sales/sales_order_entry.php:531
++#: ../purchasing/supplier_credit.php:229
++#: ../sales/sales_order_entry.php:534
 +#: ../sales/includes/ui/sales_order_ui.inc:182
  msgid "Quantity On Hand"
  msgstr ""
  
- #: ../inventory/reorder_level.php.orig:68
 -#: inventory/reorder_level.php:65 inventory/inquiry/stock_status.php:76
 -#: sales/includes/db/sales_order_db.inc:110
 -#: sales/includes/db/sales_order_db.inc:283
++#: ../inventory/reorder_level.php:67
++#: ../inventory/includes/inventory_db.inc:72
 +#: ../inventory/inquiry/stock_status.php:70
 +#: ../sales/includes/db/old.sales_order_db.inc:110
 +#: ../sales/includes/db/old.sales_order_db.inc:263
- #: ../sales/includes/db/sales_order_db.inc:112
- #: ../sales/includes/db/sales_order_db.inc:291
++#: ../sales/includes/db/sales_order_db.inc.orig:112
++#: ../sales/includes/db/sales_order_db.inc.orig:291
  msgid "Re-Order Level"
  msgstr ""
  
- #: ../inventory/reorder_level.php.orig:92
 -#: inventory/reorder_level.php:89
++#: ../inventory/reorder_level.php:90
  msgid "Reorder levels has been updated."
  msgstr ""
  
@@@ -8525,19 -7368,17 +8632,42 @@@ msgstr "
  msgid "Process Transfer"
  msgstr ""
  
 -#: inventory/includes/item_adjustments_ui.inc:20
 -#: inventory/includes/stock_transfers_ui.inc:20
 -#: manufacturing/includes/work_order_issue_ui.inc:20
 -#: sales/includes/ui/sales_order_ui.inc:60
++#: ../inventory/includes/inventory_db.inc:69
++#: ../sales/includes/db/old.sales_order_db.inc:107
++#: ../sales/includes/db/old.sales_order_db.inc:259
++#: ../sales/includes/db/sales_order_db.inc.orig:109
++#: ../sales/includes/db/sales_order_db.inc.orig:287
++msgid "Stocks below Re-Order Level at "
++msgstr ""
++
++#: ../inventory/includes/inventory_db.inc:72
++#: ../sales/includes/db/old.sales_order_db.inc:110
++#: ../sales/includes/db/old.sales_order_db.inc:264
++#: ../sales/includes/db/sales_order_db.inc.orig:112
++#: ../sales/includes/db/sales_order_db.inc.orig:292
++msgid "Below"
++msgstr ""
++
++#: ../inventory/includes/inventory_db.inc:73
++#: ../sales/includes/db/old.sales_order_db.inc:111
++#: ../sales/includes/db/old.sales_order_db.inc:265
++#: ../sales/includes/db/sales_order_db.inc.orig:113
++#: ../sales/includes/db/sales_order_db.inc.orig:293
++msgid "Please reorder"
++msgstr ""
++
 +#: ../inventory/includes/item_adjustments_ui.inc:20
 +#: ../inventory/includes/stock_transfers_ui.inc:20
 +#: ../manufacturing/includes/work_order_issue_ui.inc:20
 +#: ../sales/includes/ui/sales_order_ui.inc:60
  msgid "For Part :"
  msgstr ""
  
 -#: inventory/includes/item_adjustments_ui.inc:34
 -#: manufacturing/work_order_entry.php:210 purchasing/inquiry/po_search.php:67
 -#: sales/inquiry/sales_deliveries_view.php:107
 -#: sales/inquiry/sales_orders_view.php:232
 +#: ../inventory/includes/item_adjustments_ui.inc:34
 +#: ../manufacturing/work_order_entry.php:210
 +#: ../purchasing/inquiry/po_search.php:67
 +#: ../sales/inquiry/sales_deliveries_view.php:107
 +#: ../sales/inquiry/sales_orders_view.php:254
- #: ../sales/inquiry/sales_orders_view.php.orig:254
  msgid "Location:"
  msgstr ""
  
@@@ -8553,99 -7394,70 +8683,99 @@@ msgstr "
  msgid "Negative Adjustment"
  msgstr ""
  
 -#: inventory/includes/item_adjustments_ui.inc:62
 -#: inventory/includes/stock_transfers_ui.inc:60
 -#: manufacturing/includes/work_order_issue_ui.inc:33
 -#: purchasing/includes/ui/po_ui.inc:233 purchasing/po_receive_items.php:62
 -#: purchasing/view/view_grn.php:40 purchasing/view/view_po.php:45
 -#: reporting/includes/doctext.inc:29 reporting/includes/doctext.inc:169
 -#: reporting/includes/doctext.inc:206 sales/customer_credit_invoice.php:280
 -#: sales/customer_delivery.php:431 sales/customer_invoice.php:478
 -#: sales/view/view_credit.php:90 sales/view/view_dispatch.php:112
 -#: sales/view/view_invoice.php:113 sales/view/view_sales_order.php:201
 -#: sales/includes/ui/sales_credit_ui.inc:167
 -#: sales/includes/ui/sales_order_ui.inc:144
 +#: ../inventory/includes/item_adjustments_ui.inc:62
 +#: ../inventory/includes/stock_transfers_ui.inc:60
 +#: ../manufacturing/includes/work_order_issue_ui.inc:33
- #: ../purchasing/includes/ui/po_ui.inc:241
++#: ../purchasing/includes/ui/po_ui.inc:245
 +#: ../purchasing/po_receive_items.php:62
 +#: ../purchasing/view/view_grn.php:40
 +#: ../purchasing/view/view_po.php:45
 +#: ../reporting/includes/doctext.inc:29
 +#: ../reporting/includes/doctext.inc:191
 +#: ../reporting/includes/doctext.inc:228
 +#: ../sales/customer_credit_invoice.php:280
 +#: ../sales/customer_delivery.php:445
- #: ../sales/customer_invoice.php:541
- #: ../sales/customer_invoice.php:544
++#: ../sales/customer_invoice.php:550
++#: ../sales/customer_invoice.php:553
 +#: ../sales/view/view_credit.php:90
 +#: ../sales/view/view_dispatch.php:112
 +#: ../sales/view/view_invoice.php:115
 +#: ../sales/view/view_sales_order.php:219
 +#: ../sales/includes/ui/sales_credit_ui.inc:167
 +#: ../sales/includes/ui/sales_order_ui.inc:145
  msgid "Item Code"
  msgstr ""
  
 -#: inventory/includes/item_adjustments_ui.inc:62
 -#: inventory/includes/stock_transfers_ui.inc:60
 -#: manufacturing/includes/work_order_issue_ui.inc:33
 -#: purchasing/includes/ui/po_ui.inc:233 purchasing/view/view_grn.php:40
 -#: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:29
 -#: reporting/includes/doctext.inc:169 reporting/includes/doctext.inc:206
 -#: sales/customer_credit_invoice.php:280 sales/customer_delivery.php:431
 -#: sales/customer_invoice.php:478 sales/view/view_credit.php:90
 -#: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:113
 -#: sales/view/view_sales_order.php:201
 -#: sales/includes/ui/sales_credit_ui.inc:167
 -#: sales/includes/ui/sales_order_ui.inc:144
 +#: ../inventory/includes/item_adjustments_ui.inc:62
 +#: ../inventory/includes/stock_transfers_ui.inc:60
 +#: ../manufacturing/includes/work_order_issue_ui.inc:33
- #: ../purchasing/includes/ui/po_ui.inc:241
++#: ../purchasing/includes/ui/po_ui.inc:245
 +#: ../purchasing/view/view_grn.php:40
 +#: ../purchasing/view/view_po.php:45
 +#: ../reporting/includes/doctext.inc:29
 +#: ../reporting/includes/doctext.inc:191
 +#: ../reporting/includes/doctext.inc:228
 +#: ../sales/customer_credit_invoice.php:280
 +#: ../sales/customer_delivery.php:445
- #: ../sales/customer_invoice.php:541
- #: ../sales/customer_invoice.php:544
++#: ../sales/customer_invoice.php:550
++#: ../sales/customer_invoice.php:553
 +#: ../sales/view/view_credit.php:90
 +#: ../sales/view/view_dispatch.php:112
 +#: ../sales/view/view_invoice.php:115
 +#: ../sales/view/view_sales_order.php:219
 +#: ../sales/includes/ui/sales_credit_ui.inc:167
 +#: ../sales/includes/ui/sales_order_ui.inc:145
  msgid "Item Description"
  msgstr ""
  
 -#: inventory/includes/item_adjustments_ui.inc:62
 -#: inventory/includes/stock_transfers_ui.inc:60
 -#: inventory/manage/item_codes.php:124 inventory/manage/sales_kits.php:40
 -#: inventory/view/view_adjustment.php:56 inventory/view/view_transfer.php:56
 -#: manufacturing/view/wo_issue_view.php:77
 -#: manufacturing/manage/bom_edit.php:71
 -#: manufacturing/includes/manufacturing_ui.inc:29
 -#: manufacturing/includes/manufacturing_ui.inc:157
 -#: manufacturing/includes/manufacturing_ui.inc:332
 -#: manufacturing/includes/work_order_issue_ui.inc:33
 -#: purchasing/includes/ui/invoice_ui.inc:497
 -#: purchasing/includes/ui/po_ui.inc:233 purchasing/view/view_grn.php:40
 -#: purchasing/view/view_po.php:45 reporting/rep301.php:105
 -#: reporting/rep303.php:121 reporting/rep303.php:127 reporting/rep401.php:71
 -#: reporting/includes/doctext.inc:29 reporting/includes/doctext.inc:170
 -#: reporting/includes/doctext.inc:203 sales/view/view_credit.php:90
 -#: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:113
 -#: sales/view/view_sales_order.php:201
 -#: sales/includes/ui/sales_credit_ui.inc:167
 -#: sales/includes/ui/sales_order_ui.inc:144
 +#: ../inventory/includes/item_adjustments_ui.inc:62
 +#: ../inventory/includes/stock_transfers_ui.inc:60
 +#: ../inventory/manage/item_codes.php:124
 +#: ../inventory/manage/sales_kits.php:40
 +#: ../inventory/view/view_adjustment.php:56
 +#: ../inventory/view/view_transfer.php:56
 +#: ../manufacturing/view/wo_issue_view.php:77
 +#: ../manufacturing/manage/bom_edit.php:71
 +#: ../manufacturing/includes/manufacturing_ui.inc:29
 +#: ../manufacturing/includes/manufacturing_ui.inc:157
 +#: ../manufacturing/includes/manufacturing_ui.inc:332
 +#: ../manufacturing/includes/work_order_issue_ui.inc:33
 +#: ../purchasing/includes/ui/invoice_ui.inc:520
- #: ../purchasing/includes/ui/po_ui.inc:241
++#: ../purchasing/includes/ui/po_ui.inc:245
 +#: ../purchasing/view/view_grn.php:40
 +#: ../purchasing/view/view_po.php:45
 +#: ../reporting/rep301.php:105
 +#: ../reporting/rep303.php:121
 +#: ../reporting/rep303.php:127
 +#: ../reporting/rep401.php:71
 +#: ../reporting/includes/doctext.inc:29
 +#: ../reporting/includes/doctext.inc:192
 +#: ../reporting/includes/doctext.inc:225
- #: ../sales/customer_invoice.php:541
++#: ../sales/customer_invoice.php:550
 +#: ../sales/view/view_credit.php:90
 +#: ../sales/view/view_dispatch.php:112
 +#: ../sales/view/view_invoice.php:115
 +#: ../sales/view/view_sales_order.php:219
 +#: ../sales/includes/ui/sales_credit_ui.inc:167
 +#: ../sales/includes/ui/sales_order_ui.inc:145
  msgid "Quantity"
  msgstr ""
  
 -#: inventory/includes/item_adjustments_ui.inc:63
 -#: inventory/includes/stock_transfers_ui.inc:60
 -#: inventory/manage/item_units.php:94
 -#: manufacturing/includes/work_order_issue_ui.inc:34
 -#: purchasing/includes/ui/po_ui.inc:234 purchasing/view/view_grn.php:41
 -#: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:30
 -#: reporting/includes/doctext.inc:170 sales/view/view_credit.php:91
 -#: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:114
 -#: sales/view/view_sales_order.php:201
 -#: sales/includes/ui/sales_credit_ui.inc:167
 -#: sales/includes/ui/sales_order_ui.inc:146
 +#: ../inventory/includes/item_adjustments_ui.inc:63
 +#: ../inventory/includes/stock_transfers_ui.inc:60
 +#: ../inventory/manage/item_units.php:94
 +#: ../manufacturing/includes/work_order_issue_ui.inc:34
- #: ../purchasing/includes/ui/po_ui.inc:242
++#: ../purchasing/includes/ui/po_ui.inc:246
 +#: ../purchasing/view/view_grn.php:41
 +#: ../purchasing/view/view_po.php:45
 +#: ../reporting/includes/doctext.inc:30
 +#: ../reporting/includes/doctext.inc:192
 +#: ../sales/view/view_credit.php:91
 +#: ../sales/view/view_dispatch.php:113
 +#: ../sales/view/view_invoice.php:116
 +#: ../sales/view/view_sales_order.php:219
 +#: ../sales/includes/ui/sales_credit_ui.inc:167
 +#: ../sales/includes/ui/sales_order_ui.inc:147
  msgid "Unit"
  msgstr ""
  
@@@ -8789,18 -7595,12 +8919,18 @@@ msgstr "
  msgid "Tax type"
  msgstr ""
  
 -#: inventory/manage/item_categories.php:98 inventory/manage/item_codes.php:124
 -#: inventory/manage/sales_kits.php:40 inventory/view/view_adjustment.php:57
 -#: inventory/view/view_transfer.php:56 manufacturing/view/wo_issue_view.php:77
 -#: manufacturing/manage/bom_edit.php:71 purchasing/po_receive_items.php:62
 -#: sales/customer_credit_invoice.php:280 sales/customer_delivery.php:432
 -#: sales/customer_invoice.php:478
 +#: ../inventory/manage/item_categories.php:98
 +#: ../inventory/manage/item_codes.php:124
 +#: ../inventory/manage/sales_kits.php:40
 +#: ../inventory/view/view_adjustment.php:57
 +#: ../inventory/view/view_transfer.php:56
 +#: ../manufacturing/view/wo_issue_view.php:77
 +#: ../manufacturing/manage/bom_edit.php:71
 +#: ../purchasing/po_receive_items.php:62
 +#: ../sales/customer_credit_invoice.php:280
 +#: ../sales/customer_delivery.php:446
- #: ../sales/customer_invoice.php:541
- #: ../sales/customer_invoice.php:544
++#: ../sales/customer_invoice.php:550
++#: ../sales/customer_invoice.php:553
  msgid "Units"
  msgstr ""
  
@@@ -8861,8 -7652,7 +8991,8 @@@ msgstr "
  msgid "Foreign Item Codes"
  msgstr ""
  
 -#: inventory/manage/item_codes.php:23 sales/sales_order_entry.php:685
 +#: ../inventory/manage/item_codes.php:23
- #: ../sales/sales_order_entry.php:698
++#: ../sales/sales_order_entry.php:702
  msgid "There are no inventory items defined in the system."
  msgstr ""
  
@@@ -9071,10 -7835,8 +9201,10 @@@ msgstr "
  msgid "New item"
  msgstr ""
  
 -#: inventory/manage/items.php:454 purchasing/manage/suppliers.php:306
 -#: sales/manage/customer_branches.php:322 sales/manage/customers.php:347
 +#: ../inventory/manage/items.php:465
- #: ../purchasing/manage/suppliers.php:308
++#: ../purchasing/manage/suppliers.php:310
 +#: ../sales/manage/customer_branches.php:324
- #: ../sales/manage/customers.php:347
++#: ../sales/manage/customers.php:348
  msgid "&General settings"
  msgstr ""
  
@@@ -9086,9 -7848,8 +9216,9 @@@ msgstr "
  msgid "&Purchasing Pricing"
  msgstr ""
  
 -#: inventory/manage/items.php:459 purchasing/manage/suppliers.php:308
 -#: sales/manage/customers.php:349
 +#: ../inventory/manage/items.php:470
- #: ../purchasing/manage/suppliers.php:310
- #: ../sales/manage/customers.php:349
++#: ../purchasing/manage/suppliers.php:312
++#: ../sales/manage/customers.php:350
  msgid "&Transactions"
  msgstr ""
  
@@@ -9396,11 -8147,11 +9526,11 @@@ msgstr "
  msgid "for item:"
  msgstr ""
  
 -#: manufacturing/search_work_orders.php:78
 -#: purchasing/inquiry/po_search_completed.php:77
 -#: purchasing/inquiry/po_search.php:76
 -#: sales/inquiry/sales_deliveries_view.php:116
 -#: sales/inquiry/sales_orders_view.php:247
 +#: ../manufacturing/search_work_orders.php:78
 +#: ../purchasing/inquiry/po_search_completed.php:74
 +#: ../purchasing/inquiry/po_search.php:76
 +#: ../sales/inquiry/sales_deliveries_view.php:116
- #: ../sales/inquiry/sales_orders_view.php.orig:269
++#: ../sales/inquiry/sales_orders_view.php:270
  msgid "Select documents"
  msgstr ""
  
@@@ -9424,11 -8175,10 +9554,11 @@@ msgstr "
  msgid "Required"
  msgstr ""
  
 -#: manufacturing/search_work_orders.php:167
 -#: manufacturing/includes/manufacturing_ui.inc:277
 -#: manufacturing/includes/manufacturing_ui.inc:281
 -#: reporting/includes/doctext.inc:205 sales/inquiry/sales_orders_view.php:268
 +#: ../manufacturing/search_work_orders.php:167
 +#: ../manufacturing/includes/manufacturing_ui.inc:277
 +#: ../manufacturing/includes/manufacturing_ui.inc:281
 +#: ../reporting/includes/doctext.inc:227
- #: ../sales/inquiry/sales_orders_view.php.orig:290
++#: ../sales/inquiry/sales_orders_view.php:291
  msgid "Required By"
  msgstr ""
  
@@@ -9510,9 -8258,9 +9640,9 @@@ msgstr "
  msgid "Return Items to Work Order"
  msgstr ""
  
 -#: manufacturing/work_order_add_finished.php:214
 -#: purchasing/allocations/supplier_allocate.php:74
 -#: sales/allocations/customer_allocate.php:72
 +#: ../manufacturing/work_order_add_finished.php:214
- #: ../purchasing/allocations/supplier_allocate.php:74
- #: ../sales/allocations/customer_allocate.php:72
++#: ../purchasing/allocations/supplier_allocate.php:75
++#: ../sales/allocations/customer_allocate.php:73
  msgid "Process"
  msgstr ""
  
@@@ -9830,7 -8568,7 +9960,8 @@@ msgstr "
  msgid "BOM for item:"
  msgstr ""
  
 -#: manufacturing/view/work_order_view.php:56 reporting/rep409.php:88
 +#: ../manufacturing/view/work_order_view.php:56
++#: ../reporting/rep409.php:87
  msgid "Work Order Requirements"
  msgstr ""
  
@@@ -10083,30 -8820,27 +10214,24 @@@ msgstr "
  msgid "Reversed the production "
  msgstr ""
  
 -#: manufacturing/includes/db/work_orders_db.inc:278
 -#: purchasing/includes/db/po_db.inc:116
 -#: sales/includes/db/cust_trans_db.inc:111
 -#: sales/includes/db/sales_order_db.inc:267
 +#: ../manufacturing/includes/db/work_orders_db.inc:79
- #: ../manufacturing/includes/db/work_orders_db.inc.orig:79
 +#: ../purchasing/includes/db/po_db.inc:123
 +#: ../sales/includes/db/cust_trans_db.inc:114
 +#: ../sales/includes/db/old.sales_order_db.inc:249
- #: ../sales/includes/db/sales_order_db.inc:275
++#: ../sales/includes/db/sales_order_db.inc:213
++#: ../sales/includes/db/sales_order_db.inc.orig:275
  msgid "Updated."
  msgstr ""
  
 -#: manufacturing/includes/db/work_orders_db.inc:297
 +#: ../manufacturing/includes/db/work_orders_db.inc:100
- #: ../manufacturing/includes/db/work_orders_db.inc.orig:100
  msgid "Canceled."
  msgstr ""
  
 -#: manufacturing/includes/db/work_orders_db.inc:373
 +#: ../manufacturing/includes/db/work_orders_db.inc:176
- #: ../manufacturing/includes/db/work_orders_db.inc.orig:176
  msgid "Released."
  msgstr ""
  
- #: ../manufacturing/includes/db/work_orders_db.inc.orig:260
 -#: manufacturing/includes/db/work_orders_db.inc:445
 -#: manufacturing/includes/db/work_orders_db.inc:461
--msgid "Voiding Work Order Trans # "
--msgstr ""
--
 -#: manufacturing/includes/db/work_orders_quick_db.inc:106
 +#: ../manufacturing/includes/db/work_orders_quick_db.inc:104
  msgid "Quick production."
  msgstr ""
  
  msgid "Produced"
  msgstr ""
  
- #: ../purchasing/includes/db/invoice_db.inc.orig:296
 -#: purchasing/includes/db/invoice_db.inc:311
++#: ../purchasing/includes/purchasing_db.inc:219
++msgid "Payment for:"
++msgstr ""
++
++#: ../purchasing/includes/db/invoice_db.inc:334
  msgid "Supplier invoice adjustment for zero inventory of "
  msgstr ""
  
- #: ../purchasing/includes/db/invoice_db.inc.orig:296
 -#: purchasing/includes/db/invoice_db.inc:311 reporting/rep106.php:83
 -#: sales/inquiry/sales_deliveries_view.php:166
 -#: sales/inquiry/sales_orders_view.php:147
++#: ../purchasing/includes/db/invoice_db.inc:334
 +#: ../reporting/rep106.php:83
 +#: ../sales/inquiry/sales_deliveries_view.php:166
 +#: ../sales/inquiry/sales_orders_view.php:159
- #: ../sales/inquiry/sales_orders_view.php.orig:159
  msgid "Invoice"
  msgstr ""
  
- #: ../purchasing/includes/db/invoice_db.inc.orig:707
- #: ../purchasing/includes/db/invoice_db.inc.orig:709
 -#: purchasing/includes/db/invoice_db.inc:659
 -#: purchasing/includes/db/invoice_db.inc:661
++#: ../purchasing/includes/db/invoice_db.inc:693
++#: ../purchasing/includes/db/invoice_db.inc:695
  msgid "GRN Removal"
  msgstr ""
  
 -#: purchasing/includes/ui/grn_ui.inc:23 purchasing/includes/ui/grn_ui.inc:55
 -#: purchasing/includes/ui/po_ui.inc:316 sales/view/view_sales_order.php:74
 +#: ../purchasing/includes/ui/grn_ui.inc:23
 +#: ../purchasing/includes/ui/grn_ui.inc:55
- #: ../purchasing/includes/ui/po_ui.inc:324
++#: ../purchasing/includes/ui/po_ui.inc:328
 +#: ../sales/view/view_sales_order.php:74
  msgid "Order Currency"
  msgstr ""
  
@@@ -10149,36 -8877,29 +10277,36 @@@ msgstr "
  msgid "Ordered On"
  msgstr ""
  
 -#: purchasing/includes/ui/grn_ui.inc:33 purchasing/includes/ui/grn_ui.inc:69
 -#: purchasing/includes/ui/po_ui.inc:331 purchasing/includes/ui/po_ui.inc:336
 +#: ../purchasing/includes/ui/grn_ui.inc:33
 +#: ../purchasing/includes/ui/grn_ui.inc:69
- #: ../purchasing/includes/ui/po_ui.inc:339
- #: ../purchasing/includes/ui/po_ui.inc:344
++#: ../purchasing/includes/ui/po_ui.inc:343
++#: ../purchasing/includes/ui/po_ui.inc:348
  msgid "Deliver Into Location"
  msgstr ""
  
 -#: purchasing/includes/ui/grn_ui.inc:34 purchasing/includes/ui/grn_ui.inc:79
 -#: purchasing/includes/ui/po_ui.inc:341
 -#: purchasing/view/view_supp_credit.php:44
 -#: purchasing/view/view_supp_invoice.php:47
 -#: purchasing/inquiry/po_search_completed.php:125
 -#: purchasing/inquiry/po_search.php:134
 -#: purchasing/inquiry/supplier_inquiry.php:172
 -#: reporting/includes/doctext.inc:142 reporting/includes/doctext.inc:165
 +#: ../purchasing/includes/ui/grn_ui.inc:34
 +#: ../purchasing/includes/ui/grn_ui.inc:79
- #: ../purchasing/includes/ui/po_ui.inc:349
++#: ../purchasing/includes/ui/po_ui.inc:353
 +#: ../purchasing/view/view_supp_credit.php:44
 +#: ../purchasing/view/view_supp_invoice.php:48
 +#: ../purchasing/inquiry/po_search_completed.php:124
 +#: ../purchasing/inquiry/po_search.php:134
 +#: ../purchasing/inquiry/supplier_inquiry.php:177
 +#: ../reporting/includes/doctext.inc:164
 +#: ../reporting/includes/doctext.inc:187
  msgid "Supplier's Reference"
  msgstr ""
  
 -#: purchasing/includes/ui/grn_ui.inc:38 purchasing/includes/ui/grn_ui.inc:81
 -#: purchasing/includes/ui/po_ui.inc:345 sales/view/view_sales_order.php:79
 +#: ../purchasing/includes/ui/grn_ui.inc:38
 +#: ../purchasing/includes/ui/grn_ui.inc:81
- #: ../purchasing/includes/ui/po_ui.inc:353
++#: ../purchasing/includes/ui/po_ui.inc:357
 +#: ../sales/view/view_sales_order.php:92
  msgid "Delivery Address"
  msgstr ""
  
 -#: purchasing/includes/ui/grn_ui.inc:41 purchasing/includes/ui/grn_ui.inc:84
 -#: purchasing/includes/ui/po_ui.inc:349
 +#: ../purchasing/includes/ui/grn_ui.inc:41
 +#: ../purchasing/includes/ui/grn_ui.inc:84
- #: ../purchasing/includes/ui/po_ui.inc:365
++#: ../purchasing/includes/ui/po_ui.inc:369
  msgid "Order Comments"
  msgstr ""
  
@@@ -10198,16 -8916,14 +10326,16 @@@ msgstr "
  msgid "Terms:"
  msgstr ""
  
 -#: purchasing/includes/ui/invoice_ui.inc:139
 -#: purchasing/manage/suppliers.php:98 purchasing/manage/suppliers.php:103
 +#: ../purchasing/includes/ui/invoice_ui.inc:152
- #: ../purchasing/manage/suppliers.php:100
- #: ../purchasing/manage/suppliers.php:105
++#: ../purchasing/manage/suppliers.php:101
++#: ../purchasing/manage/suppliers.php:106
  msgid "Supplier's Currency:"
  msgstr ""
  
 -#: purchasing/includes/ui/invoice_ui.inc:143
 -#: purchasing/manage/suppliers.php:105 sales/manage/customer_branches.php:246
 -#: sales/manage/customers.php:297
 +#: ../purchasing/includes/ui/invoice_ui.inc:156
- #: ../purchasing/manage/suppliers.php:107
++#: ../purchasing/manage/suppliers.php:108
 +#: ../sales/manage/customer_branches.php:247
- #: ../sales/manage/customers.php:297
++#: ../sales/manage/customers.php:298
  msgid "Tax Group:"
  msgstr ""
  
@@@ -10225,13 -8941,7 +10353,13 @@@ msgstr "
  msgid "Credit Note Total"
  msgstr ""
  
 -#: purchasing/includes/ui/invoice_ui.inc:200
 +#: ../purchasing/includes/ui/invoice_ui.inc:190
- #: ../purchasing/includes/ui/po_ui.inc:485
- #: ../purchasing/po_entry_items.php:562
++#: ../purchasing/includes/ui/po_ui.inc:489
++#: ../purchasing/po_entry_items.php:481
 +msgid "Tax algorithm:"
 +msgstr ""
 +
 +#: ../purchasing/includes/ui/invoice_ui.inc:222
  msgid "Add GL Line"
  msgstr ""
  
@@@ -10264,8 -8974,7 +10392,8 @@@ msgstr "
  msgid "Add to Credit Note"
  msgstr ""
  
 -#: purchasing/includes/ui/invoice_ui.inc:409 sales/customer_invoice.php:533
 +#: ../purchasing/includes/ui/invoice_ui.inc:431
- #: ../sales/customer_invoice.php:603
++#: ../sales/customer_invoice.php:612
  msgid "Remove"
  msgstr ""
  
@@@ -10308,11 -9016,9 +10436,10 @@@ msgstr "
  msgid "Add All Items"
  msgstr ""
  
 -#: purchasing/includes/ui/invoice_ui.inc:484
 -#: purchasing/includes/ui/invoice_ui.inc:496 reporting/rep308.php:149
 -#: sales/inquiry/sales_orders_view.php:155
 +#: ../purchasing/includes/ui/invoice_ui.inc:507
 +#: ../purchasing/includes/ui/invoice_ui.inc:519
 +#: ../reporting/rep308.php:149
 +#: ../sales/inquiry/sales_orders_view.php:167
- #: ../sales/inquiry/sales_orders_view.php.orig:167
  msgid "Delivery"
  msgstr ""
  
@@@ -10343,15 -9043,15 +10470,15 @@@ msgstr "
  msgid "Qty Yet To Invoice"
  msgstr ""
  
 -#: purchasing/includes/ui/invoice_ui.inc:486
 -#: purchasing/includes/ui/po_ui.inc:235
 -#: sales/includes/ui/sales_order_ui.inc:146
 +#: ../purchasing/includes/ui/invoice_ui.inc:509
- #: ../purchasing/includes/ui/po_ui.inc:243
++#: ../purchasing/includes/ui/po_ui.inc:247
 +#: ../sales/includes/ui/sales_order_ui.inc:147
  msgid "Price after Tax"
  msgstr ""
  
 -#: purchasing/includes/ui/invoice_ui.inc:486
 -#: purchasing/includes/ui/po_ui.inc:235
 -#: sales/includes/ui/sales_order_ui.inc:146
 +#: ../purchasing/includes/ui/invoice_ui.inc:509
- #: ../purchasing/includes/ui/po_ui.inc:243
++#: ../purchasing/includes/ui/po_ui.inc:247
 +#: ../sales/includes/ui/sales_order_ui.inc:147
  msgid "Price before Tax"
  msgstr ""
  
@@@ -10379,130 -9079,87 +10506,131 @@@ msgstr "
  msgid "Credits can only be applied to invoiced items."
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:162
- #: ../sales/sales_order_entry.php:722
 -#: purchasing/includes/ui/po_ui.inc:154 sales/sales_order_entry.php:709
++#: ../purchasing/includes/ui/po_ui.inc:166
++#: ../sales/sales_order_entry.php:726
  msgid "Order Date:"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:163
- #: ../sales/sales_order_entry.php:709
 -#: purchasing/includes/ui/po_ui.inc:155 sales/sales_order_entry.php:696
++#: ../purchasing/includes/ui/po_ui.inc:167
++#: ../sales/sales_order_entry.php:713
  msgid "Delivery Date:"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:163
- #: ../sales/sales_order_entry.php:703
 -#: purchasing/includes/ui/po_ui.inc:155 sales/sales_order_entry.php:690
++#: ../purchasing/includes/ui/po_ui.inc:167
++#: ../sales/sales_order_entry.php:707
  msgid "Invoice Date:"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:176
 -#: purchasing/includes/ui/po_ui.inc:168
++#: ../purchasing/includes/ui/po_ui.inc:180
  msgid "Supplier Currency:"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:195
 -#: purchasing/includes/ui/po_ui.inc:187
++#: ../purchasing/includes/ui/po_ui.inc:199
  msgid "Due Date:"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:197
 -#: purchasing/includes/ui/po_ui.inc:189
++#: ../purchasing/includes/ui/po_ui.inc:201
  msgid "Supplier's Reference:"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:198
 -#: purchasing/includes/ui/po_ui.inc:190
++#: ../purchasing/includes/ui/po_ui.inc:202
  msgid "Receive Into:"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:223
 -#: purchasing/includes/ui/po_ui.inc:215
++#: ../purchasing/includes/ui/po_ui.inc:227
  msgid ""
  "The default stock location set up for this user is not a currently defined "
  "stock location. Your system administrator needs to amend your user record."
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:227
 -#: purchasing/includes/ui/po_ui.inc:219
++#: ../purchasing/includes/ui/po_ui.inc:231
  msgid "Deliver to:"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:236
 -#: purchasing/includes/ui/po_ui.inc:228
++#: ../purchasing/includes/ui/po_ui.inc:240
  msgid "Order Items"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:242
 -#: purchasing/includes/ui/po_ui.inc:234 purchasing/po_receive_items.php:62
++#: ../purchasing/includes/ui/po_ui.inc:246
 +#: ../purchasing/po_receive_items.php:62
  msgid "Received"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:243
 -#: purchasing/includes/ui/po_ui.inc:235
 -#: sales/includes/ui/sales_order_ui.inc:616
++#: ../purchasing/includes/ui/po_ui.inc:247
 +#: ../sales/includes/ui/sales_order_ui.inc:617
  msgid "Required Delivery Date"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:243
 -#: purchasing/includes/ui/po_ui.inc:235 purchasing/view/view_grn.php:41
 -#: purchasing/view/view_po.php:46
++#: ../purchasing/includes/ui/po_ui.inc:247
 +#: ../purchasing/view/view_grn.php:41
 +#: ../purchasing/view/view_po.php:46
  msgid "Line Total"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:294
 -#: purchasing/includes/ui/po_ui.inc:286 purchasing/po_receive_items.php:114
 -#: reporting/rep107.php:150 reporting/rep109.php:149 reporting/rep110.php:159
 -#: reporting/rep111.php:134 reporting/rep113.php:144 reporting/rep209.php:162
 -#: sales/customer_credit_invoice.php:322 sales/customer_delivery.php:511
 -#: sales/customer_invoice.php:574 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:235
++#: ../purchasing/includes/ui/po_ui.inc:298
 +#: ../purchasing/po_receive_items.php:114
++#: ../reporting/rep107.php:231
 +#: ../reporting/rep109.php:155
 +#: ../reporting/rep110.php:159
 +#: ../reporting/rep111.php:134
 +#: ../reporting/rep113.php:144
 +#: ../reporting/rep209.php:162
 +#: ../sales/customer_credit_invoice.php:322
 +#: ../sales/customer_delivery.php:525
- #: ../sales/customer_invoice.php:647
++#: ../sales/customer_invoice.php:656
 +#: ../sales/view/view_dispatch.php:146
 +#: ../sales/view/view_invoice.php:150
 +#: ../sales/includes/ui/sales_credit_ui.inc:217
 +#: ../sales/includes/ui/sales_order_ui.inc:236
  msgid "Sub-total"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:303
 -#: purchasing/includes/ui/po_ui.inc:295 purchasing/po_receive_items.php:122
 -#: purchasing/view/view_grn.php:79 purchasing/view/view_po.php:93
 -#: sales/customer_delivery.php:518 sales/view/view_sales_order.php:244
 -#: sales/includes/ui/sales_order_ui.inc:242
++#: ../purchasing/includes/ui/po_ui.inc:307
 +#: ../purchasing/po_receive_items.php:122
 +#: ../purchasing/view/view_grn.php:79
 +#: ../purchasing/view/view_po.php:93
 +#: ../sales/customer_delivery.php:532
 +#: ../sales/view/view_sales_order.php:262
 +#: ../sales/includes/ui/sales_order_ui.inc:243
  msgid "Amount Total"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:304
- #: ../purchasing/allocations/supplier_allocate.php:73
- #: ../sales/allocations/customer_allocate.php:71
 -#: purchasing/includes/ui/po_ui.inc:296
 -#: purchasing/allocations/supplier_allocate.php:73
 -#: sales/allocations/customer_allocate.php:71
 -#: sales/includes/ui/sales_order_ui.inc:243
++#: ../purchasing/includes/ui/po_ui.inc:308
++#: ../purchasing/allocations/supplier_allocate.php:74
++#: ../sales/allocations/customer_allocate.php:72
 +#: ../sales/includes/ui/sales_order_ui.inc:244
  msgid "Refresh"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:359
 -#: purchasing/po_entry_items.php:41
++#: ../purchasing/includes/ui/po_ui.inc:363
 +#: ../sales/view/view_sales_order.php:83
 +msgid "Required Pre-Payment"
 +msgstr ""
 +
- #: ../purchasing/includes/ui/po_ui.inc:360
++#: ../purchasing/includes/ui/po_ui.inc:364
 +msgid "Pre-Payments Allocated"
 +msgstr ""
 +
- #: ../purchasing/includes/ui/po_ui.inc:486
- #: ../purchasing/po_entry_items.php:563
- #: ../sales/customer_invoice.php:454
++#: ../purchasing/includes/ui/po_ui.inc:490
++#: ../purchasing/po_entry_items.php:482
++#: ../sales/customer_invoice.php:463
 +#: ../sales/includes/ui/sales_order_ui.inc:413
 +#: ../sales/includes/ui/sales_order_ui.inc:415
 +msgid "Payment:"
 +msgstr ""
 +
- #: ../purchasing/includes/ui/po_ui.inc:486
- #: ../purchasing/po_entry_items.php:563
++#: ../purchasing/includes/ui/po_ui.inc:490
++#: ../purchasing/po_entry_items.php:482
 +msgid "Delayed"
 +msgstr ""
 +
- #: ../purchasing/includes/ui/po_ui.inc:488
++#: ../purchasing/includes/ui/po_ui.inc:492
 +#: ../sales/includes/ui/sales_order_ui.inc:628
 +#: ../sales/includes/ui/sales_order_ui.inc:630
 +msgid "Pre-Payment Required:"
 +msgstr ""
 +
 +#: ../purchasing/po_entry_items.php:41
  msgid "Modify Purchase Order #"
  msgstr ""
  
@@@ -10589,163 -9241,151 +10717,154 @@@ msgstr "
  msgid "View the GL Journal Entries for this Invoice"
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:136
- #: ../purchasing/supplier_invoice.php:71
 -#: purchasing/po_entry_items.php:133 purchasing/supplier_invoice.php:48
--msgid "Entry supplier &payment for this invoice"
--msgstr ""
--
- #: ../purchasing/po_entry_items.php:142
 -#: purchasing/po_entry_items.php:139
++#: ../purchasing/po_entry_items.php:139
  msgid "Enter &Another Direct Invoice"
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:174
 -#: purchasing/po_entry_items.php:171
++#: ../purchasing/po_entry_items.php:171
  msgid ""
  "This item cannot be deleted because some of it has already been received."
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:189
 -#: purchasing/po_entry_items.php:186
++#: ../purchasing/po_entry_items.php:186
  msgid ""
  "This order cannot be cancelled because some of it has already been received."
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:190
 -#: purchasing/po_entry_items.php:187
++#: ../purchasing/po_entry_items.php:187
  msgid ""
  "The line item quantities may be modified to quantities more than already "
  "received. prices cannot be altered for lines that have already been received "
  "and quantities cannot be reduced below the quantity already received."
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:205
 -#: purchasing/po_entry_items.php:202
++#: ../purchasing/po_entry_items.php:202
  msgid "This purchase order has been cancelled."
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:207
 -#: purchasing/po_entry_items.php:204
++#: ../purchasing/po_entry_items.php:204
  msgid "Enter a new purchase order"
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:219
- #: ../sales/sales_order_entry.php:503
 -#: purchasing/po_entry_items.php:216 sales/sales_order_entry.php:490
++#: ../purchasing/po_entry_items.php:216
++#: ../sales/sales_order_entry.php:506
  msgid "Item description cannot be empty."
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:229
 -#: purchasing/po_entry_items.php:226
++#: ../purchasing/po_entry_items.php:226
  msgid "The quantity of the order item must be numeric and not less than "
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:236
 -#: purchasing/po_entry_items.php:233
++#: ../purchasing/po_entry_items.php:233
  msgid "The price entered must be numeric and not less than zero."
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:260
 -#: purchasing/po_entry_items.php:257
++#: ../purchasing/po_entry_items.php:257
  msgid ""
  "You are attempting to make the quantity ordered a quantity less than has "
  "already been invoiced or received.  This is prohibited."
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:261
 -#: purchasing/po_entry_items.php:258
++#: ../purchasing/po_entry_items.php:258
  msgid ""
  "The quantity received can only be modified by entering a negative receipt "
  "and the quantity invoiced can only be reduced by entering a credit note "
  "against this item."
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:289
 -#: purchasing/po_entry_items.php:286
++#: ../purchasing/po_entry_items.php:286
  msgid "The selected item is already on this order."
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:316
 -#: purchasing/po_entry_items.php:313
++#: ../purchasing/po_entry_items.php:313
  msgid ""
  "The selected item does not exist or it is a kit part and therefore cannot be "
  "purchased."
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:332
- #: ../purchasing/supplier_invoice.php:384
- #: ../purchasing/supplier_payment.php.orig:114
 -#: purchasing/po_entry_items.php:329 purchasing/supplier_invoice.php:355
 -#: purchasing/supplier_payment.php:123
++#: ../purchasing/po_entry_items.php:329
++#: ../purchasing/supplier_invoice.php:394
++#: ../purchasing/supplier_payment.php:123
  msgid "There is no supplier selected."
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:339
 -#: purchasing/po_entry_items.php:336
++#: ../purchasing/po_entry_items.php:336
  msgid "The entered order date is invalid."
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:352
 -#: purchasing/po_entry_items.php:343 purchasing/po_receive_items.php:181
 -#: sales/sales_order_entry.php:358
 -msgid "The entered date is not in fiscal year"
 -msgstr ""
 -
 -#: purchasing/po_entry_items.php:350
++#: ../purchasing/po_entry_items.php:349
  msgid "The entered due date is invalid."
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:361
 -#: purchasing/po_entry_items.php:359
++#: ../purchasing/po_entry_items.php:358
  msgid "There is no reference entered for this purchase order."
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:376
- #: ../purchasing/supplier_invoice.php:186
 -#: purchasing/po_entry_items.php:374 purchasing/supplier_invoice.php:172
++#: ../purchasing/po_entry_items.php:373
++#: ../purchasing/supplier_invoice.php:197
  msgid "You must enter a supplier's invoice reference."
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:383
- #: ../purchasing/supplier_invoice.php:212
 -#: purchasing/po_entry_items.php:381 purchasing/supplier_invoice.php:198
++#: ../purchasing/po_entry_items.php:380
++#: ../purchasing/supplier_invoice.php:223
  msgid ""
  "This invoice number has already been entered. It cannot be entered again."
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:389
 -#: purchasing/po_entry_items.php:387
++#: ../purchasing/po_entry_items.php:386
  msgid "There is no delivery address specified."
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:395
 -#: purchasing/po_entry_items.php:393
++#: ../purchasing/po_entry_items.php:392
  msgid "There is no location specified to move any items into."
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:403
 -#: purchasing/po_entry_items.php:401
++#: ../purchasing/po_entry_items.php:400
  msgid ""
  "The order cannot be placed because there are no lines entered on this order."
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:408
 -#: purchasing/po_entry_items.php:534 sales/sales_order_entry.php:713
++#: ../purchasing/po_entry_items.php:405
 +msgid "Required prepayment is greater than total invoice value."
 +msgstr ""
 +
- #: ../purchasing/po_entry_items.php:500
- msgid "Payment for:"
- msgstr ""
- #: ../purchasing/po_entry_items.php:571
- #: ../sales/sales_order_entry.php:726
++#: ../purchasing/po_entry_items.php:490
++#: ../sales/sales_order_entry.php:730
  msgid "Place Order"
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:572
 -#: purchasing/po_entry_items.php:535
++#: ../purchasing/po_entry_items.php:491
  msgid "Update Order"
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:573
- #: ../sales/sales_order_entry.php:725
 -#: purchasing/po_entry_items.php:536 sales/sales_order_entry.php:712
++#: ../purchasing/po_entry_items.php:492
++#: ../sales/sales_order_entry.php:729
  msgid "Cancel Order"
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:575
 -#: purchasing/po_entry_items.php:538
++#: ../purchasing/po_entry_items.php:494
  msgid "Process GRN"
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:576
 -#: purchasing/po_entry_items.php:539
++#: ../purchasing/po_entry_items.php:495
  msgid "Update GRN"
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:577
 -#: purchasing/po_entry_items.php:540
++#: ../purchasing/po_entry_items.php:496
  msgid "Cancel GRN"
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:580
- #: ../sales/customer_invoice.php:686
 -#: purchasing/po_entry_items.php:543 sales/customer_invoice.php:593
++#: ../purchasing/po_entry_items.php:499
++#: ../sales/customer_invoice.php:695
  msgid "Process Invoice"
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:581
 -#: purchasing/po_entry_items.php:544
++#: ../purchasing/po_entry_items.php:500
  msgid "Update Invoice"
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:582
- #: ../sales/sales_order_entry.php:706
 -#: purchasing/po_entry_items.php:545 sales/sales_order_entry.php:693
++#: ../purchasing/po_entry_items.php:501
++#: ../sales/sales_order_entry.php:710
  msgid "Cancel Invoice"
  msgstr ""
  
@@@ -10777,12 -9416,9 +10896,12 @@@ msgstr "
  msgid "Ordered"
  msgstr ""
  
 -#: purchasing/po_receive_items.php:63 reporting/rep101.php:119
 -#: reporting/rep105.php:115 reporting/rep105.php:166 reporting/rep201.php:111
 -#: reporting/includes/doctext.inc:225
 +#: ../purchasing/po_receive_items.php:63
- #: ../reporting/rep101.php:148
++#: ../reporting/rep101.php:119
 +#: ../reporting/rep105.php:115
 +#: ../reporting/rep105.php:166
- #: ../reporting/rep201.php:136
++#: ../reporting/rep201.php:111
 +#: ../reporting/includes/doctext.inc:247
  msgid "Outstanding"
  msgstr ""
  
@@@ -10849,69 -9483,66 +10968,69 @@@ msgstr "
  msgid "Enter Another Credit Note"
  msgstr ""
  
- #: ../purchasing/supplier_credit.php:118
- #: ../purchasing/supplier_invoice.php:127
 -#: purchasing/supplier_credit.php:102 purchasing/supplier_invoice.php:112
++#: ../purchasing/supplier_credit.php:127
++#: ../purchasing/supplier_invoice.php:137
  msgid ""
  "The account code entered is not a valid code, this line cannot be added to "
  "the transaction."
  msgstr ""
  
- #: ../purchasing/supplier_credit.php:128
- #: ../purchasing/supplier_invoice.php:137
 -#: purchasing/supplier_credit.php:112 purchasing/supplier_invoice.php:122
++#: ../purchasing/supplier_credit.php:137
++#: ../purchasing/supplier_invoice.php:147
  msgid ""
  "The amount entered is not numeric. This line cannot be added to the "
  "transaction."
  msgstr ""
  
- #: ../purchasing/supplier_credit.php:158
 -#: purchasing/supplier_credit.php:142
++#: ../purchasing/supplier_credit.php:168
  msgid ""
  "The credit note cannot be processed because the there are no items or values "
  "on the invoice.  Credit notes are expected to have a charge."
  msgstr ""
  
- #: ../purchasing/supplier_credit.php:165
 -#: purchasing/supplier_credit.php:149
++#: ../purchasing/supplier_credit.php:175
  msgid "You must enter an credit note reference."
  msgstr ""
  
- #: ../purchasing/supplier_credit.php:179
 -#: purchasing/supplier_credit.php:163
++#: ../purchasing/supplier_credit.php:189
  msgid "You must enter a supplier's credit note reference."
  msgstr ""
  
- #: ../purchasing/supplier_credit.php:186
 -#: purchasing/supplier_credit.php:170
++#: ../purchasing/supplier_credit.php:196
  msgid ""
  "The credit note as entered cannot be processed because the date entered is "
  "not valid."
  msgstr ""
  
- #: ../purchasing/supplier_credit.php:198
- #: ../purchasing/supplier_invoice.php:205
 -#: purchasing/supplier_credit.php:182 purchasing/supplier_invoice.php:191
++#: ../purchasing/supplier_credit.php:208
++#: ../purchasing/supplier_invoice.php:216
  msgid ""
  "The invoice as entered cannot be processed because the due date is in an "
  "incorrect format."
  msgstr ""
  
- #: ../purchasing/supplier_credit.php:205
 -#: purchasing/supplier_credit.php:189
++#: ../purchasing/supplier_credit.php:215
  msgid ""
  "The credit note total as entered is less than the sum of the the general "
  "ledger entires (if any) and the charges for goods received. There must be a "
  "mistake somewhere, the credit note as entered will not be processed."
  msgstr ""
  
- #: ../purchasing/supplier_credit.php:217
 -#: purchasing/supplier_credit.php:201
++#: ../purchasing/supplier_credit.php:227
  msgid ""
  "The return cannot be processed because there is an insufficient quantity for "
  "item:"
  msgstr ""
  
- #: ../purchasing/supplier_credit.php:260
 -#: purchasing/supplier_credit.php:244
++#: ../purchasing/supplier_credit.php:270
  msgid "The quantity to credit must be numeric and greater than zero."
  msgstr ""
  
- #: ../purchasing/supplier_credit.php:267
 -#: purchasing/supplier_credit.php:251
++#: ../purchasing/supplier_credit.php:277
  msgid "The price is either not numeric or negative."
  msgstr ""
  
- #: ../purchasing/supplier_credit.php:369
 -#: purchasing/supplier_credit.php:353
++#: ../purchasing/supplier_credit.php:379
  msgid "Enter Credit Note"
  msgstr ""
  
@@@ -10932,47 -9558,46 +11051,51 @@@ msgstr "
  msgid "View this Invoice"
  msgstr ""
  
- #: ../purchasing/supplier_invoice.php:73
 -#: purchasing/supplier_invoice.php:51
++#: ../purchasing/supplier_invoice.php:71
++msgid "Entry supplier &payment for this invoice"
++msgstr ""
++
++#: ../purchasing/supplier_invoice.php:74
  msgid "Enter Another Invoice"
  msgstr ""
  
- #: ../purchasing/supplier_invoice.php:166
 -#: purchasing/supplier_invoice.php:152
++#: ../purchasing/supplier_invoice.php:177
  msgid ""
  "The invoice cannot be processed because the there are no items or values on "
  "the invoice.  Invoices are expected to have a charge."
  msgstr ""
  
- #: ../purchasing/supplier_invoice.php:172
 -#: purchasing/supplier_invoice.php:158
++#: ../purchasing/supplier_invoice.php:183
  msgid "You must enter an invoice reference."
  msgstr ""
  
- #: ../purchasing/supplier_invoice.php:193
 -#: purchasing/supplier_invoice.php:179
++#: ../purchasing/supplier_invoice.php:204
  msgid ""
  "The invoice as entered cannot be processed because the invoice date is in an "
  "incorrect format."
  msgstr ""
  
- #: ../purchasing/supplier_invoice.php:254
 -#: purchasing/supplier_invoice.php:235
++#: ../purchasing/supplier_invoice.php:265
  msgid "The quantity to invoice must be numeric and greater than zero."
  msgstr ""
  
- #: ../purchasing/supplier_invoice.php:261
 -#: purchasing/supplier_invoice.php:242
++#: ../purchasing/supplier_invoice.php:272
  msgid "The price is not numeric."
  msgstr ""
  
- #: ../purchasing/supplier_invoice.php:274
 -#: purchasing/supplier_invoice.php:255
++#: ../purchasing/supplier_invoice.php:285
  msgid ""
  "The price being invoiced is more than the purchase order price by more than "
  "the allowed over-charge percentage. The system is set up to prohibit this. "
  "See the system administrator to modify the set up parameters if necessary."
  msgstr ""
  
- #: ../purchasing/supplier_invoice.php:275
- #: ../purchasing/supplier_invoice.php:288
 -#: purchasing/supplier_invoice.php:256 purchasing/supplier_invoice.php:269
++#: ../purchasing/supplier_invoice.php:286
++#: ../purchasing/supplier_invoice.php:299
  msgid "The over-charge percentage allowance is :"
  msgstr ""
  
- #: ../purchasing/supplier_invoice.php:287
 -#: purchasing/supplier_invoice.php:268
++#: ../purchasing/supplier_invoice.php:298
  msgid ""
  "The quantity being invoiced is more than the outstanding quantity by more "
  "than the allowed over-charge percentage. The system is set up to prohibit "
  "necessary."
  msgstr ""
  
- #: ../purchasing/supplier_invoice.php:366
 -#: purchasing/supplier_invoice.php:337
++#: ../purchasing/supplier_invoice.php:376
  #, php-format
  msgid "All yet non-invoiced items on delivery line # %d has been removed."
  msgstr ""
  
- #: ../purchasing/supplier_invoice.php:408
 -#: purchasing/supplier_invoice.php:379
++#: ../purchasing/supplier_invoice.php:418
  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 ""
  
 -#: purchasing/supplier_payment.php:92
 +#: ../purchasing/supplier_payment.php:92
- #: ../purchasing/supplier_payment.php.orig:85
  msgid "Invalid purchase invoice number."
  msgstr ""
  
 -#: purchasing/supplier_payment.php:98
 +#: ../purchasing/supplier_payment.php:98
- #: ../purchasing/supplier_payment.php.orig:91
  msgid "Payment has been sucessfully entered"
  msgstr ""
  
 -#: purchasing/supplier_payment.php:100
 +#: ../purchasing/supplier_payment.php:100
- #: ../purchasing/supplier_payment.php.orig:93
  msgid "&Print This Remittance"
  msgstr ""
  
 -#: purchasing/supplier_payment.php:101
 +#: ../purchasing/supplier_payment.php:101
- #: ../purchasing/supplier_payment.php.orig:94
  msgid "&Email This Remittance"
  msgstr ""
  
  msgid "View this Payment"
  msgstr ""
  
 -#: purchasing/supplier_payment.php:104
 +#: ../purchasing/supplier_payment.php:104
- #: ../purchasing/supplier_payment.php.orig:96
  msgid "View the GL &Journal Entries for this Payment"
  msgstr ""
  
- #: ../purchasing/supplier_payment.php.orig:98
- msgid "Select Another &Supplier Transaction for Payment"
 -#: purchasing/supplier_payment.php:106
++#: ../purchasing/supplier_payment.php:106
+ msgid "Enter another supplier &payment"
  msgstr ""
  
- #: ../purchasing/supplier_payment.php.orig:101
- msgid "Enter Another Supplier &Payment"
 -#: purchasing/supplier_payment.php:107 sales/customer_payments.php:106
++#: ../purchasing/supplier_payment.php:107
++#: ../sales/customer_payments.php:106
+ msgid "Enter Other &Payment"
  msgstr ""
  
- #: ../purchasing/supplier_payment.php.orig:148
- #: ../sales/customer_payments.php.orig:198
- msgid "The exchange rate must be numeric and greater than zero."
 -#: purchasing/supplier_payment.php:108
++#: ../purchasing/supplier_payment.php:108
+ msgid "Enter &Customer Payment"
+ msgstr ""
 -#: purchasing/supplier_payment.php:109 sales/customer_payments.php:104
++#: ../purchasing/supplier_payment.php:109
++#: ../sales/customer_payments.php:104
+ msgid "Enter Other &Deposit"
+ msgstr ""
 -#: purchasing/supplier_payment.php:110 sales/customer_payments.php:107
++#: ../purchasing/supplier_payment.php:110
++#: ../sales/customer_payments.php:107
+ msgid "Bank Account &Transfer"
  msgstr ""
  
- #: ../purchasing/supplier_payment.php.orig:160
 -#: purchasing/supplier_payment.php:162
++#: ../purchasing/supplier_payment.php:162
  msgid "The entered discount is invalid or less than zero."
  msgstr ""
  
- #: ../purchasing/supplier_payment.php.orig:168
 -#: purchasing/supplier_payment.php:170
++#: ../purchasing/supplier_payment.php:170
  msgid ""
  "The total of the amount and the discount is zero or negative. Please enter "
  "positive values."
  msgstr ""
  
- #: ../purchasing/supplier_payment.php.orig:275
 -#: purchasing/supplier_payment.php:177
++#: ../purchasing/supplier_payment.php:177
+ msgid "The entered bank amount is zero or negative."
+ msgstr ""
 -#: purchasing/supplier_payment.php:191
 -msgid ""
 -"The entered date is out of fiscal year or is closed for further data entry."
 -msgstr ""
 -
 -#: purchasing/supplier_payment.php:275
++#: ../purchasing/supplier_payment.php:275
  msgid "Payment To:"
  msgstr ""
  
- #: ../purchasing/supplier_payment.php.orig:288
 -#: purchasing/supplier_payment.php:290
++#: ../purchasing/supplier_payment.php:290
  msgid "From Bank Account:"
  msgstr ""
  
- #: ../purchasing/supplier_payment.php.orig:296
 -#: purchasing/supplier_payment.php:296
 -#: purchasing/view/view_supp_payment.php:55
++#: ../purchasing/supplier_payment.php:296
 +#: ../purchasing/view/view_supp_payment.php:55
  msgid "Date Paid"
  msgstr ""
  
- #: ../purchasing/supplier_payment.php.orig:319
- #: ../sales/customer_payments.php.orig:405
- msgid "Amount of Discount:"
 -#: purchasing/supplier_payment.php:310
++#: ../purchasing/supplier_payment.php:310
+ msgid "Bank Amount:"
  msgstr ""
  
- #: ../purchasing/supplier_payment.php.orig:320
- msgid "Amount of Payment:"
 -#: purchasing/supplier_payment.php:323 sales/customer_payments.php:395
++#: ../purchasing/supplier_payment.php:323
++#: ../sales/customer_payments.php:398
+ msgid "Amount of Discount:"
  msgstr ""
  
- #: ../purchasing/supplier_payment.php.orig:326
- msgid "The amount and discount are in the bank account's currency."
 -#: purchasing/supplier_payment.php:324
++#: ../purchasing/supplier_payment.php:324
+ msgid "Amount of Payment:"
  msgstr ""
  
- #: ../purchasing/supplier_payment.php.orig:329
 -#: purchasing/supplier_payment.php:328
++#: ../purchasing/supplier_payment.php:328
  msgid "Enter Payment"
  msgstr ""
  
@@@ -11124,13 -9753,13 +11255,13 @@@ msgstr "
  msgid "Requested By"
  msgstr ""
  
 -#: purchasing/view/view_po.php:100
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:148
 -#: purchasing/inquiry/supplier_inquiry.php:193
 -#: sales/inquiry/customer_allocation_inquiry.php:165
 -#: sales/inquiry/customer_inquiry.php:244
 -#: sales/inquiry/sales_deliveries_view.php:206
 -#: sales/inquiry/sales_orders_view.php:318
 +#: ../purchasing/view/view_po.php:100
 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:148
 +#: ../purchasing/inquiry/supplier_inquiry.php:197
 +#: ../sales/inquiry/customer_allocation_inquiry.php:165
 +#: ../sales/inquiry/customer_inquiry.php:227
 +#: ../sales/inquiry/sales_deliveries_view.php:206
- #: ../sales/inquiry/sales_orders_view.php.orig:344
++#: ../sales/inquiry/sales_orders_view.php:345
  msgid "Marked items are overdue."
  msgstr ""
  
@@@ -11182,8 -9806,8 +11313,10 @@@ msgstr "
  msgid "SUPPLIER INVOICE"
  msgstr ""
  
 -#: purchasing/view/view_supp_invoice.php:72 reporting/rep107.php:198
 -#: sales/view/view_invoice.php:164
 +#: ../purchasing/view/view_supp_invoice.php:73
++#: ../reporting/rep107.php:280
++#: ../reporting/rep107.php:286
 +#: ../sales/view/view_invoice.php:166
  msgid "TOTAL INVOICE"
  msgstr ""
  
@@@ -11208,14 -9831,10 +11341,14 @@@ msgstr "
  msgid "Payment Currency"
  msgstr ""
  
 -#: purchasing/view/view_supp_payment.php:62 reporting/rep112.php:162
 -#: reporting/rep210.php:171 sales/customer_delivery.php:433
 -#: sales/customer_invoice.php:479 sales/view/view_receipt.php:45
 -#: sales/view/view_sales_order.php:202
 +#: ../purchasing/view/view_supp_payment.php:62
 +#: ../reporting/rep112.php:150
 +#: ../reporting/rep210.php:159
 +#: ../sales/customer_delivery.php:447
- #: ../sales/customer_invoice.php:542
- #: ../sales/customer_invoice.php:545
++#: ../sales/customer_invoice.php:551
++#: ../sales/customer_invoice.php:554
 +#: ../sales/view/view_receipt.php:45
 +#: ../sales/view/view_sales_order.php:220
  msgid "Discount"
  msgstr ""
  
@@@ -11246,162 -9864,148 +11379,162 @@@ msgstr "
  msgid "Website:"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:108
 -#: purchasing/manage/suppliers.php:106
++#: ../purchasing/manage/suppliers.php:109
  msgid "Our Customer No:"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:110
 -#: purchasing/manage/suppliers.php:108
++#: ../purchasing/manage/suppliers.php:111
  msgid "Purchasing"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:111
 -#: purchasing/manage/suppliers.php:109
++#: ../purchasing/manage/suppliers.php:112
  msgid "Bank Name/Account:"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:112
- #: ../sales/manage/customers.php:267
 -#: purchasing/manage/suppliers.php:110 sales/manage/customers.php:267
++#: ../purchasing/manage/suppliers.php:113
++#: ../sales/manage/customers.php:268
  msgid "Credit Limit:"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:113
- #: ../sales/manage/customers.php:269
 -#: purchasing/manage/suppliers.php:111 sales/manage/customers.php:269
++#: ../purchasing/manage/suppliers.php:114
++#: ../sales/manage/customers.php:270
  msgid "Payment Terms:"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:119
- #: ../purchasing/manage/suppliers.php:122
 -#: purchasing/manage/suppliers.php:117 purchasing/manage/suppliers.php:120
++#: ../purchasing/manage/suppliers.php:120
++#: ../purchasing/manage/suppliers.php:123
  msgid "Prices contain tax included:"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:124
 -#: purchasing/manage/suppliers.php:122 reporting/rep704.php:96
 -#: reporting/rep704.php:106 reporting/rep704.php:114
++#: ../purchasing/manage/suppliers.php:125
 +msgid "Tax Calculation Algorithm:"
 +msgstr ""
 +
- #: ../purchasing/manage/suppliers.php:128
++#: ../purchasing/manage/suppliers.php:129
 +#: ../reporting/rep704.php:96
 +#: ../reporting/rep704.php:106
 +#: ../reporting/rep704.php:114
  msgid "Accounts"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:129
 -#: purchasing/manage/suppliers.php:123
++#: ../purchasing/manage/suppliers.php:130
  msgid "Accounts Payable Account:"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:130
 -#: purchasing/manage/suppliers.php:124
++#: ../purchasing/manage/suppliers.php:131
  msgid "Purchase Account:"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:131
 -#: purchasing/manage/suppliers.php:125
++#: ../purchasing/manage/suppliers.php:132
  msgid "Use Item Inventory/COGS Account"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:134
- #: ../purchasing/manage/suppliers.php:137
 -#: purchasing/manage/suppliers.php:128 purchasing/manage/suppliers.php:157
++#: ../purchasing/manage/suppliers.php:135
++#: ../purchasing/manage/suppliers.php:139
  msgid "Contact Data"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:140
 -#: purchasing/manage/suppliers.php:148 sales/manage/customer_branches.php:266
++#: ../purchasing/manage/suppliers.php:142
 +msgid "System default"
 +msgstr ""
 +
- #: ../purchasing/manage/suppliers.php:157
++#: ../purchasing/manage/suppliers.php:159
 +#: ../sales/manage/customer_branches.php:268
  msgid "Addresses"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:158
 -#: purchasing/manage/suppliers.php:149 reporting/rep205.php:102
 -#: sales/manage/customer_branches.php:267
++#: ../purchasing/manage/suppliers.php:160
 +#: ../reporting/rep205.php:102
 +#: ../sales/manage/customer_branches.php:269
  msgid "Mailing Address:"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:159
 -#: purchasing/manage/suppliers.php:150
++#: ../purchasing/manage/suppliers.php:161
  msgid "Physical Address:"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:161
 -#: purchasing/manage/suppliers.php:152
++#: ../purchasing/manage/suppliers.php:163
  msgid "General"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:162
 -#: purchasing/manage/suppliers.php:153 sales/manage/customer_branches.php:269
 -#: sales/manage/customers.php:290
++#: ../purchasing/manage/suppliers.php:164
 +#: ../sales/manage/customer_branches.php:271
- #: ../sales/manage/customers.php:290
++#: ../sales/manage/customers.php:291
  msgid "General Notes:"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:164
 -#: purchasing/manage/suppliers.php:155
++#: ../purchasing/manage/suppliers.php:166
  msgid "Supplier status:"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:170
 -#: purchasing/manage/suppliers.php:161
 -msgid "System default"
 -msgstr ""
 -
 -#: purchasing/manage/suppliers.php:168
++#: ../purchasing/manage/suppliers.php:172
  msgid "Update Supplier"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:171
 -#: purchasing/manage/suppliers.php:169
++#: ../purchasing/manage/suppliers.php:173
  msgid "Update supplier data"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:172
 -#: purchasing/manage/suppliers.php:170
++#: ../purchasing/manage/suppliers.php:174
  msgid "Select this supplier and return to document entry."
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:173
 -#: purchasing/manage/suppliers.php:171
++#: ../purchasing/manage/suppliers.php:175
  msgid "Delete Supplier"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:174
 -#: purchasing/manage/suppliers.php:172
++#: ../purchasing/manage/suppliers.php:176
  msgid "Delete supplier data if have been never used"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:178
 -#: purchasing/manage/suppliers.php:176
++#: ../purchasing/manage/suppliers.php:180
  msgid "Add New Supplier Details"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:197
 -#: purchasing/manage/suppliers.php:195
++#: ../purchasing/manage/suppliers.php:199
  msgid "The supplier name must be entered."
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:204
 -#: purchasing/manage/suppliers.php:202
++#: ../purchasing/manage/suppliers.php:206
  msgid "The supplier short name must be entered."
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:224
 -#: purchasing/manage/suppliers.php:222
++#: ../purchasing/manage/suppliers.php:226
  msgid "Supplier has been updated."
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:242
 -#: purchasing/manage/suppliers.php:240
++#: ../purchasing/manage/suppliers.php:244
  msgid "A new supplier has been added."
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:260
 -#: purchasing/manage/suppliers.php:258
++#: ../purchasing/manage/suppliers.php:262
  msgid ""
  "Cannot delete this supplier because there are transactions that refer to "
  "this supplier."
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:268
 -#: purchasing/manage/suppliers.php:266
++#: ../purchasing/manage/suppliers.php:270
  msgid ""
  "Cannot delete the supplier record because purchase orders have been created "
  "against this supplier."
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:289
 -#: purchasing/manage/suppliers.php:287
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:48
++#: ../purchasing/manage/suppliers.php:291
 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:48
  msgid "Select a supplier: "
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:290
 -#: purchasing/manage/suppliers.php:288
++#: ../purchasing/manage/suppliers.php:292
  msgid "New supplier"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:309
 -#: purchasing/manage/suppliers.php:307 sales/manage/customer_branches.php:323
 -#: sales/manage/customers.php:348
++#: ../purchasing/manage/suppliers.php:311
 +#: ../sales/manage/customer_branches.php:325
- #: ../sales/manage/customers.php:348
++#: ../sales/manage/customers.php:349
  msgid "&Contacts"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:311
 -#: purchasing/manage/suppliers.php:309
++#: ../purchasing/manage/suppliers.php:313
  msgid "Purchase &Orders"
  msgstr ""
  
  msgid "Search Purchase Orders"
  msgstr ""
  
 -#: purchasing/inquiry/po_search_completed.php:63
 -#: purchasing/inquiry/po_search.php:62
 -#: sales/inquiry/sales_deliveries_view.php:103
 -#: sales/inquiry/sales_orders_view.php:225
 +#: ../purchasing/inquiry/po_search_completed.php:60
 +#: ../purchasing/inquiry/po_search.php:62
 +#: ../sales/inquiry/sales_deliveries_view.php:103
 +#: ../sales/inquiry/sales_orders_view.php:247
- #: ../sales/inquiry/sales_orders_view.php.orig:247
  msgid "#:"
  msgstr ""
  
  msgid "into location:"
  msgstr ""
  
 -#: purchasing/inquiry/po_search_completed.php:126
 -#: purchasing/inquiry/po_search.php:135 reporting/includes/doctext.inc:166
 -#: sales/inquiry/sales_orders_view.php:267
 +#: ../purchasing/inquiry/po_search_completed.php:125
 +#: ../purchasing/inquiry/po_search.php:135
 +#: ../reporting/includes/doctext.inc:188
- #: ../sales/inquiry/sales_orders_view.php.orig:289
++#: ../sales/inquiry/sales_orders_view.php:290
  msgid "Order Date"
  msgstr ""
  
 -#: purchasing/inquiry/po_search_completed.php:128
 -#: purchasing/inquiry/po_search.php:137
 -#: sales/inquiry/sales_orders_view.php:270
 +#: ../purchasing/inquiry/po_search_completed.php:127
 +#: ../purchasing/inquiry/po_search.php:137
- #: ../sales/inquiry/sales_orders_view.php.orig:292
++#: ../sales/inquiry/sales_orders_view.php:293
  msgid "Order Total"
  msgstr ""
  
@@@ -11463,11 -10065,10 +11595,11 @@@ msgstr "
  msgid "Supp Reference"
  msgstr ""
  
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:136
 -#: reporting/rep101.php:119 reporting/rep201.php:111
 -#: reporting/includes/doctext.inc:225
 -#: sales/inquiry/customer_allocation_inquiry.php:154
 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:136
- #: ../reporting/rep101.php:148
- #: ../reporting/rep201.php:136
++#: ../reporting/rep101.php:119
++#: ../reporting/rep201.php:111
 +#: ../reporting/includes/doctext.inc:247
 +#: ../sales/inquiry/customer_allocation_inquiry.php:154
  msgid "Allocated"
  msgstr ""
  
@@@ -11479,32 -10080,23 +11611,37 @@@ msgstr "
  msgid "Select a supplier:"
  msgstr ""
  
 -#: purchasing/inquiry/supplier_inquiry.php:70
 -#: purchasing/inquiry/supplier_inquiry.php:71
 -#: purchasing/inquiry/supplier_inquiry.php:72 reporting/rep102.php:120
 -#: reporting/rep102.php:121 reporting/rep102.php:122 reporting/rep102.php:244
 -#: reporting/rep108.php:151 reporting/rep108.php:152 reporting/rep108.php:153
 -#: reporting/rep202.php:124 reporting/rep202.php:125 reporting/rep202.php:126
 -#: reporting/rep202.php:158 reporting/rep202.php:159 reporting/rep202.php:160
 -#: reporting/rep202.php:252 sales/create_recurrent_invoices.php:134
 -#: sales/manage/recurrent_invoices.php:102
 -#: sales/inquiry/customer_inquiry.php:75 sales/inquiry/customer_inquiry.php:76
 -#: sales/inquiry/customer_inquiry.php:77
 +#: ../purchasing/inquiry/supplier_inquiry.php:67
 +#: ../purchasing/inquiry/supplier_inquiry.php:68
 +#: ../purchasing/inquiry/supplier_inquiry.php:69
 +#: ../reporting/rep102.php:120
 +#: ../reporting/rep102.php:121
 +#: ../reporting/rep102.php:122
++#: ../reporting/rep102.php:244
++#: ../reporting/rep108.php:151
++#: ../reporting/rep108.php:152
++#: ../reporting/rep108.php:153
 +#: ../reporting/rep202.php:124
 +#: ../reporting/rep202.php:125
 +#: ../reporting/rep202.php:126
 +#: ../reporting/rep202.php:158
 +#: ../reporting/rep202.php:159
 +#: ../reporting/rep202.php:160
 +#: ../reporting/rep202.php:252
 +#: ../sales/create_recurrent_invoices.php:134
 +#: ../sales/manage/recurrent_invoices.php:102
 +#: ../sales/inquiry/customer_inquiry.php:71
 +#: ../sales/inquiry/customer_inquiry.php:72
 +#: ../sales/inquiry/customer_inquiry.php:73
  msgid "Days"
  msgstr ""
  
 -#: purchasing/inquiry/supplier_inquiry.php:72 reporting/rep102.php:122
 -#: reporting/rep108.php:153 reporting/rep202.php:126 reporting/rep202.php:160
 -#: sales/inquiry/customer_inquiry.php:77
 +#: ../purchasing/inquiry/supplier_inquiry.php:69
 +#: ../reporting/rep102.php:122
++#: ../reporting/rep108.php:153
 +#: ../reporting/rep202.php:126
 +#: ../reporting/rep202.php:160
 +#: ../sales/inquiry/customer_inquiry.php:73
  msgid "Over"
  msgstr ""
  
  msgid "Terms"
  msgstr ""
  
 -#: purchasing/inquiry/supplier_inquiry.php:76 reporting/rep102.php:125
 -#: reporting/rep102.php:242 reporting/rep108.php:155 reporting/rep202.php:130
 -#: reporting/rep202.php:250 sales/inquiry/customer_inquiry.php:80
 +#: ../purchasing/inquiry/supplier_inquiry.php:73
 +#: ../reporting/rep102.php:125
++#: ../reporting/rep102.php:242
++#: ../reporting/rep108.php:155
 +#: ../reporting/rep202.php:130
 +#: ../reporting/rep202.php:250
 +#: ../sales/inquiry/customer_inquiry.php:76
  msgid "Current"
  msgstr ""
  
 -#: purchasing/inquiry/supplier_inquiry.php:77 reporting/rep102.php:126
 -#: reporting/rep108.php:155 reporting/rep202.php:131
 -#: sales/inquiry/customer_inquiry.php:81
 +#: ../purchasing/inquiry/supplier_inquiry.php:74
 +#: ../reporting/rep102.php:126
++#: ../reporting/rep108.php:155
 +#: ../reporting/rep202.php:131
 +#: ../sales/inquiry/customer_inquiry.php:77
  msgid "Total Balance"
  msgstr ""
  
@@@ -11550,37 -10139,37 +11690,37 @@@ msgstr "
  msgid "Total:"
  msgstr ""
  
 -#: purchasing/allocations/supplier_allocate.php:62
 -#: sales/allocations/customer_allocate.php:59
 -msgid "Total in clearing currency:"
 +#: ../purchasing/allocations/supplier_allocate.php:62
 +#: ../sales/allocations/customer_allocate.php:59
- msgid "Total in clearing currency:"
- msgstr ""
- #: ../purchasing/allocations/supplier_allocate.php:73
- #: ../sales/allocations/customer_allocate.php:71
- msgid "Start again allocation of selected amount"
++msgid "Amount ot be settled:"
  msgstr ""
  
 -#: purchasing/allocations/supplier_allocate.php:73
 -#: sales/allocations/customer_allocate.php:71
 +#: ../purchasing/allocations/supplier_allocate.php:74
 +#: ../sales/allocations/customer_allocate.php:72
- msgid "Process allocations"
+ msgid "Start again allocation of selected amount"
  msgstr ""
  
 -#: purchasing/allocations/supplier_allocate.php:74
 -#: sales/allocations/customer_allocate.php:72
 +#: ../purchasing/allocations/supplier_allocate.php:75
- #: ../purchasing/allocations/supplier_allocate.php:81
 +#: ../sales/allocations/customer_allocate.php:73
- #: ../sales/allocations/customer_allocate.php:79
- msgid "Back to Allocations"
+ msgid "Process allocations"
  msgstr ""
  
 -#: purchasing/allocations/supplier_allocate.php:75
 -#: purchasing/allocations/supplier_allocate.php:81
 -#: sales/allocations/customer_allocate.php:73
 -#: sales/allocations/customer_allocate.php:79
 +#: ../purchasing/allocations/supplier_allocate.php:76
 +#: ../purchasing/allocations/supplier_allocate.php:82
- #: ../sales/allocations/customer_allocate.php:73
++#: ../sales/allocations/customer_allocate.php:74
 +#: ../sales/allocations/customer_allocate.php:80
+ msgid "Back to Allocations"
+ msgstr ""
 -#: purchasing/allocations/supplier_allocate.php:76
 -#: purchasing/allocations/supplier_allocate.php:82
 -#: sales/allocations/customer_allocate.php:73
 -#: sales/allocations/customer_allocate.php:80
++#: ../purchasing/allocations/supplier_allocate.php:77
++#: ../purchasing/allocations/supplier_allocate.php:83
++#: ../sales/allocations/customer_allocate.php:74
++#: ../sales/allocations/customer_allocate.php:81
  msgid "Abandon allocations and return to selection of allocatable amounts"
  msgstr ""
  
- #: ../purchasing/allocations/supplier_allocate.php:80
- #: ../sales/allocations/customer_allocate.php:77
 -#: purchasing/allocations/supplier_allocate.php:80
 -#: sales/allocations/customer_allocate.php:77
++#: ../purchasing/allocations/supplier_allocate.php:81
++#: ../sales/allocations/customer_allocate.php:78
  msgid "There are no unsettled transactions to allocate."
  msgstr ""
  
@@@ -11607,63 -10196,50 +11747,79 @@@ msgstr "
  msgid "Marked items are settled."
  msgstr ""
  
- #: ../reporting/rep101.php:137
 -#: reporting/rep101.php:108 reporting/rep102.php:108 reporting/rep114.php:108
 -#: reporting/rep202.php:112 reporting/rep203.php:83
++#: ../reporting/rep101.php:108
 +#: ../reporting/rep102.php:108
 +#: ../reporting/rep114.php:108
 +#: ../reporting/rep202.php:112
 +#: ../reporting/rep203.php:83
  msgid "Balances in Home Currency"
  msgstr ""
  
- #: ../reporting/rep101.php:147
- #: ../reporting/rep201.php:135
 -#: reporting/rep101.php:118 reporting/rep201.php:110 reporting/rep203.php:93
 -#: reporting/rep709.php:111 reporting/includes/doctext.inc:145
 -#: reporting/includes/doctext.inc:186 reporting/includes/doctext.inc:224
++#: ../reporting/rep101.php:118
++#: ../reporting/rep201.php:110
 +#: ../reporting/rep203.php:93
 +#: ../reporting/rep709.php:111
 +#: ../reporting/includes/doctext.inc:167
 +#: ../reporting/includes/doctext.inc:208
 +#: ../reporting/includes/doctext.inc:246
  msgid "Trans Type"
  msgstr ""
  
- #: ../reporting/rep101.php:147
- #: ../reporting/rep201.php:135
 -#: reporting/rep101.php:118 reporting/rep201.php:110
 -#: reporting/includes/doctext.inc:224
++#: ../reporting/rep101.php:118
++#: ../reporting/rep201.php:110
 +#: ../reporting/includes/doctext.inc:246
  msgid "Charges"
  msgstr ""
  
- #: ../reporting/rep101.php:147
- #: ../reporting/rep201.php:136
 -#: reporting/rep101.php:118 reporting/rep201.php:111
 -#: reporting/includes/doctext.inc:225
++#: ../reporting/rep101.php:118
++#: ../reporting/rep201.php:111
 +#: ../reporting/includes/doctext.inc:247
  msgid "Credits"
  msgstr ""
  
- #: ../reporting/rep101.php:158
 -#: reporting/rep101.php:129 reporting/rep102.php:136 reporting/rep201.php:121
 -#: reporting/rep202.php:141 reporting/rep203.php:102 reporting/rep303.php:136
 -#: reporting/reports_main.php:39 reporting/reports_main.php:49
 -#: reporting/reports_main.php:156 reporting/reports_main.php:166
 -#: reporting/reports_main.php:175 reporting/reports_main.php:227
++#: ../reporting/rep101.php:129
 +#: ../reporting/rep102.php:136
- #: ../reporting/rep201.php:146
++#: ../reporting/rep201.php:121
 +#: ../reporting/rep202.php:141
 +#: ../reporting/rep203.php:102
 +#: ../reporting/rep303.php:136
 +#: ../reporting/reports_main.php:39
 +#: ../reporting/reports_main.php:49
 +#: ../reporting/reports_main.php:156
 +#: ../reporting/reports_main.php:166
 +#: ../reporting/reports_main.php:175
 +#: ../reporting/reports_main.php:227
  msgid "Suppress Zeros"
  msgstr ""
  
- #: ../reporting/rep101.php:160
 -#: reporting/rep101.php:131
++#: ../reporting/rep101.php:131
  msgid "Customer Balances"
  msgstr ""
  
 -#: reporting/rep101.php:241 reporting/rep102.php:228 reporting/rep106.php:171
 -#: reporting/rep201.php:233 reporting/rep202.php:235 reporting/rep203.php:181
 -#: reporting/rep204.php:148 reporting/rep301.php:179 reporting/rep304.php:195
 -#: reporting/rep305.php:188 reporting/rep306.php:293 reporting/rep309.php:158
++#: ../reporting/rep101.php:241
++#: ../reporting/rep102.php:228
++#: ../reporting/rep106.php:171
++#: ../reporting/rep201.php:233
++#: ../reporting/rep202.php:235
++#: ../reporting/rep203.php:181
++#: ../reporting/rep204.php:148
++#: ../reporting/rep301.php:179
++#: ../reporting/rep304.php:195
++#: ../reporting/rep305.php:188
++#: ../reporting/rep306.php:293
++#: ../reporting/rep309.php:158
+ msgid "Grand Total"
+ msgstr ""
 -#: reporting/rep102.php:102 reporting/rep106.php:93 reporting/rep202.php:106
 -#: reporting/rep709.php:95 reporting/reports_main.php:48
 -#: reporting/reports_main.php:91 reporting/reports_main.php:165
 -#: reporting/reports_main.php:211 reporting/reports_main.php:484
 +#: ../reporting/rep102.php:102
 +#: ../reporting/rep106.php:93
 +#: ../reporting/rep202.php:106
 +#: ../reporting/rep709.php:95
 +#: ../reporting/reports_main.php:48
 +#: ../reporting/reports_main.php:91
 +#: ../reporting/reports_main.php:165
 +#: ../reporting/reports_main.php:211
++#: ../reporting/reports_main.php:490
  msgid "Summary Only"
  msgstr ""
  
  msgid "Detailed Report"
  msgstr ""
  
 -#: reporting/rep102.php:131 reporting/rep202.php:136 reporting/rep203.php:99
 -#: reporting/rep301.php:110 reporting/reports_main.php:35
 -#: reporting/reports_main.php:44 reporting/reports_main.php:65
 -#: reporting/reports_main.php:81 reporting/reports_main.php:90
 -#: reporting/reports_main.php:152 reporting/reports_main.php:161
 -#: reporting/reports_main.php:172 reporting/reports_main.php:208
 -#: reporting/reports_main.php:234 reporting/reports_main.php:243
 -#: reporting/reports_main.php:249 reporting/reports_main.php:259
 -#: reporting/reports_main.php:267 reporting/reports_main.php:275
 -#: reporting/reports_main.php:312 reporting/reports_main.php:326
 -#: reporting/reports_main.php:338 reporting/reports_main.php:356
 -#: reporting/reports_main.php:367 reporting/reports_main.php:379
 -#: reporting/reports_main.php:392 reporting/reports_main.php:408
 -#: reporting/reports_main.php:418 reporting/reports_main.php:429
 -#: reporting/reports_main.php:441 reporting/reports_main.php:455
 -#: reporting/reports_main.php:464 reporting/reports_main.php:474
 -#: reporting/reports_main.php:483 reporting/reports_main.php:490
 +#: ../reporting/rep102.php:131
 +#: ../reporting/rep202.php:136
 +#: ../reporting/rep203.php:99
 +#: ../reporting/rep301.php:110
 +#: ../reporting/reports_main.php:35
 +#: ../reporting/reports_main.php:44
 +#: ../reporting/reports_main.php:65
 +#: ../reporting/reports_main.php:81
 +#: ../reporting/reports_main.php:90
 +#: ../reporting/reports_main.php:152
 +#: ../reporting/reports_main.php:161
 +#: ../reporting/reports_main.php:172
 +#: ../reporting/reports_main.php:208
 +#: ../reporting/reports_main.php:234
 +#: ../reporting/reports_main.php:243
 +#: ../reporting/reports_main.php:249
 +#: ../reporting/reports_main.php:259
 +#: ../reporting/reports_main.php:267
 +#: ../reporting/reports_main.php:275
 +#: ../reporting/reports_main.php:312
++#: ../reporting/reports_main.php:320
++#: ../reporting/reports_main.php:332
++#: ../reporting/reports_main.php:344
++#: ../reporting/reports_main.php:362
++#: ../reporting/reports_main.php:373
++#: ../reporting/reports_main.php:385
++#: ../reporting/reports_main.php:398
++#: ../reporting/reports_main.php:414
++#: ../reporting/reports_main.php:424
++#: ../reporting/reports_main.php:435
++#: ../reporting/reports_main.php:447
++#: ../reporting/reports_main.php:461
++#: ../reporting/reports_main.php:470
++#: ../reporting/reports_main.php:480
++#: ../reporting/reports_main.php:489
++#: ../reporting/reports_main.php:496
  msgid "End Date"
  msgstr ""
  
@@@ -11793,15 -10351,12 +11965,7 @@@ msgstr "
  msgid "Turnover"
  msgstr ""
  
- #: ../reporting/rep103.php:277
- #: ../reporting/rep106.php:88
- #: ../reporting/rep205.php:195
- #: ../reporting/includes/header2.inc:110
- #: ../sales/manage/sales_people.php:99
 -#: reporting/rep103.php:277 reporting/rep106.php:88 reporting/rep205.php:195
 -#: reporting/includes/header2.inc:110 sales/manage/sales_people.php:99
--msgid "Email"
--msgstr ""
--
 -#: reporting/rep104.php:111
 +#: ../reporting/rep104.php:111
  msgid "Category/Items"
  msgstr ""
  
@@@ -11847,21 -10395,15 +12011,21 @@@ msgstr "
  msgid "Order"
  msgstr ""
  
 -#: reporting/rep105.php:109 reporting/rep106.php:83 reporting/rep112.php:187
 -#: sales/create_recurrent_invoices.php:134
 -#: sales/customer_credit_invoice.php:236 sales/customer_delivery.php:339
 -#: sales/customer_invoice.php:390 sales/manage/customers.php:254
 -#: sales/manage/customers.php:293 sales/manage/recurrent_invoices.php:102
 -#: sales/view/view_credit.php:58 sales/inquiry/customer_inquiry.php:224
 -#: sales/inquiry/sales_deliveries_view.php:182
 -#: sales/inquiry/sales_orders_view.php:265
 -#: sales/inquiry/sales_orders_view.php:279
 +#: ../reporting/rep105.php:109
 +#: ../reporting/rep106.php:83
 +#: ../reporting/rep112.php:175
 +#: ../sales/create_recurrent_invoices.php:134
 +#: ../sales/customer_credit_invoice.php:236
 +#: ../sales/customer_delivery.php:353
- #: ../sales/customer_invoice.php:447
- #: ../sales/manage/customers.php:254
- #: ../sales/manage/customers.php:293
++#: ../sales/customer_invoice.php:456
++#: ../sales/manage/customers.php:255
++#: ../sales/manage/customers.php:294
 +#: ../sales/manage/recurrent_invoices.php:102
 +#: ../sales/view/view_credit.php:58
 +#: ../sales/inquiry/customer_inquiry.php:207
 +#: ../sales/inquiry/sales_deliveries_view.php:182
- #: ../sales/inquiry/sales_orders_view.php.orig:287
- #: ../sales/inquiry/sales_orders_view.php.orig:301
++#: ../sales/inquiry/sales_orders_view.php:288
++#: ../sales/inquiry/sales_orders_view.php:302
  msgid "Branch"
  msgstr ""
  
@@@ -11883,10 -10423,8 +12047,10 @@@ msgstr "
  msgid "Loc"
  msgstr ""
  
 -#: reporting/rep105.php:114 sales/customer_delivery.php:432
 -#: sales/customer_invoice.php:478 sales/includes/ui/sales_order_ui.inc:145
 +#: ../reporting/rep105.php:114
 +#: ../sales/customer_delivery.php:446
- #: ../sales/customer_invoice.php:544
++#: ../sales/customer_invoice.php:553
 +#: ../sales/includes/ui/sales_order_ui.inc:146
  msgid "Delivered"
  msgstr ""
  
@@@ -11924,59 -10458,55 +12088,85 @@@ msgstr "
  msgid "Salesman Listing"
  msgstr ""
  
- #: ../reporting/rep106.php:171
- #: ../reporting/rep202.php:235
- #: ../reporting/rep203.php:181
- #: ../reporting/rep204.php:148
- #: ../reporting/rep301.php:179
- #: ../reporting/rep304.php:195
- #: ../reporting/rep305.php:188
- #: ../reporting/rep309.php:158
- msgid "Grand Total"
- msgstr ""
 -#: reporting/rep107.php:68 reporting/rep107.php:89
 -#: reporting/includes/doctext.inc:105
 +#: ../reporting/rep107.php:88
++#: ../reporting/rep107.php:111
 +#: ../reporting/includes/doctext.inc:118
  msgid "INVOICE"
  msgstr ""
  
- #: ../reporting/rep109.php:66
- #: ../reporting/rep109.php:94
- #: ../reporting/rep109.php:99
- #: ../reporting/includes/doctext.inc:65
- msgid "SALES ORDER"
 -#: reporting/rep107.php:153 reporting/rep109.php:152 reporting/rep110.php:162
 -#: reporting/rep111.php:137 reporting/rep113.php:147
 -#: sales/view/view_credit.php:138 sales/view/view_dispatch.php:155
 -#: sales/view/view_invoice.php:157 sales/view/view_sales_order.php:227
 -#: sales/includes/ui/sales_credit_ui.inc:222
++#: ../reporting/rep107.php:196
++msgid "Prepayments invoiced to this order up to day:"
 +msgstr ""
 +
- #: ../reporting/rep109.php:68
- #: ../reporting/rep109.php:89
- #: ../reporting/rep109.php:99
- #: ../reporting/includes/doctext.inc:65
- msgid "QUOTE"
++#: ../reporting/rep107.php:203
++msgid "Invoice reference"
++msgstr ""
++
++#: ../reporting/rep107.php:220
++msgid "Total payments:"
 +msgstr ""
 +
++#: ../reporting/rep107.php:234
 +#: ../reporting/rep109.php:158
 +#: ../reporting/rep110.php:162
 +#: ../reporting/rep111.php:137
 +#: ../reporting/rep113.php:147
 +#: ../sales/view/view_credit.php:138
 +#: ../sales/view/view_dispatch.php:155
 +#: ../sales/view/view_invoice.php:159
 +#: ../sales/view/view_sales_order.php:245
 +#: ../sales/includes/ui/sales_credit_ui.inc:222
  msgid "Shipping"
  msgstr ""
  
- #: ../reporting/rep109.php:164
- #: ../reporting/rep111.php:143
- msgid "TOTAL ORDER EX VAT"
- msgstr ""
 -#: reporting/rep108.php:85 reporting/rep108.php:110
 -#: reporting/includes/doctext.inc:216
++#: ../reporting/rep107.php:280
 +#: ../reporting/rep109.php:210
 +#: ../reporting/rep111.php:189
 +msgid "TOTAL ORDER VAT INCL."
 +msgstr ""
 +
++#: ../reporting/rep107.php:286
++msgid "THIS INVOICE"
++msgstr ""
++
++#: ../reporting/rep108.php:85
++#: ../reporting/rep108.php:110
++#: ../reporting/includes/doctext.inc:238
+ msgid "STATEMENT"
+ msgstr ""
 -#: reporting/rep108.php:127
++#: ../reporting/rep108.php:127
+ msgid "Outstanding Transactions"
+ msgstr ""
 -#: reporting/rep108.php:170
++#: ../reporting/rep108.php:170
+ msgid "Statement"
+ msgstr ""
 -#: reporting/rep108.php:170
++#: ../reporting/rep108.php:170
+ msgid "as of"
+ msgstr ""
 -#: reporting/rep109.php:65 reporting/rep109.php:88 reporting/rep109.php:93
 -#: reporting/includes/doctext.inc:53
++#: ../reporting/rep109.php:66
++#: ../reporting/rep109.php:94
++#: ../reporting/rep109.php:99
++#: ../reporting/includes/doctext.inc:65
+ msgid "SALES ORDER"
+ msgstr ""
 -#: reporting/rep109.php:67 reporting/rep109.php:83 reporting/rep109.php:93
 -#: reporting/includes/doctext.inc:53
++#: ../reporting/rep109.php:68
++#: ../reporting/rep109.php:89
++#: ../reporting/rep109.php:99
++#: ../reporting/includes/doctext.inc:65
+ msgid "QUOTE"
+ msgstr ""
 -#: reporting/rep109.php:158 reporting/rep111.php:143
++#: ../reporting/rep109.php:164
++#: ../reporting/rep111.php:143
+ msgid "TOTAL ORDER EX VAT"
+ msgstr ""
 -#: reporting/rep109.php:204 reporting/rep111.php:189
 -msgid "TOTAL ORDER VAT INCL."
 -msgstr ""
 -
 -#: reporting/rep110.php:70
 +#: ../reporting/rep110.php:70
  msgid "DELIVERY"
  msgstr ""
  
@@@ -12064,11 -10584,11 +12254,11 @@@ msgstr "
  msgid "Tax"
  msgstr ""
  
- #: ../reporting/rep201.php:125
 -#: reporting/rep201.php:100
++#: ../reporting/rep201.php:100
  msgid "Balances in Home currency"
  msgstr ""
  
- #: ../reporting/rep201.php:148
 -#: reporting/rep201.php:123
++#: ../reporting/rep201.php:123
  msgid "Supplier Balances"
  msgstr ""
  
@@@ -12189,10 -10703,8 +12379,10 @@@ msgstr "
  msgid "Qty"
  msgstr ""
  
 -#: reporting/rep304.php:114 reporting/rep309.php:98
 -#: sales/manage/customer_branches.php:240 sales/manage/customers.php:263
 +#: ../reporting/rep304.php:114
 +#: ../reporting/rep309.php:98
 +#: ../sales/manage/customer_branches.php:241
- #: ../sales/manage/customers.php:263
++#: ../sales/manage/customers.php:264
  msgid "Sales"
  msgstr ""
  
@@@ -12295,7 -10805,16 +12485,17 @@@ msgstr "
  msgid "Bill of Material Listing"
  msgstr ""
  
 -#: reporting/rep409.php:60 reporting/rep409.php:73
 -#: reporting/includes/doctext.inc:192
++#: ../reporting/rep409.php:59
++#: ../reporting/rep409.php:72
++#: ../reporting/includes/doctext.inc:214
+ msgid "WORK ORDER"
+ msgstr ""
 -#: reporting/rep409.php:129
++#: ../reporting/rep409.php:128
+ msgid "Insufficient stock"
+ msgstr ""
 -#: reporting/rep501.php:87
 +#: ../reporting/rep501.php:87
  msgid "YTD"
  msgstr ""
  
@@@ -12355,9 -10854,9 +12555,12 @@@ msgstr "
  msgid "GL Account Transactions"
  msgstr ""
  
 -#: reporting/rep705.php:247 reporting/rep705.php:260 reporting/rep705.php:271
 -#: reporting/reports_main.php:347 reporting/reports_main.php:400
 -#: reporting/reports_main.php:448
 +#: ../reporting/rep705.php:247
 +#: ../reporting/rep705.php:260
 +#: ../reporting/rep705.php:271
++#: ../reporting/reports_main.php:353
++#: ../reporting/reports_main.php:406
++#: ../reporting/reports_main.php:454
  msgid "Year"
  msgstr ""
  
@@@ -12423,7 -10914,7 +12626,8 @@@ msgstr "
  msgid "Action"
  msgstr ""
  
 -#: reporting/rep710.php:89 reporting/reports_main.php:488
 +#: ../reporting/rep710.php:89
++#: ../reporting/reports_main.php:494
  msgid "Audit Trail"
  msgstr ""
  
@@@ -12462,66 -10945,58 +12666,106 @@@ msgstr "
  msgid "Currency Filter"
  msgstr ""
  
 -#: reporting/reports_main.php:41 reporting/reports_main.php:52
 -#: reporting/reports_main.php:61 reporting/reports_main.php:68
 -#: reporting/reports_main.php:77 reporting/reports_main.php:86
 -#: reporting/reports_main.php:93 reporting/reports_main.php:103
 -#: reporting/reports_main.php:112 reporting/reports_main.php:119
 -#: reporting/reports_main.php:126 reporting/reports_main.php:134
 -#: reporting/reports_main.php:141 reporting/reports_main.php:147
 -#: reporting/reports_main.php:158 reporting/reports_main.php:169
 -#: reporting/reports_main.php:177 reporting/reports_main.php:182
 -#: reporting/reports_main.php:189 reporting/reports_main.php:197
 -#: reporting/reports_main.php:204 reporting/reports_main.php:213
 -#: reporting/reports_main.php:219 reporting/reports_main.php:230
 -#: reporting/reports_main.php:239 reporting/reports_main.php:245
 -#: reporting/reports_main.php:255 reporting/reports_main.php:263
 -#: reporting/reports_main.php:271 reporting/reports_main.php:278
 -#: reporting/reports_main.php:286 reporting/reports_main.php:293
 -#: reporting/reports_main.php:302 reporting/reports_main.php:315
 -#: reporting/reports_main.php:322 reporting/reports_main.php:329
 -#: reporting/reports_main.php:344 reporting/reports_main.php:352
 -#: reporting/reports_main.php:363 reporting/reports_main.php:375
 -#: reporting/reports_main.php:385 reporting/reports_main.php:397
 -#: reporting/reports_main.php:404 reporting/reports_main.php:414
 -#: reporting/reports_main.php:425 reporting/reports_main.php:434
 -#: reporting/reports_main.php:445 reporting/reports_main.php:451
 -#: reporting/reports_main.php:460 reporting/reports_main.php:470
 -#: reporting/reports_main.php:478 reporting/reports_main.php:486
 -#: reporting/reports_main.php:494
 +#: ../reporting/reports_main.php:41
 +#: ../reporting/reports_main.php:52
 +#: ../reporting/reports_main.php:61
 +#: ../reporting/reports_main.php:68
 +#: ../reporting/reports_main.php:77
 +#: ../reporting/reports_main.php:86
 +#: ../reporting/reports_main.php:93
 +#: ../reporting/reports_main.php:103
 +#: ../reporting/reports_main.php:112
 +#: ../reporting/reports_main.php:119
 +#: ../reporting/reports_main.php:126
 +#: ../reporting/reports_main.php:134
 +#: ../reporting/reports_main.php:141
 +#: ../reporting/reports_main.php:147
 +#: ../reporting/reports_main.php:158
 +#: ../reporting/reports_main.php:169
 +#: ../reporting/reports_main.php:177
 +#: ../reporting/reports_main.php:182
 +#: ../reporting/reports_main.php:189
 +#: ../reporting/reports_main.php:197
 +#: ../reporting/reports_main.php:204
 +#: ../reporting/reports_main.php:213
 +#: ../reporting/reports_main.php:219
 +#: ../reporting/reports_main.php:230
 +#: ../reporting/reports_main.php:239
 +#: ../reporting/reports_main.php:245
 +#: ../reporting/reports_main.php:255
 +#: ../reporting/reports_main.php:263
 +#: ../reporting/reports_main.php:271
 +#: ../reporting/reports_main.php:278
 +#: ../reporting/reports_main.php:286
 +#: ../reporting/reports_main.php:293
 +#: ../reporting/reports_main.php:302
 +#: ../reporting/reports_main.php:315
++#: ../reporting/reports_main.php:328
++#: ../reporting/reports_main.php:335
++#: ../reporting/reports_main.php:350
++#: ../reporting/reports_main.php:358
++#: ../reporting/reports_main.php:369
++#: ../reporting/reports_main.php:381
++#: ../reporting/reports_main.php:391
++#: ../reporting/reports_main.php:403
++#: ../reporting/reports_main.php:410
++#: ../reporting/reports_main.php:420
++#: ../reporting/reports_main.php:431
++#: ../reporting/reports_main.php:440
++#: ../reporting/reports_main.php:451
++#: ../reporting/reports_main.php:457
++#: ../reporting/reports_main.php:466
++#: ../reporting/reports_main.php:476
++#: ../reporting/reports_main.php:484
++#: ../reporting/reports_main.php:492
++#: ../reporting/reports_main.php:500
  msgid "Orientation"
  msgstr ""
  
 -#: reporting/reports_main.php:42 reporting/reports_main.php:53
 -#: reporting/reports_main.php:62 reporting/reports_main.php:69
 -#: reporting/reports_main.php:78 reporting/reports_main.php:87
 -#: reporting/reports_main.php:94 reporting/reports_main.php:159
 -#: reporting/reports_main.php:170 reporting/reports_main.php:178
 -#: reporting/reports_main.php:183 reporting/reports_main.php:190
 -#: reporting/reports_main.php:214 reporting/reports_main.php:220
 -#: reporting/reports_main.php:231 reporting/reports_main.php:240
 -#: reporting/reports_main.php:246 reporting/reports_main.php:256
 -#: reporting/reports_main.php:264 reporting/reports_main.php:272
 -#: reporting/reports_main.php:279 reporting/reports_main.php:287
 -#: reporting/reports_main.php:303 reporting/reports_main.php:316
 -#: reporting/reports_main.php:323 reporting/reports_main.php:330
 -#: reporting/reports_main.php:345 reporting/reports_main.php:353
 -#: reporting/reports_main.php:364 reporting/reports_main.php:376
 -#: reporting/reports_main.php:386 reporting/reports_main.php:398
 -#: reporting/reports_main.php:405 reporting/reports_main.php:415
 -#: reporting/reports_main.php:426 reporting/reports_main.php:435
 -#: reporting/reports_main.php:446 reporting/reports_main.php:452
 -#: reporting/reports_main.php:461 reporting/reports_main.php:471
 -#: reporting/reports_main.php:479 reporting/reports_main.php:487
 -#: reporting/reports_main.php:495
 +#: ../reporting/reports_main.php:42
 +#: ../reporting/reports_main.php:53
 +#: ../reporting/reports_main.php:62
 +#: ../reporting/reports_main.php:69
 +#: ../reporting/reports_main.php:78
 +#: ../reporting/reports_main.php:87
 +#: ../reporting/reports_main.php:94
 +#: ../reporting/reports_main.php:159
 +#: ../reporting/reports_main.php:170
 +#: ../reporting/reports_main.php:178
 +#: ../reporting/reports_main.php:183
 +#: ../reporting/reports_main.php:190
 +#: ../reporting/reports_main.php:214
 +#: ../reporting/reports_main.php:220
 +#: ../reporting/reports_main.php:231
 +#: ../reporting/reports_main.php:240
 +#: ../reporting/reports_main.php:246
 +#: ../reporting/reports_main.php:256
 +#: ../reporting/reports_main.php:264
 +#: ../reporting/reports_main.php:272
 +#: ../reporting/reports_main.php:279
 +#: ../reporting/reports_main.php:287
 +#: ../reporting/reports_main.php:303
++#: ../reporting/reports_main.php:316
++#: ../reporting/reports_main.php:322
++#: ../reporting/reports_main.php:329
++#: ../reporting/reports_main.php:336
++#: ../reporting/reports_main.php:351
++#: ../reporting/reports_main.php:359
++#: ../reporting/reports_main.php:370
++#: ../reporting/reports_main.php:382
++#: ../reporting/reports_main.php:392
++#: ../reporting/reports_main.php:404
++#: ../reporting/reports_main.php:411
++#: ../reporting/reports_main.php:421
++#: ../reporting/reports_main.php:432
++#: ../reporting/reports_main.php:441
++#: ../reporting/reports_main.php:452
++#: ../reporting/reports_main.php:458
++#: ../reporting/reports_main.php:467
++#: ../reporting/reports_main.php:477
++#: ../reporting/reports_main.php:485
++#: ../reporting/reports_main.php:493
++#: ../reporting/reports_main.php:501
  msgid "Destination"
  msgstr ""
  
  msgid "&Aged Customer Analysis"
  msgstr ""
  
 -#: reporting/reports_main.php:50 reporting/reports_main.php:167
 -#: reporting/reports_main.php:361 reporting/reports_main.php:373
 -#: reporting/reports_main.php:412 reporting/reports_main.php:423
 -#: reporting/reports_main.php:458 reporting/reports_main.php:468
 +#: ../reporting/reports_main.php:50
 +#: ../reporting/reports_main.php:167
++#: ../reporting/reports_main.php:367
++#: ../reporting/reports_main.php:379
++#: ../reporting/reports_main.php:418
++#: ../reporting/reports_main.php:429
++#: ../reporting/reports_main.php:464
++#: ../reporting/reports_main.php:474
  msgid "Graphics"
  msgstr ""
  
@@@ -12622,11 -11088,9 +12872,9 @@@ msgstr "
  msgid "Print &Statements"
  msgstr ""
  
 -#: reporting/reports_main.php:124 reporting/reports_main.php:131
 -#: reporting/reports_main.php:139 reporting/reports_main.php:195
 -#: reporting/reports_main.php:202
 +#: ../reporting/reports_main.php:124
 +#: ../reporting/reports_main.php:131
 +#: ../reporting/reports_main.php:139
- #: ../reporting/reports_main.php:195
- #: ../reporting/reports_main.php:202
  msgid "Email Customers"
  msgstr ""
  
@@@ -12670,11 -11134,11 +12918,16 @@@ msgstr "
  msgid "Print Purchase &Orders"
  msgstr ""
  
 -#: reporting/reports_main.php:198
 -msgid "Print Remittances"
++#: ../reporting/reports_main.php:195
++#: ../reporting/reports_main.php:202
++msgid "Email Suppliers"
++msgstr ""
++
 +#: ../reporting/reports_main.php:198
 +msgid "Print Remi&ttances"
  msgstr ""
  
 -#: reporting/reports_main.php:207
 +#: ../reporting/reports_main.php:207
  msgid "Inventory &Valuation Report"
  msgstr ""
  
@@@ -12766,14 -11230,69 +13019,86 @@@ msgstr "
  msgid "Bank &Statement"
  msgstr ""
  
 -#: reporting/reports_main.php:313 reporting/reports_main.php:380
 -#: reporting/reports_main.php:430 reporting/reports_main.php:475
 +#: ../reporting/reports_main.php:313
++#: ../reporting/reports_main.php:386
++#: ../reporting/reports_main.php:436
++#: ../reporting/reports_main.php:481
  msgid "Zero values"
  msgstr ""
  
 -#: reporting/reports_main.php:318
++#: ../reporting/reports_main.php:317
++msgid "Bank Statement w/ &Reconcile"
++msgstr ""
++
++#: ../reporting/reports_main.php:324
+ msgid "General Ledger"
+ msgstr ""
 -#: reporting/reports_main.php:319
++#: ../reporting/reports_main.php:325
+ msgid "Chart of &Accounts"
+ msgstr ""
 -#: reporting/reports_main.php:320
++#: ../reporting/reports_main.php:326
+ msgid "Show Balances"
+ msgstr ""
 -#: reporting/reports_main.php:324
++#: ../reporting/reports_main.php:330
+ msgid "List of &Journal Entries"
+ msgstr ""
 -#: reporting/reports_main.php:336 reporting/reports_main.php:390
 -#: reporting/reports_main.php:439
++#: ../reporting/reports_main.php:342
++#: ../reporting/reports_main.php:396
++#: ../reporting/reports_main.php:445
+ msgid "GL Account &Transactions"
+ msgstr ""
 -#: reporting/reports_main.php:339 reporting/reports_main.php:393
 -#: reporting/reports_main.php:442
++#: ../reporting/reports_main.php:345
++#: ../reporting/reports_main.php:399
++#: ../reporting/reports_main.php:448
+ msgid "From Account"
+ msgstr ""
 -#: reporting/reports_main.php:340 reporting/reports_main.php:394
 -#: reporting/reports_main.php:443
++#: ../reporting/reports_main.php:346
++#: ../reporting/reports_main.php:400
++#: ../reporting/reports_main.php:449
+ msgid "To Account"
+ msgstr ""
 -#: reporting/reports_main.php:346 reporting/reports_main.php:399
 -#: reporting/reports_main.php:447
++#: ../reporting/reports_main.php:352
++#: ../reporting/reports_main.php:405
++#: ../reporting/reports_main.php:453
+ msgid "Annual &Expense Breakdown"
+ msgstr ""
 -#: reporting/reports_main.php:354 reporting/reports_main.php:406
 -#: reporting/reports_main.php:453
++#: ../reporting/reports_main.php:360
++#: ../reporting/reports_main.php:412
++#: ../reporting/reports_main.php:459
+ msgid "&Balance Sheet"
+ msgstr ""
 -#: reporting/reports_main.php:360 reporting/reports_main.php:372
 -#: reporting/reports_main.php:411 reporting/reports_main.php:422
 -#: reporting/reports_main.php:457 reporting/reports_main.php:467
++#: ../reporting/reports_main.php:366
++#: ../reporting/reports_main.php:378
++#: ../reporting/reports_main.php:417
++#: ../reporting/reports_main.php:428
++#: ../reporting/reports_main.php:463
++#: ../reporting/reports_main.php:473
+ msgid "Decimal values"
+ msgstr ""
 -#: reporting/reports_main.php:365 reporting/reports_main.php:416
 -#: reporting/reports_main.php:462
++#: ../reporting/reports_main.php:371
++#: ../reporting/reports_main.php:422
++#: ../reporting/reports_main.php:468
+ msgid "&Profit and Loss Statement"
+ msgstr ""
 -#: reporting/reports_main.php:481
++#: ../reporting/reports_main.php:487
+ msgid "Ta&x Report"
+ msgstr ""
 -#: reporting/includes/doctext.inc:18 reporting/includes/doctext.inc:134
 -#: sales/view/view_dispatch.php:51 sales/view/view_invoice.php:51
 +#: ../reporting/includes/doctext.inc:18
 +#: ../reporting/includes/doctext.inc:156
 +#: ../sales/view/view_dispatch.php:51
 +#: ../sales/view/view_invoice.php:53
  msgid "Charge To"
  msgstr ""
  
@@@ -12839,10 -11342,9 +13164,10 @@@ msgstr "
  msgid "Our Quotation No"
  msgstr ""
  
 -#: reporting/includes/doctext.inc:48 sales/view/view_sales_order.php:69
 -#: sales/inquiry/sales_orders_view.php:282
 -#: sales/includes/ui/sales_order_ui.inc:611
 +#: ../reporting/includes/doctext.inc:60
 +#: ../sales/view/view_sales_order.php:69
- #: ../sales/inquiry/sales_orders_view.php.orig:304
++#: ../sales/inquiry/sales_orders_view.php:305
 +#: ../sales/includes/ui/sales_order_ui.inc:612
  msgid "Valid until"
  msgstr ""
  
@@@ -12930,24 -11407,15 +13255,16 @@@ msgstr "
  msgid "With thanks from"
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:214
- msgid "WORK ORDER"
- msgstr ""
 -#: reporting/includes/doctext.inc:193
 +#: ../reporting/includes/doctext.inc:215
  msgid "Work Order No."
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:238
- msgid "STATEMENT"
- msgstr ""
 -#: reporting/includes/doctext.inc:224
 +#: ../reporting/includes/doctext.inc:246
  msgid "DueDate"
  msgstr ""
  
 -#: reporting/includes/doctext.inc:259 reporting/includes/pdf_report.inc:1020
 +#: ../reporting/includes/doctext.inc:272
- #: ../reporting/includes/pdf_report.inc:1020
++#: ../reporting/includes/pdf_report.inc:1019
  msgid "You can pay through"
  msgstr ""
  
@@@ -12975,13 -11442,13 +13292,13 @@@ msgstr "
  msgid "Report Date"
  msgstr ""
  
 -#: reporting/includes/excel_report.inc:413
 -#: reporting/includes/pdf_report.inc:601
 +#: ../reporting/includes/excel_report.inc:413
- #: ../reporting/includes/pdf_report.inc:601
++#: ../reporting/includes/pdf_report.inc:600
  msgid "Generated At"
  msgstr ""
  
 -#: reporting/includes/excel_report.inc:419
 -#: reporting/includes/pdf_report.inc:610
 +#: ../reporting/includes/excel_report.inc:419
- #: ../reporting/includes/pdf_report.inc:610
++#: ../reporting/includes/pdf_report.inc:609
  msgid "Generated By"
  msgstr ""
  
@@@ -12993,49 -11460,47 +13310,49 @@@ msgstr "
  msgid "Domicile"
  msgstr ""
  
 -#: reporting/includes/header2.inc:143 reporting/includes/pdf_report.inc:352
 -#: reporting/includes/pdf_report.inc:501 reporting/includes/pdf_report.inc:629
 +#: ../reporting/includes/header2.inc:143
 +#: ../reporting/includes/pdf_report.inc:352
 +#: ../reporting/includes/pdf_report.inc:501
- #: ../reporting/includes/pdf_report.inc:629
++#: ../reporting/includes/pdf_report.inc:628
  msgid "Page"
  msgstr ""
  
- #: ../reporting/includes/pdf_report.inc:584
 -#: reporting/includes/pdf_report.inc:584
++#: ../reporting/includes/pdf_report.inc:583
  msgid "Report Period"
  msgstr ""
  
- #: ../reporting/includes/pdf_report.inc:987
- #: ../reporting/includes/pdf_report.inc:1035
 -#: reporting/includes/pdf_report.inc:987
 -#: reporting/includes/pdf_report.inc:1035
++#: ../reporting/includes/pdf_report.inc:986
++#: ../reporting/includes/pdf_report.inc:1034
  #, php-format
  msgid "You have no email contact defined for this type of document for '%s'."
  msgstr ""
  
- #: ../reporting/includes/pdf_report.inc:1006
 -#: reporting/includes/pdf_report.inc:1006
++#: ../reporting/includes/pdf_report.inc:1005
  msgid "Dear"
  msgstr ""
  
- #: ../reporting/includes/pdf_report.inc:1007
 -#: reporting/includes/pdf_report.inc:1007
++#: ../reporting/includes/pdf_report.inc:1006
  msgid "Attached you will find "
  msgstr ""
  
- #: ../reporting/includes/pdf_report.inc:1023
 -#: reporting/includes/pdf_report.inc:1023
++#: ../reporting/includes/pdf_report.inc:1022
  msgid "Kindest regards"
  msgstr ""
  
- #: ../reporting/includes/pdf_report.inc:1038
 -#: reporting/includes/pdf_report.inc:1038
++#: ../reporting/includes/pdf_report.inc:1037
  msgid "Sending document by email failed"
  msgstr ""
  
- #: ../reporting/includes/pdf_report.inc:1038
- #: ../reporting/includes/pdf_report.inc:1041
 -#: reporting/includes/pdf_report.inc:1038
 -#: reporting/includes/pdf_report.inc:1041
++#: ../reporting/includes/pdf_report.inc:1037
++#: ../reporting/includes/pdf_report.inc:1040
  msgid "Email:"
  msgstr ""
  
- #: ../reporting/includes/pdf_report.inc:1041
 -#: reporting/includes/pdf_report.inc:1041
++#: ../reporting/includes/pdf_report.inc:1040
  msgid "has been sent by email to destination."
  msgstr ""
  
- #: ../reporting/includes/pdf_report.inc:1071
 -#: reporting/includes/pdf_report.inc:1071
++#: ../reporting/includes/pdf_report.inc:1070
  msgid "Report has been sent to network printer "
  msgstr ""
  
@@@ -13232,8 -11697,7 +13549,8 @@@ msgstr "
  msgid "Modifying Customer Credit Note #%d"
  msgstr ""
  
 -#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:687
 +#: ../sales/credit_note_entry.php:51
- #: ../sales/sales_order_entry.php:700
++#: ../sales/sales_order_entry.php:704
  msgid ""
  "There are no customers, or there are no customers with branches. Please "
  "define customers and customer branches."
@@@ -13464,29 -11915,15 +13781,29 @@@ msgstr "
  msgid "Select A Different Delivery"
  msgstr ""
  
 -#: sales/customer_delivery.php:94
 +#: ../sales/customer_delivery.php:94
- #: ../sales/customer_invoice.php:152
++#: ../sales/customer_invoice.php:161
 +msgid ""
 +"You have to set Deferred Income Account in GL Setup to entry prepayment "
 +"invoices."
 +msgstr ""
 +
- #: ../sales/customer_delivery.php:97
- msgid "This order has no items. There is nothing to delivery."
++#: ../sales/customer_delivery.php:98
++#: ../sales/customer_delivery.php:103
+ msgid "Select a different sales order to delivery"
  msgstr ""
  
- #: ../sales/customer_delivery.php:100
- #: ../sales/customer_delivery.php:105
- msgid "Select a different sales order to delivery"
 -#: sales/customer_delivery.php:95
++#: ../sales/customer_delivery.php:99
+ msgid "This order has no items. There is nothing to delivery."
  msgstr ""
  
- #: ../sales/customer_delivery.php:103
 -#: sales/customer_delivery.php:110
++#: ../sales/customer_delivery.php:105
 +msgid ""
 +"This prepayment order is not yet ready for delivery due to insufficient "
 +"amount received."
 +msgstr ""
 +
 +#: ../sales/customer_delivery.php:122
  msgid "Select a different delivery"
  msgstr ""
  
@@@ -13522,8 -11963,7 +13839,8 @@@ msgstr "
  msgid "The entered dead-line for invoice is invalid."
  msgstr ""
  
 -#: sales/customer_delivery.php:176 sales/customer_invoice.php:300
 +#: ../sales/customer_delivery.php:188
- #: ../sales/customer_invoice.php:345
++#: ../sales/customer_invoice.php:354
  msgid "The entered shipping value is not numeric."
  msgstr ""
  
  msgid "There are no item quantities on this delivery note."
  msgstr ""
  
 -#: sales/customer_delivery.php:285 sales/sales_order_entry.php:516
 -#: sales/includes/ui/sales_order_ui.inc:250
 +#: ../sales/customer_delivery.php:297
- #: ../sales/sales_order_entry.php:529
++#: ../sales/sales_order_entry.php:532
 +#: ../sales/includes/ui/sales_order_ui.inc:251
  msgid ""
  "The delivery cannot be processed because there is an insufficient quantity "
  "for item:"
@@@ -13551,10 -11990,9 +13868,10 @@@ msgstr "
  msgid "Invoice Dead-line"
  msgstr ""
  
 -#: sales/customer_delivery.php:421 sales/customer_invoice.php:468
 -#: sales/includes/ui/sales_order_ui.inc:84
 -#: sales/includes/ui/sales_order_ui.inc:374
 +#: ../sales/customer_delivery.php:435
- #: ../sales/customer_invoice.php:530
++#: ../sales/customer_invoice.php:539
 +#: ../sales/includes/ui/sales_order_ui.inc:84
 +#: ../sales/includes/ui/sales_order_ui.inc:375
  msgid ""
  "The selected customer account is currently on hold. Please contact the "
  "credit control personnel to discuss."
@@@ -13568,13 -12006,11 +13885,13 @@@ msgstr "
  msgid "Max. delivery"
  msgstr ""
  
 -#: sales/customer_delivery.php:432 sales/customer_invoice.php:478
 +#: ../sales/customer_delivery.php:446
- #: ../sales/customer_invoice.php:544
++#: ../sales/customer_invoice.php:553
  msgid "Invoiced"
  msgstr ""
  
 -#: sales/customer_delivery.php:503 sales/customer_invoice.php:563
 +#: ../sales/customer_delivery.php:517
- #: ../sales/customer_invoice.php:633
++#: ../sales/customer_invoice.php:642
  msgid "Shipping Cost"
  msgstr ""
  
@@@ -13588,10 -12023,8 +13905,10 @@@ msgstr "
  msgid "Action For Balance"
  msgstr ""
  
 -#: sales/customer_delivery.php:534 sales/customer_delivery.php:536
 -#: sales/customer_delivery.php:539 sales/customer_invoice.php:592
 +#: ../sales/customer_delivery.php:548
 +#: ../sales/customer_delivery.php:550
 +#: ../sales/customer_delivery.php:553
- #: ../sales/customer_invoice.php:685
++#: ../sales/customer_invoice.php:694
  msgid "Refresh document page"
  msgstr ""
  
@@@ -13607,9 -12040,8 +13924,9 @@@ msgstr "
  msgid "Process Dispatch"
  msgstr ""
  
 -#: sales/customer_delivery.php:542 sales/customer_invoice.php:594
 -#: sales/sales_order_entry.php:735
 +#: ../sales/customer_delivery.php:556
- #: ../sales/customer_invoice.php:687
- #: ../sales/sales_order_entry.php:747
++#: ../sales/customer_invoice.php:696
++#: ../sales/sales_order_entry.php:751
  msgid "Check entered data and save document"
  msgstr ""
  
@@@ -13634,19 -12062,16 +13951,19 @@@ msgstr "
  msgid "Selected deliveries has been processed"
  msgstr ""
  
 -#: sales/customer_invoice.php:57 sales/customer_invoice.php:86
 -#: sales/sales_order_entry.php:212
 +#: ../sales/customer_invoice.php:60
- #: ../sales/customer_invoice.php:80
++#: ../sales/customer_invoice.php:89
 +#: ../sales/sales_order_entry.php:218
  msgid "&View This Invoice"
  msgstr ""
  
 -#: sales/customer_invoice.php:59 sales/customer_invoice.php:88
 +#: ../sales/customer_invoice.php:62
- #: ../sales/customer_invoice.php:82
++#: ../sales/customer_invoice.php:91
  msgid "&Print This Invoice"
  msgstr ""
  
 -#: sales/customer_invoice.php:60 sales/customer_invoice.php:89
 +#: ../sales/customer_invoice.php:63
- #: ../sales/customer_invoice.php:83
++#: ../sales/customer_invoice.php:92
  msgid "&Email This Invoice"
  msgstr ""
  
@@@ -13659,135 -12083,117 +13976,135 @@@ msgstr "
  msgid "Select Another &Delivery For Invoicing"
  msgstr ""
  
- #: ../sales/customer_invoice.php:78
 -#: sales/customer_invoice.php:72 sales/sales_order_entry.php:235
++#: ../sales/customer_invoice.php:75
++#: ../sales/sales_order_entry.php:241
+ msgid "Entry &customer payment for this invoice"
+ msgstr ""
 -#: sales/customer_invoice.php:84
++#: ../sales/customer_invoice.php:87
  #, php-format
  msgid "Sales Invoice # %d has been updated."
  msgstr ""
  
- #: ../sales/customer_invoice.php:85
 -#: sales/customer_invoice.php:91
++#: ../sales/customer_invoice.php:94
  msgid "Select Another &Invoice to Modify"
  msgstr ""
  
- #: ../sales/customer_invoice.php:124
 -#: sales/customer_invoice.php:130
++#: ../sales/customer_invoice.php:133
  msgid "Select a different delivery to invoice"
  msgstr ""
  
- #: ../sales/customer_invoice.php:125
 -#: sales/customer_invoice.php:131
++#: ../sales/customer_invoice.php:134
  msgid ""
  "There are no delivered items with a quantity left to invoice. There is "
  "nothing left to invoice."
  msgstr ""
  
- #: ../sales/customer_invoice.php:146
 -#: sales/customer_invoice.php:140
++#: ../sales/customer_invoice.php:155
  msgid ""
 -"There are no delivery notes for this invoice.<br>\n"
 -"\t\tMost likely this invoice was created in Front Accounting version prior "
 -"to 2.0\n"
 -"\t\tand therefore can not be modified."
 +"All quantities on this invoice has been credited. There is nothing to modify "
 +"on this invoice"
  msgstr ""
  
- #: ../sales/customer_invoice.php:160
 -#: sales/customer_invoice.php:149
++#: ../sales/customer_invoice.php:169
  msgid ""
 -"All quantities on this invoice has been credited. There is nothing to modify "
 -"on this invoice"
 +"Please select correct Sales Order Prepayment to be invoiced and try again."
  msgstr ""
  
- #: ../sales/customer_invoice.php:191
 -#: sales/customer_invoice.php:155
++#: ../sales/customer_invoice.php:200
  msgid ""
  "This page can only be opened after delivery selection. Please select "
  "delivery to invoicing first."
  msgstr ""
  
- #: ../sales/customer_invoice.php:193
 -#: sales/customer_invoice.php:157
++#: ../sales/customer_invoice.php:202
  msgid "Select Delivery to Invoice"
  msgstr ""
  
- #: ../sales/customer_invoice.php:198
- #: ../sales/customer_invoice.php:356
 -#: sales/customer_invoice.php:162 sales/customer_invoice.php:311
++#: ../sales/customer_invoice.php:207
++#: ../sales/customer_invoice.php:365
  msgid ""
  "Selected quantity cannot be less than quantity credited nor more than "
  "quantity not invoiced yet."
  msgstr ""
  
- #: ../sales/customer_invoice.php:312
 -#: sales/customer_invoice.php:270
++#: ../sales/customer_invoice.php:321
  msgid "The entered invoice date is invalid."
  msgstr ""
  
- #: ../sales/customer_invoice.php:325
 -#: sales/customer_invoice.php:276
 -msgid "The entered invoice date is not in fiscal year."
 -msgstr ""
 -
 -#: sales/customer_invoice.php:282
++#: ../sales/customer_invoice.php:334
  msgid "The entered invoice due date is invalid."
  msgstr ""
  
- #: ../sales/customer_invoice.php:351
 -#: sales/customer_invoice.php:306
++#: ../sales/customer_invoice.php:360
  msgid "There are no item quantities on this invoice."
  msgstr ""
  
- #: ../sales/customer_invoice.php:361
 -#: sales/customer_invoice.php:394
++#: ../sales/customer_invoice.php:370
 +msgid ""
 +"There is no non-invoiced payments for this order. If you want to issue final "
 +"invoice, select delayed or cash payment terms."
 +msgstr ""
 +
- #: ../sales/customer_invoice.php:451
++#: ../sales/customer_invoice.php:460
  msgid "Payment terms:"
  msgstr ""
  
- #: ../sales/customer_invoice.php:536
- #: ../sales/sales_order_entry.php:723
 -#: sales/customer_invoice.php:397 sales/includes/ui/sales_order_ui.inc:410
 -#: sales/includes/ui/sales_order_ui.inc:414
 -msgid "Payment:"
++#: ../sales/customer_invoice.php:545
++#: ../sales/sales_order_entry.php:727
 +msgid "Sales Order Items"
  msgstr ""
  
- #: ../sales/customer_invoice.php:536
 -#: sales/customer_invoice.php:474
++#: ../sales/customer_invoice.php:545
  msgid "Invoice Items"
  msgstr ""
  
- #: ../sales/customer_invoice.php:545
 -#: sales/customer_invoice.php:479
++#: ../sales/customer_invoice.php:554
  msgid "This Invoice"
  msgstr ""
  
- #: ../sales/customer_invoice.php:552
 -#: sales/customer_invoice.php:487
++#: ../sales/customer_invoice.php:561
  msgid "Credited"
  msgstr ""
  
- #: ../sales/customer_invoice.php:654
 -#: sales/customer_invoice.php:581
++#: ../sales/customer_invoice.php:663
  msgid "Invoice Total"
  msgstr ""
  
- #: ../sales/customer_invoice.php:663
 -#: sales/customer_payments.php:32
++#: ../sales/customer_invoice.php:672
 +msgid "Sales order:"
 +msgstr ""
 +
- #: ../sales/customer_invoice.php:675
++#: ../sales/customer_invoice.php:684
 +msgid "Payments received:"
 +msgstr ""
 +
- #: ../sales/customer_invoice.php:676
++#: ../sales/customer_invoice.php:685
 +msgid "Invoiced here:"
 +msgstr ""
 +
- #: ../sales/customer_invoice.php:677
++#: ../sales/customer_invoice.php:686
 +msgid "Left to be invoiced:"
 +msgstr ""
 +
 +#: ../sales/customer_payments.php:32
- #: ../sales/customer_payments.php.orig:33
  msgid "Customer Payment Entry"
  msgstr ""
  
 -#: sales/customer_payments.php:36
 +#: ../sales/customer_payments.php:36
- #: ../sales/customer_payments.php.orig:37
  msgid "There are no customers defined in the system."
  msgstr ""
  
 -#: sales/customer_payments.php:70
 +#: ../sales/customer_payments.php:70
- #: ../sales/customer_payments.php.orig:68
  msgid "Invalid sales invoice number."
  msgstr ""
  
 -#: sales/customer_payments.php:97
 +#: ../sales/customer_payments.php:97
- #: ../sales/customer_payments.php.orig:94
  msgid "The customer payment has been successfully entered."
  msgstr ""
  
 -#: sales/customer_payments.php:99 sales/customer_payments.php:118
 +#: ../sales/customer_payments.php:99
- #: ../sales/customer_payments.php.orig:96
- #: ../sales/customer_payments.php.orig:113
++#: ../sales/customer_payments.php:118
  msgid "&Print This Receipt"
  msgstr ""
  
  msgid "&View this Customer Payment"
  msgstr ""
  
 -#: sales/customer_payments.php:103 sales/customer_payments.php:126
 +#: ../sales/customer_payments.php:103
- #: ../sales/customer_payments.php.orig:104
- #: ../sales/customer_payments.php.orig:121
++#: ../sales/customer_payments.php:126
  msgid "Enter Another &Customer Payment"
  msgstr ""
  
- #: ../sales/customer_payments.php:104
- msgid "Enter Other &Deposit"
- msgstr ""
 -#: sales/customer_payments.php:105
 +#: ../sales/customer_payments.php:105
  msgid "Enter Payment to &Supplier"
  msgstr ""
  
- #: ../sales/customer_payments.php:106
- msgid "Enter Other &Payment"
- msgstr ""
- #: ../sales/customer_payments.php:107
- msgid "Bank Account &Transfer"
- msgstr ""
 -#: sales/customer_payments.php:109 sales/customer_payments.php:120
 +#: ../sales/customer_payments.php:109
- #: ../sales/customer_payments.php.orig:98
- #: ../sales/customer_payments.php.orig:115
++#: ../sales/customer_payments.php:120
  msgid "&View the GL Journal Entries for this Customer Payment"
  msgstr ""
  
- #: ../sales/customer_payments.php.orig:102
- msgid "Select Another &Customer Transaction for Payment"
- msgstr ""
- #: ../sales/customer_payments.php.orig:111
 -#: sales/customer_payments.php:116
++#: ../sales/customer_payments.php:116
  msgid "The customer payment has been successfully updated."
  msgstr ""
  
- #: ../sales/customer_payments.php.orig:119
 -#: sales/customer_payments.php:124
++#: ../sales/customer_payments.php:124
  msgid "Select Another Customer Payment for &Edition"
  msgstr ""
  
- #: ../sales/customer_payments.php.orig:134
- #: ../sales/sales_order_entry.php:347
 -#: sales/customer_payments.php:139 sales/sales_order_entry.php:340
++#: ../sales/customer_payments.php:139
++#: ../sales/sales_order_entry.php:350
  msgid "There is no customer selected."
  msgstr ""
  
- #: ../sales/customer_payments.php.orig:141
- #: ../sales/sales_order_entry.php:354
 -#: sales/customer_payments.php:146 sales/sales_order_entry.php:347
++#: ../sales/customer_payments.php:146
++#: ../sales/sales_order_entry.php:357
  msgid "This customer has no branch defined."
  msgstr ""
  
- #: ../sales/customer_payments.php.orig:147
 -#: sales/customer_payments.php:152
++#: ../sales/customer_payments.php:152
  msgid "The entered date is invalid. Please enter a valid date for the payment."
  msgstr ""
  
- #: ../sales/customer_payments.php.orig:177
- #: ../sales/customer_payments.php.orig:183
 -#: sales/customer_payments.php:182 sales/customer_payments.php:188
++#: ../sales/customer_payments.php:182
++#: ../sales/customer_payments.php:188
  msgid "The entered amount is invalid or negative and cannot be processed."
  msgstr ""
  
- #: ../sales/customer_payments.php.orig:209
 -#: sales/customer_payments.php:214
++#: ../sales/customer_payments.php:214
  msgid "The entered discount is not a valid number."
  msgstr ""
  
- #: ../sales/customer_payments.php.orig:216
 -#: sales/customer_payments.php:221
++#: ../sales/customer_payments.php:221
  msgid ""
- "The balance of the amount and discout is zero or negative. Please enter "
+ "The balance of the amount and discount is zero or negative. Please enter "
  "valid amounts."
  msgstr ""
  
- #: ../sales/customer_payments.php.orig:346
- #: ../sales/customer_payments.php.orig:348
- msgid "From Customer:"
 -#: sales/customer_payments.php:228
++#: ../sales/customer_payments.php:228
+ msgid "The entered payment amount is zero or negative."
  msgstr ""
  
- #: ../sales/customer_payments.php.orig:377
 -#: sales/customer_payments.php:335
++#: ../sales/customer_payments.php:332
  msgid "Into Bank Account:"
  msgstr ""
  
- #: ../sales/customer_payments.php.orig:382
- msgid "Date of Deposit:"
 -#: sales/customer_payments.php:338 sales/customer_payments.php:340
++#: ../sales/customer_payments.php:335
++#: ../sales/customer_payments.php:337
+ msgid "From Customer:"
  msgstr ""
  
- #: ../sales/customer_payments.php.orig:404
- msgid "Customer prompt payment discount :"
 -#: sales/customer_payments.php:366
++#: ../sales/customer_payments.php:369
+ msgid "Date of Deposit:"
  msgstr ""
  
- #: ../sales/customer_payments.php.orig:413
- msgid "Amount and discount are in customer's currency."
 -#: sales/customer_payments.php:380
++#: ../sales/customer_payments.php:383
+ msgid "Payment Amount:"
  msgstr ""
  
- #: ../sales/customer_payments.php.orig:418
- msgid "Update Payment"
 -#: sales/customer_payments.php:393
++#: ../sales/customer_payments.php:396
+ msgid "Customer prompt payment discount :"
  msgstr ""
  
- #: ../sales/customer_payments.php.orig:420
 -#: sales/customer_payments.php:403
++#: ../sales/customer_payments.php:406
  msgid "Add Payment"
  msgstr ""
  
 -#: sales/customer_payments.php:405
++#: ../sales/customer_payments.php:408
+ msgid "Update Payment"
+ msgstr ""
 -#: sales/sales_order_entry.php:64
 +#: ../sales/sales_order_entry.php:64
  msgid "Direct Sales Delivery"
  msgstr ""
  
@@@ -14029,197 -12410,197 +14332,199 @@@ msgstr "
  msgid "Enter a &New Direct Invoice"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:377
 -#: sales/sales_order_entry.php:369
++#: ../sales/sales_order_entry.php:380
 +msgid "Pre-payment required have to be positive and less than total amount."
 +msgstr ""
 +
- #: ../sales/sales_order_entry.php:382
++#: ../sales/sales_order_entry.php:385
  msgid ""
  "You must enter the person or company to whom delivery should be made to."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:389
 -#: sales/sales_order_entry.php:376
++#: ../sales/sales_order_entry.php:392
  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:398
 -#: sales/sales_order_entry.php:385
++#: ../sales/sales_order_entry.php:401
  msgid "The shipping cost entered is expected to be numeric."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:404
 -#: sales/sales_order_entry.php:391
++#: ../sales/sales_order_entry.php:407
  msgid "The Valid date is invalid."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:406
 -#: sales/sales_order_entry.php:393
++#: ../sales/sales_order_entry.php:409
  msgid "The delivery date is invalid."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:413
 -#: sales/sales_order_entry.php:400
++#: ../sales/sales_order_entry.php:416
  msgid "The requested valid date is before the date of the quotation."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:415
 -#: sales/sales_order_entry.php:402
++#: ../sales/sales_order_entry.php:418
  msgid "The requested delivery date is before the date of the order."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:424
 -#: sales/sales_order_entry.php:411
++#: ../sales/sales_order_entry.php:427
  msgid "You need to define a cash account for your Sales Point."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:462
 -#: sales/sales_order_entry.php:449
++#: ../sales/sales_order_entry.php:465
  msgid ""
  "The reference number field has been increased. Please save the document "
  "again."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:508
 -#: sales/sales_order_entry.php:495
++#: ../sales/sales_order_entry.php:511
  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:512
 -#: sales/sales_order_entry.php:499
++#: ../sales/sales_order_entry.php:515
  msgid "Price for inventory item must be entered and can not be less than 0"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:519
 -#: sales/sales_order_entry.php:506
++#: ../sales/sales_order_entry.php:522
  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:550
 -#: sales/sales_order_entry.php:537
++#: ../sales/sales_order_entry.php:553
  #, php-format
  msgid "Price %s is below Standard Cost %s"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:575
 -#: sales/sales_order_entry.php:562
++#: ../sales/sales_order_entry.php:578
  msgid ""
  "This item cannot be deleted because some of it has already been delivered."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:604
 -#: sales/sales_order_entry.php:591
++#: ../sales/sales_order_entry.php:607
  msgid "Direct delivery entry has been cancelled as requested."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:605
 -#: sales/sales_order_entry.php:592
++#: ../sales/sales_order_entry.php:608
  msgid "Enter a New Sales Delivery"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:607
 -#: sales/sales_order_entry.php:594
++#: ../sales/sales_order_entry.php:610
  msgid "Direct invoice entry has been cancelled as requested."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:608
 -#: sales/sales_order_entry.php:595
++#: ../sales/sales_order_entry.php:611
  msgid "Enter a New Sales Invoice"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:612
 -#: sales/sales_order_entry.php:599
++#: ../sales/sales_order_entry.php:616
  msgid "This sales quotation has been cancelled as requested."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:613
 -#: sales/sales_order_entry.php:600
++#: ../sales/sales_order_entry.php:617
  msgid "Enter a New Sales Quotation"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:620
 -#: sales/sales_order_entry.php:607
++#: ../sales/sales_order_entry.php:624
  msgid "Undelivered part of order has been cancelled as requested."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:621
 -#: sales/sales_order_entry.php:608
++#: ../sales/sales_order_entry.php:625
  msgid "Select Another Sales Order for Edition"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:625
 -#: sales/sales_order_entry.php:612
++#: ../sales/sales_order_entry.php:629
  msgid "This sales order has been cancelled as requested."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:626
 -#: sales/sales_order_entry.php:613
++#: ../sales/sales_order_entry.php:630
  msgid "Enter a New Sales Order"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:704
 -#: sales/sales_order_entry.php:691
++#: ../sales/sales_order_entry.php:708
  msgid "Sales Invoice Items"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:705
 -#: sales/sales_order_entry.php:692
++#: ../sales/sales_order_entry.php:709
  msgid "Enter Delivery Details and Confirm Invoice"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:707
 -#: sales/sales_order_entry.php:694
++#: ../sales/sales_order_entry.php:711
  msgid "Place Invoice"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:710
 -#: sales/sales_order_entry.php:697
++#: ../sales/sales_order_entry.php:714
  msgid "Delivery Note Items"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:711
 -#: sales/sales_order_entry.php:698
++#: ../sales/sales_order_entry.php:715
  msgid "Enter Delivery Details and Confirm Dispatch"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:712
 -#: sales/sales_order_entry.php:699
++#: ../sales/sales_order_entry.php:716
  msgid "Cancel Delivery"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:713
 -#: sales/sales_order_entry.php:700
++#: ../sales/sales_order_entry.php:717
  msgid "Place Delivery"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:715
 -#: sales/sales_order_entry.php:702
++#: ../sales/sales_order_entry.php:719
  msgid "Quotation Date:"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:716
 -#: sales/sales_order_entry.php:703
++#: ../sales/sales_order_entry.php:720
  msgid "Sales Quotation Items"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:717
 -#: sales/sales_order_entry.php:704
++#: ../sales/sales_order_entry.php:721
  msgid "Enter Delivery Details and Confirm Quotation"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:718
 -#: sales/sales_order_entry.php:705
++#: ../sales/sales_order_entry.php:722
  msgid "Cancel Quotation"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:719
 -#: sales/sales_order_entry.php:706
++#: ../sales/sales_order_entry.php:723
  msgid "Place Quotation"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:720
 -#: sales/sales_order_entry.php:707
++#: ../sales/sales_order_entry.php:724
  msgid "Commit Quotations Changes"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:724
 -#: sales/sales_order_entry.php:710
 -msgid "Sales Order Items"
 -msgstr ""
 -
 -#: sales/sales_order_entry.php:711
++#: ../sales/sales_order_entry.php:728
  msgid "Enter Delivery Details and Confirm Order"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:727
 -#: sales/sales_order_entry.php:714
++#: ../sales/sales_order_entry.php:731
  msgid "Commit Order Changes"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:748
 -#: sales/sales_order_entry.php:736
--msgid "You are about to void this Document.\\nDo you want to continue?"
++#: ../sales/sales_order_entry.php:753
++#: ../sales/sales_order_entry.php:759
++msgid ""
++"Cancels document entry or removes sales order when editing an old document"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:751
 -#: sales/sales_order_entry.php:739
--msgid ""
--"You are about to cancel undelivered part of this order.\\nDo you want to "
--"continue?"
++#: ../sales/sales_order_entry.php:754
++#: ../sales/sales_order_entry.php:763
++msgid "You are about to void this Document.\\nDo you want to continue?"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:753
 -#: sales/sales_order_entry.php:741
++#: ../sales/sales_order_entry.php:757
  msgid "Validate changes and update document"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:757
 -#: sales/sales_order_entry.php:745
++#: ../sales/sales_order_entry.php:761
  msgid ""
--"Cancels document entry or removes sales order when editing an old document"
++"You are about to cancel undelivered part of this order.\\nDo you want to "
++"continue?"
  msgstr ""
  
 -#: sales/allocations/customer_allocate.php:28
 +#: ../sales/allocations/customer_allocate.php:28
  msgid "Allocate Customer Payment or Credit Note"
  msgstr ""
  
@@@ -14232,12 -12613,11 +14537,12 @@@ msgstr "
  msgid "Customer Allocations"
  msgstr ""
  
 -#: sales/allocations/customer_allocation_main.php:32
 -#: sales/manage/customer_branches.php:280 sales/manage/customers.php:327
 -#: sales/inquiry/customer_allocation_inquiry.php:42
 -#: sales/inquiry/customer_inquiry.php:48
 -#: sales/inquiry/sales_orders_view.php:243
 +#: ../sales/allocations/customer_allocation_main.php:32
 +#: ../sales/manage/customer_branches.php:282
- #: ../sales/manage/customers.php:327
++#: ../sales/manage/customers.php:328
 +#: ../sales/inquiry/customer_allocation_inquiry.php:42
 +#: ../sales/inquiry/customer_inquiry.php:44
- #: ../sales/inquiry/sales_orders_view.php.orig:265
++#: ../sales/inquiry/sales_orders_view.php:266
  msgid "Select a customer: "
  msgstr ""
  
@@@ -14359,13 -12739,11 +14664,13 @@@ msgstr "
  msgid "Branch Short Name:"
  msgstr ""
  
 -#: sales/manage/customer_branches.php:241 sales/manage/customers.php:259
 +#: ../sales/manage/customer_branches.php:242
- #: ../sales/manage/customers.php:259
++#: ../sales/manage/customers.php:260
  msgid "Sales Person:"
  msgstr ""
  
 -#: sales/manage/customer_branches.php:242 sales/manage/customers.php:296
 +#: ../sales/manage/customer_branches.php:243
- #: ../sales/manage/customers.php:296
++#: ../sales/manage/customers.php:297
  msgid "Sales Area:"
  msgstr ""
  
  msgid "Sales Group:"
  msgstr ""
  
 -#: sales/manage/customer_branches.php:244 sales/manage/customers.php:294
 +#: ../sales/manage/customer_branches.php:245
- #: ../sales/manage/customers.php:294
++#: ../sales/manage/customers.php:295
  msgid "Default Inventory Location:"
  msgstr ""
  
 -#: sales/manage/customer_branches.php:245 sales/manage/customers.php:295
 +#: ../sales/manage/customer_branches.php:246
- #: ../sales/manage/customers.php:295
++#: ../sales/manage/customers.php:296
  msgid "Default Shipping Company:"
  msgstr ""
  
@@@ -14500,78 -12876,77 +14805,78 @@@ msgstr "
  msgid "Customer Short Name:"
  msgstr ""
  
- #: ../sales/manage/customers.php:241
- #: ../sales/manage/customers.php:245
 -#: sales/manage/customers.php:241 sales/manage/customers.php:245
++#: ../sales/manage/customers.php:242
++#: ../sales/manage/customers.php:246
  msgid "Customer's Currency:"
  msgstr ""
  
- #: ../sales/manage/customers.php:248
 -#: sales/manage/customers.php:248
++#: ../sales/manage/customers.php:249
  msgid "Sales Type/Price List:"
  msgstr ""
  
- #: ../sales/manage/customers.php:251
 -#: sales/manage/customers.php:251
++#: ../sales/manage/customers.php:252
  msgid "Customer status:"
  msgstr ""
  
- #: ../sales/manage/customers.php:265
 -#: sales/manage/customers.php:265
++#: ../sales/manage/customers.php:266
  msgid "Discount Percent:"
  msgstr ""
  
- #: ../sales/manage/customers.php:266
 -#: sales/manage/customers.php:266
++#: ../sales/manage/customers.php:267
  msgid "Prompt Payment Discount Percent:"
  msgstr ""
  
- #: ../sales/manage/customers.php:270
 -#: sales/manage/customers.php:270
++#: ../sales/manage/customers.php:271
  msgid "Credit Status:"
  msgstr ""
  
- #: ../sales/manage/customers.php:283
 -#: sales/manage/customers.php:283
++#: ../sales/manage/customers.php:284
  msgid "Customer branches"
  msgstr ""
  
- #: ../sales/manage/customers.php:285
 -#: sales/manage/customers.php:285
++#: ../sales/manage/customers.php:286
  msgid "Select or &Add"
  msgstr ""
  
- #: ../sales/manage/customers.php:285
 -#: sales/manage/customers.php:285
++#: ../sales/manage/customers.php:286
  msgid "&Add or Edit "
  msgstr ""
  
- #: ../sales/manage/customers.php:304
 -#: sales/manage/customers.php:304
++#: ../sales/manage/customers.php:305
  msgid "Add New Customer"
  msgstr ""
  
- #: ../sales/manage/customers.php:308
 -#: sales/manage/customers.php:308
++#: ../sales/manage/customers.php:309
  msgid "Update Customer"
  msgstr ""
  
- #: ../sales/manage/customers.php:309
 -#: sales/manage/customers.php:309
++#: ../sales/manage/customers.php:310
  msgid "Update customer data"
  msgstr ""
  
- #: ../sales/manage/customers.php:310
 -#: sales/manage/customers.php:310
++#: ../sales/manage/customers.php:311
  msgid "Select this customer and return to document entry."
  msgstr ""
  
- #: ../sales/manage/customers.php:311
 -#: sales/manage/customers.php:311
++#: ../sales/manage/customers.php:312
  msgid "Delete Customer"
  msgstr ""
  
- #: ../sales/manage/customers.php:312
 -#: sales/manage/customers.php:312
++#: ../sales/manage/customers.php:313
  msgid "Delete customer data if have been never used"
  msgstr ""
  
- #: ../sales/manage/customers.php:319
 -#: sales/manage/customers.php:319
++#: ../sales/manage/customers.php:320
  msgid ""
  "There are no sales types defined. Please define at least one sales type "
  "before adding a customer."
  msgstr ""
  
- #: ../sales/manage/customers.php:328
 -#: sales/manage/customers.php:328
++#: ../sales/manage/customers.php:329
  msgid "New customer"
  msgstr ""
  
- #: ../sales/manage/customers.php:350
 -#: sales/manage/customers.php:350
++#: ../sales/manage/customers.php:351
  msgid "Sales &Orders"
  msgstr ""
  
@@@ -15090,87 -13444,65 +15395,77 @@@ msgstr "
  msgid "Batch Invoicing"
  msgstr ""
  
 -#: sales/inquiry/sales_orders_view.php:40
 +#: ../sales/inquiry/sales_orders_view.php:44
- #: ../sales/inquiry/sales_orders_view.php.orig:44
  msgid "Search Outstanding Sales Orders"
  msgstr ""
  
 -#: sales/inquiry/sales_orders_view.php:45
 +#: ../sales/inquiry/sales_orders_view.php:49
- #: ../sales/inquiry/sales_orders_view.php.orig:49
  msgid "Search Template for Invoicing"
  msgstr ""
  
 -#: sales/inquiry/sales_orders_view.php:50
 +#: ../sales/inquiry/sales_orders_view.php:54
- #: ../sales/inquiry/sales_orders_view.php.orig:54
  msgid "Select Template for Delivery"
  msgstr ""
  
 -#: sales/inquiry/sales_orders_view.php:55
 +#: ../sales/inquiry/sales_orders_view.php:59
- #: ../sales/inquiry/sales_orders_view.php.orig:59
 +msgid "Invoicing Prepayment Orders"
 +msgstr ""
 +
 +#: ../sales/inquiry/sales_orders_view.php:64
- #: ../sales/inquiry/sales_orders_view.php.orig:64
  msgid "Search All Sales Orders"
  msgstr ""
  
 -#: sales/inquiry/sales_orders_view.php:61
 +#: ../sales/inquiry/sales_orders_view.php:70
- #: ../sales/inquiry/sales_orders_view.php.orig:70
  msgid "Search All Sales Quotations"
  msgstr ""
  
 -#: sales/inquiry/sales_orders_view.php:136
 +#: ../sales/inquiry/sales_orders_view.php:148
- #: ../sales/inquiry/sales_orders_view.php.orig:148
  msgid "Dispatch"
  msgstr ""
  
 -#: sales/inquiry/sales_orders_view.php:178
 +#: ../sales/inquiry/sales_orders_view.php:191
- #: ../sales/inquiry/sales_orders_view.php.orig:191
  msgid "Set this order as a template for direct deliveries/invoices"
  msgstr ""
  
 -#: sales/inquiry/sales_orders_view.php:245
 +#: ../sales/inquiry/sales_orders_view.php:200
- #: ../sales/inquiry/sales_orders_view.php.orig:200
 +msgid "Prepayment Invoice"
 +msgstr ""
 +
 +#: ../sales/inquiry/sales_orders_view.php:200
- #: ../sales/inquiry/sales_orders_view.php.orig:200
 +msgid "Final Invoice"
 +msgstr ""
 +
- #: ../sales/inquiry/sales_orders_view.php.orig:267
++#: ../sales/inquiry/sales_orders_view.php:268
  msgid "Show All:"
  msgstr ""
  
- #: ../sales/inquiry/sales_orders_view.php.orig:284
 -#: sales/inquiry/sales_orders_view.php:262
++#: ../sales/inquiry/sales_orders_view.php:285
  msgid "Order #"
  msgstr ""
  
- #: ../sales/inquiry/sales_orders_view.php.orig:288
- #: ../sales/inquiry/sales_orders_view.php.orig:302
 -#: sales/inquiry/sales_orders_view.php:266
 -#: sales/inquiry/sales_orders_view.php:280
++#: ../sales/inquiry/sales_orders_view.php:289
++#: ../sales/inquiry/sales_orders_view.php:303
  msgid "Cust Order Ref"
  msgstr ""
  
- #: ../sales/inquiry/sales_orders_view.php.orig:291
- #: ../sales/inquiry/sales_orders_view.php.orig:305
 -#: sales/inquiry/sales_orders_view.php:269
 -#: sales/inquiry/sales_orders_view.php:283
++#: ../sales/inquiry/sales_orders_view.php:292
++#: ../sales/inquiry/sales_orders_view.php:306
  msgid "Delivery To"
  msgstr ""
  
- #: ../sales/inquiry/sales_orders_view.php.orig:298
 -#: sales/inquiry/sales_orders_view.php:276
++#: ../sales/inquiry/sales_orders_view.php:299
  msgid "Quote #"
  msgstr ""
  
- #: ../sales/inquiry/sales_orders_view.php.orig:303
 -#: sales/inquiry/sales_orders_view.php:281
++#: ../sales/inquiry/sales_orders_view.php:304
  msgid "Quote Date"
  msgstr ""
  
- #: ../sales/inquiry/sales_orders_view.php.orig:306
 -#: sales/inquiry/sales_orders_view.php:284
++#: ../sales/inquiry/sales_orders_view.php:307
  msgid "Quote Total"
  msgstr ""
  
- #: ../sales/inquiry/sales_orders_view.php.orig:337
 -#: sales/inquiry/sales_orders_view.php:311
++#: ../sales/inquiry/sales_orders_view.php:338
  msgid "Tmpl"
  msgstr ""
  
@@@ -15192,38 -13524,31 +15487,18 @@@ msgid "
  "charges."
  msgstr ""
  
- #: ../sales/includes/db/old.sales_order_db.inc:107
- #: ../sales/includes/db/old.sales_order_db.inc:259
- #: ../sales/includes/db/sales_order_db.inc:109
- #: ../sales/includes/db/sales_order_db.inc:287
 -#: sales/includes/db/sales_invoice_db.inc:176
 -msgid "Cash invoice"
 -msgstr ""
 -
 -#: sales/includes/db/sales_order_db.inc:107
 -#: sales/includes/db/sales_order_db.inc:279
--msgid "Stocks below Re-Order Level at "
--msgstr ""
--
- #: ../sales/includes/db/old.sales_order_db.inc:110
- #: ../sales/includes/db/old.sales_order_db.inc:264
- #: ../sales/includes/db/sales_order_db.inc:112
- #: ../sales/includes/db/sales_order_db.inc:292
 -#: sales/includes/db/sales_order_db.inc:110
 -#: sales/includes/db/sales_order_db.inc:284
--msgid "Below"
--msgstr ""
--
- #: ../sales/includes/db/old.sales_order_db.inc:111
- #: ../sales/includes/db/old.sales_order_db.inc:265
- #: ../sales/includes/db/sales_order_db.inc:113
- #: ../sales/includes/db/sales_order_db.inc:293
 -#: sales/includes/db/sales_order_db.inc:111
 -#: sales/includes/db/sales_order_db.inc:285
--msgid "Please reorder"
- msgstr ""
 +#: ../sales/includes/db/old.sales_order_db.inc:139
- #: ../sales/includes/db/sales_order_db.inc:141
++#: ../sales/includes/db/sales_order_db.inc:103
++#: ../sales/includes/db/sales_order_db.inc.orig:141
 +msgid "Deleted."
  msgstr ""
  
 -#: sales/includes/db/sales_order_db.inc:139
 -msgid "Deleted."
 +#: ../sales/includes/db/sales_invoice_db.inc:198
 +msgid "Cash invoice"
  msgstr ""
  
 -#: sales/includes/ui/sales_credit_ui.inc:94
 -#: sales/includes/ui/sales_order_ui.inc:384
 +#: ../sales/includes/ui/sales_credit_ui.inc:94
 +#: ../sales/includes/ui/sales_order_ui.inc:385
  msgid "Customer Currency:"
  msgstr ""
  
index 7b85ef137449bc124fee9d1a8ec8276a88e3ad11,4d85cc9fc8f9c8cd710c7e58d64f9884aabe02b5..82173fd2fcfa56eb9d130f703404dce48a7ef37d
@@@ -38,8 -33,13 +33,13 @@@ function update_average_material_cost($
        }       
        else
                $price_in_home_currency = $price;
 -      
 +
        $price_in_home_currency_ = $price_in_home_currency;
+       //Handle if inventory will become negative
+     //8-OCT-2011 : Skip negative inventory adjustment for case of adjust_only
+     if (is_inventory_item($stock_id) && !$adj_only) 
+         handle_negative_inventory($stock_id, $qty, $price_in_home_currency, $date);
        
        $sql = "SELECT mb_flag, material_cost, labour_cost, overhead_cost FROM ".TB_PREF."stock_master WHERE stock_id=".db_escape($stock_id);
        $result = db_query($sql);
index 72d01f114463311dbc4d634b557c2a115d54cc32,6218052b3d4eb194fca41ea42bffc8e4c751ef97..8193f0ddb573c6fd15a852225c7e4fbc4035dc36
@@@ -375,22 -353,17 +376,23 @@@ function add_supp_invoice(&$supp_trans
                        /*Now insert the allocation record if > 0 */
                        if ($allocate_amount != 0) 
                        {
-                               update_supp_trans_allocation(ST_SUPPINVOICE, $supp_trans->src_docs);
-                               update_supp_trans_allocation(ST_SUPPCREDIT, $invoice_id);
-                               add_supp_allocation($allocate_amount, ST_SUPPCREDIT, $invoice_id, ST_SUPPINVOICE, $supp_trans->src_docs,
+                               add_supp_allocation($allocate_amount, ST_SUPPCREDIT, $invoice_id, ST_SUPPINVOICE, $invoice_no,
                                        $date_);
+                               update_supp_trans_allocation(ST_SUPPINVOICE, $invoice_no);
+                               update_supp_trans_allocation(ST_SUPPCREDIT, $invoice_id);
  
 -                              exchange_variation(ST_SUPPCREDIT, $invoice_id, ST_SUPPINVOICE, $invoice_no, $date_,
 +                              exchange_variation(ST_SUPPCREDIT, $invoice_id, ST_SUPPINVOICE, $supp_trans->src_docs, $date_,
                                        $allocate_amount, PT_SUPPLIER);
                        }
                }
        }
 +
 +//_vd($allocs);
 +      reallocate_payments($invoice_id, ST_SUPPINVOICE, $date_, $to_allocate, $allocs);
 +//_vd(get_payments_for($sales_order, ST_PURCHORDER));
 +//_vd(get_payments_for($invoice_id, ST_SUPPINVOICE));
 +//exit;
+       $supp_trans->trans_no = $invoice_id;
        hook_db_postwrite($supp_trans, $supp_trans->trans_type);
      commit_transaction();
  
index 547d833e3012f0031f8b394649019cdfe9e36667,c36fa8163a901813939a40702b16aad18929b6a9..a185895c7f8cf41f69c7f674629a6e23a7bf813e
@@@ -142,17 -119,26 +142,26 @@@ class supp_tran
          if ($tax_group_id == null)
                $tax_group_id = $this->tax_group_id;
          $taxes = get_tax_for_items($items, $prices, $shipping_cost, $tax_group_id, 
 -              $this->tax_included);
 +              $this->tax_included, null, $this->tax_algorithm);
  
-               if ($gl_codes)
+               if (isset($this->tax_overrides))
+                       foreach($this->tax_overrides as $id => $value) // add values entered manually
+                       {
+                               $taxes[$id]['Override'] = $value;
+                       }
+               // Taxes included in gl_codes table have exact value, but count to overrides as well.
+               // Therefore when we want to now taxes only for items (gl_codes==false),
+               // we have to subtract gl_taxes from override values.
+               foreach ($this->gl_codes as $gl_code)
                {
-                       foreach ($this->gl_codes as $gl_code)
+                       $index = is_tax_account($gl_code->gl_code);
+                       if ($index !== false)
                        {
-                               $index = is_tax_account($gl_code->gl_code);
-                               if ($index !== false)
-                               {
+                               if ($gl_codes)
                                        $taxes[$index]['Value'] += $gl_code->amount;
-                               }
+                               elseif (isset($this->tax_overrides))
+                                       $taxes[$index]['Override'] -= $gl_code->amount;
                        }
                }
  
Simple merge
Simple merge
index 1a0ac95c5be03436a87c3c270a1597767a944439,c4b91de93164aca359a267a50f7c5bd6f376c1ac..ffb5e79bd9003e15a4737951aaba813d9c8a1664
@@@ -310,9 -282,9 +321,9 @@@ function commit_item_data($n
                $_SESSION['supp_trans']->add_grn_to_trans($n, $_POST['po_detail_item'.$n],
                        $_POST['item_code'.$n], $_POST['item_description'.$n], $_POST['qty_recd'.$n],
                        $_POST['prev_quantity_inv'.$n], input_num('this_quantity_inv'.$n),
 -                      $_POST['order_price'.$n], input_num('ChgPrice'.$n),
 +                      $_POST['order_price'.$n], input_num('ChgPrice'.$n), $complete,
                        $_POST['std_cost_unit'.$n], "");
-               unset($_POST['mantax']);
+               reset_tax_input();
        }
  }
  
Simple merge
Simple merge
index 6efe4c6be836364c51b9788bf2db29d938c62c6e,82adeecb322de3fb209f949f70a0b1d14254cded..9a1c5d14dd91afb3d96f95e6f8c3ec276f8ebbf5
@@@ -192,10 -192,10 +192,10 @@@ $reports->addReport(RC_SUPPLIER, 209, _
        array(  _('From') => 'PO',
                        _('To') => 'PO',
                        _('Currency Filter') => 'CURRENCY',
-                       _('Email Customers') => 'YES_NO',
+                       _('Email Suppliers') => 'YES_NO',
                        _('Comments') => 'TEXTBOX',
                        _('Orientation') => 'ORIENTATION'));
 -$reports->addReport(RC_SUPPLIER, 210, _('Print Remittances'),
 +$reports->addReport(RC_SUPPLIER, 210, _('Print Remi&ttances'),
        array(  _('From') => 'REMITTANCE',
                        _('To') => 'REMITTANCE',
                        _('Currency Filter') => 'CURRENCY',
Simple merge
index b3cd6553952df0fa6b4118c549e894c1ae49c4be,5ead6dd49e4e1d1578d7c6ea74217582d9ef1aec..86ba5aa39a2e2bfbdb8b2caa4ad37ba86176c324
@@@ -217,61 -173,34 +179,37 @@@ function update_sales_order($order
        foreach ($order->line_items as $line)
        {
                if ($loc_notification == 1 && is_inventory_item($line->stock_id))
-               {
-                       $sql = "SELECT ".TB_PREF."loc_stock.*, "
-                                 .TB_PREF."locations.location_name, "
-                                 .TB_PREF."locations.email
-                               FROM ".TB_PREF."loc_stock, "
-                                 .TB_PREF."locations
-                               WHERE ".TB_PREF."loc_stock.loc_code=".TB_PREF."locations.loc_code
-                                AND ".TB_PREF."loc_stock.stock_id = ".db_escape($line->stock_id)."
-                                AND ".TB_PREF."loc_stock.loc_code = ".db_escape($order->Location);
-                       $res = db_query($sql,"a location could not be retreived");
-                       $loc = db_fetch($res);
-                       if ($loc['email'] != "")
-                       {
-                               $qoh = get_qoh_on_date($line->stock_id, $order->Location);
-                               $qoh -= get_demand_qty($line->stock_id, $order->Location);
-                               $qoh -= get_demand_asm_qty($line->stock_id, $order->Location);
-                               $qoh -= $line->quantity;
-                               if ($qoh < $loc['reorder_level'])
-                               {
-                                       $st_ids[] = $line->stock_id;
-                                       $st_names[] = $line->item_description;
-                                       $st_num[] = $qoh - $loc['reorder_level'];
-                                       $st_reorder[] = $loc['reorder_level'];
-                               }
-                       }
-               }
+                       $loc = calculate_reorder_level($order->Location, $line, $st_ids, $st_names, $st_num, $st_reorder); 
 -              if($line->id) {
 -                      $sql = "UPDATE ".TB_PREF."sales_order_details
 -                                              SET description = ".db_escape($line->item_description) . ", 
 -                                                              unit_price = ".db_escape($line->price) . ",
 -                                                              quantity = ".db_escape($line->quantity) . ",
 -                                                              discount_percent = ".db_escape($line->discount_percent) . "
 -                                              WHERE id = {$line->id}";
 -              }
 -              else {
 -              $sql = "INSERT INTO ".TB_PREF."sales_order_details
 -               (id, order_no, trans_type, stk_code,  description, unit_price, quantity,
 -                discount_percent, qty_sent)
 -               VALUES (";
 -              $sql .= db_escape($line->id ? $line->id : 0) . ","
 -                .$order_no . ",".$order->trans_type.","
 -                .db_escape($line->stock_id) . ","
 -                .db_escape($line->item_description) . ", "
 -                .db_escape($line->price) . ", "
 -                .db_escape($line->quantity) . ", "
 -                .db_escape($line->discount_percent) . ", "
 -                .db_escape($line->qty_done) ." )";
 -              }
 -
 -              db_query($sql, "Old order Cannot be Inserted");
 +              if (!$line->id) //new line
 +                      $sql = "INSERT INTO ".TB_PREF."sales_order_details
 +                       (order_no, trans_type, stk_code,  description, unit_price, quantity,
 +                        discount_percent, qty_sent)
 +                       VALUES (".$order_no . ",".$order->trans_type.","
 +                                .db_escape($line->stock_id) . ","
 +                                .db_escape($line->item_description) . ", "
 +                                .db_escape($line->price) . ", "
 +                                .db_escape($line->quantity) . ", "
 +                                .db_escape($line->discount_percent) . ", "
 +                                .db_escape($line->qty_done) ." )";
 +              else
 +              $sql = "UPDATE ".TB_PREF."sales_order_details
 +                      SET id=".db_escape($line->id).",
 +                              order_no=$order_no,
 +                              trans_type=".$order->trans_type.",
 +                              stk_code=".db_escape($line->stock_id).",
 +                              description=".db_escape($line->item_description).",
 +                              unit_price=".db_escape($line->price).",
 +                              quantity=".db_escape($line->quantity).",
 +                      discount_percent=".db_escape($line->discount_percent).",
 +                          qty_sent=".db_escape($line->qty_done)."
 +                       WHERE id = ".db_escape($line->id);
 +
 +              db_query($sql, "Old order Cannot be updated");
        } /* inserted line items into sales order details */
  
 +      if ($order->trans_type == ST_SALESORDER)
 +              reallocate_payments($order_no, ST_SALESORDER, $ord_date, $total, $allocs);
        add_audit_trail($order->trans_type, $order_no, $order->document_date, _("Updated."));
        $Refs->save($order->trans_type, $order_no, $order->reference);
  
Simple merge
Simple merge
index 34124078db27904b41d63e43cb50ef6fee1dbbe5,abd195d707ea50a3d8d947856133e42ef1145cff..83477e704e5ab5715827601e0a954c835c56f93c
@@@ -691,10 -692,10 +691,11 @@@ CREATE TABLE IF NOT EXISTS `0_debtor_tr
    `dimension_id` int(11) NOT NULL default '0',
    `dimension2_id` int(11) NOT NULL default '0',
    `payment_terms` int(11) default NULL,
 +  `tax_included` tinyint(1) unsigned NOT NULL default '0',
    PRIMARY KEY  (`type`,`trans_no`),
    KEY `debtor_no` (`debtor_no`,`branch_code`),
-   KEY `tran_date` (`tran_date`)
+   KEY `tran_date` (`tran_date`),
+   KEY `order_` (`order_`)
  ) ENGINE=InnoDB;
  
  --
index cc4ccb196ea4175301faabe248fbbd5af6ce6aac,dd43d66f0a045675e2b663bc4a653cb1102f68ab..5daaa8fa43a47b6fefe9efd2aa732ea94f46dd92
@@@ -650,10 -651,10 +650,11 @@@ CREATE TABLE IF NOT EXISTS `0_debtor_tr
    `dimension_id` int(11) NOT NULL default '0',
    `dimension2_id` int(11) NOT NULL default '0',
    `payment_terms` int(11) default NULL,
 +  `tax_included` tinyint(1) unsigned NOT NULL default '0',
    PRIMARY KEY  (`type`,`trans_no`),
    KEY `debtor_no` (`debtor_no`,`branch_code`),
-   KEY `tran_date` (`tran_date`)
+   KEY `tran_date` (`tran_date`),
+   KEY `order_` (`order_`)
  ) ENGINE=InnoDB;
  
  --
Simple merge