Langauage template update.

author Janusz Dobrowolski <janusz@frontaccounting.eu>

Thu, 1 Aug 2013 10:35:53 +0000 (12:35 +0200)

committer Janusz Dobrowolski <janusz@frontaccounting.eu>

Thu, 1 Aug 2013 10:35:53 +0000 (12:35 +0200)
author Janusz Dobrowolski <janusz@frontaccounting.eu>
Thu, 1 Aug 2013 10:35:53 +0000 (12:35 +0200)
committer Janusz Dobrowolski <janusz@frontaccounting.eu>
Thu, 1 Aug 2013 10:35:53 +0000 (12:35 +0200)
diff --git a/lang/new_language_template/LC_MESSAGES/empty.po b/lang/new_language_template/LC_MESSAGES/empty.po

index eea1175a06f6e06926111c09c22bad8476e0bab2..61362dafce00044600b41ca6a44d171085af3e30 100644 (file)
--- a/lang/new_language_template/LC_MESSAGES/empty.po
+++ b/lang/new_language_template/LC_MESSAGES/empty.po
@@ -8,7 +8,7 @@ msgid ""
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-08 15:48+0200\n"
+"POT-Creation-Date: 2013-08-01 12:34+0200\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -58,8 +58,7 @@ msgstr ""
  msgid "User name"
  msgstr ""
  
  msgid "User name"
  msgstr ""
  
-#: access/login.php:94 admin/change_current_user_password.php:78
-#: admin/users.php:191
+#: access/login.php:94 admin/users.php:191
  msgid "Password:"
  msgstr ""
  
  msgid "Password:"
  msgstr ""
  
@@ -127,13 +126,12 @@ msgstr ""
  #: 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
  #: admin/shipping_companies.php:106 admin/tags.php:140 admin/users.php:144
  #: dimensions/inquiry/search_dimensions.php:120
  #: gl/inquiry/journal_inquiry.php:118 gl/manage/bank_accounts.php:130
-#: gl/manage/bank_accounts.php.orig:130 gl/manage/currencies.php:164
-#: gl/manage/exchange_rates.php:94 gl/manage/gl_account_classes.php:132
-#: gl/manage/gl_account_types.php:154 gl/manage/gl_quick_entries.php:196
-#: gl/manage/gl_quick_entries.php:295 gl/includes/ui/gl_bank_ui.inc:185
-#: gl/includes/ui/gl_bank_ui.inc.orig:166 gl/includes/ui/gl_journal_ui.inc:122
+#: 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
  #: includes/ui/contacts_view.inc:64 includes/ui/simple_crud_class.inc:52
-#: inventory/prices.php:161 inventory/purchasing_data.php:166
+#: 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/includes/item_adjustments_ui.inc:87
  #: inventory/includes/stock_transfers_ui.inc:79
  #: inventory/manage/item_categories.php:121
@@ -143,8 +141,8 @@ msgstr ""
  #: manufacturing/manage/bom_edit.php:86
  #: manufacturing/manage/work_centres.php:114
  #: manufacturing/includes/work_order_issue_ui.inc:58
  #: manufacturing/manage/bom_edit.php:86
  #: manufacturing/manage/work_centres.php:114
  #: manufacturing/includes/work_order_issue_ui.inc:58
-#: purchasing/includes/ui/invoice_ui.inc:520
-#: purchasing/includes/ui/po_ui.inc:265
+#: 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
  #: 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
@@ -174,14 +172,13 @@ msgstr ""
  #: 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
  #: admin/inst_theme.php:102 admin/payment_terms.php:143 admin/printers.php:97
  #: admin/shipping_companies.php:107 admin/tags.php:141 admin/users.php:146
  #: gl/gl_budget.php:137 gl/manage/bank_accounts.php:131
-#: gl/manage/bank_accounts.php.orig:131 gl/manage/currencies.php:166
-#: gl/manage/exchange_rates.php:99 gl/manage/gl_account_classes.php:133
-#: gl/manage/gl_account_types.php:155 gl/manage/gl_quick_entries.php:197
-#: gl/manage/gl_quick_entries.php:296 gl/includes/ui/gl_bank_ui.inc:187
-#: gl/includes/ui/gl_bank_ui.inc.orig:168 gl/includes/ui/gl_journal_ui.inc:124
-#: includes/ui/contacts_view.inc:67 includes/ui/radio.ui_input.inc:284
-#: includes/ui/simple_crud_class.inc:54 includes/ui/ui_input.inc:285
-#: inventory/prices.php:162 inventory/purchasing_data.php:167
+#: 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/includes/item_adjustments_ui.inc:89
  #: inventory/includes/stock_transfers_ui.inc:81
  #: inventory/manage/item_categories.php:122
@@ -190,8 +187,8 @@ msgstr ""
  #: 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
  #: inventory/manage/sales_kits.php:56 manufacturing/manage/bom_edit.php:87
  #: manufacturing/manage/work_centres.php:115
  #: manufacturing/includes/work_order_issue_ui.inc:60
-#: purchasing/includes/ui/invoice_ui.inc:284
-#: purchasing/includes/ui/po_ui.inc:267 sales/manage/credit_status.php:120
+#: 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/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
@@ -245,11 +242,11 @@ msgstr ""
  #: 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
  #: inventory/manage/sales_kits.php:40 inventory/view/view_adjustment.php:56
  #: inventory/view/view_transfer.php:56 manufacturing/manage/bom_edit.php:70
  #: manufacturing/includes/manufacturing_ui.inc:28
-#: purchasing/includes/ui/invoice_ui.inc:471
-#: purchasing/includes/ui/invoice_ui.inc:483
+#: purchasing/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
  #: 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:100
+#: 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
  #: 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
@@ -316,11 +313,10 @@ 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
  #: 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/bank_accounts.php.orig:127
-#: gl/manage/currencies.php:162 gl/manage/gl_account_classes.php:127
-#: gl/manage/gl_quick_entries.php:230 includes/system_tests.inc:38
-#: includes/system_tests.inc:113 includes/system_tests.inc:126
-#: includes/ui/sav.ui_lists.inc:1649 includes/ui/ui_lists.inc:1672
+#: 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:1672
  #: purchasing/manage/suppliers.php:120 reporting/rep101.php:129
  #: reporting/rep102.php:114 reporting/rep102.php:116 reporting/rep104.php:105
  #: reporting/rep106.php:75 reporting/rep114.php:74 reporting/rep201.php:118
  #: purchasing/manage/suppliers.php:120 reporting/rep101.php:129
  #: reporting/rep102.php:114 reporting/rep102.php:116 reporting/rep104.php:105
  #: reporting/rep106.php:75 reporting/rep114.php:74 reporting/rep201.php:118
@@ -360,8 +356,8 @@ msgstr ""
  msgid "Create backup"
  msgstr ""
  
  msgid "Create backup"
  msgstr ""
  
-#: admin/backups.php:181 sales/includes/ui/sales_order_ui.inc:595
-#: sales/includes/ui/sales_order_ui.inc:643
+#: admin/backups.php:181 sales/includes/ui/sales_order_ui.inc:594
+#: sales/includes/ui/sales_order_ui.inc:642
  msgid "Comments:"
  msgstr ""
  
  msgid "Comments:"
  msgstr ""
  
@@ -411,39 +407,51 @@ msgid "Upload file"
  msgstr ""
  
  #: admin/change_current_user_password.php:16
  msgstr ""
  
  #: admin/change_current_user_password.php:16
-#: admin/change_current_user_password.php:85 themes/default/renderer.php:77
+#: admin/change_current_user_password.php:99 themes/default/renderer.php:77
  msgid "Change password"
  msgstr ""
  
  msgid "Change password"
  msgstr ""
  
-#: admin/change_current_user_password.php:28 admin/users.php:40
+#: admin/change_current_user_password.php:33
+msgid "Invalid password entered."
+msgstr ""
+
+#: admin/change_current_user_password.php:40 admin/users.php:40
  msgid "The password entered must be at least 4 characters long."
  msgstr ""
  
  msgid "The password entered must be at least 4 characters long."
  msgstr ""
  
-#: admin/change_current_user_password.php:35 admin/users.php:47
+#: admin/change_current_user_password.php:47 admin/users.php:47
  msgid "The password cannot contain the user login."
  msgstr ""
  
  msgid "The password cannot contain the user login."
  msgstr ""
  
-#: admin/change_current_user_password.php:42
+#: admin/change_current_user_password.php:54
  msgid "The passwords entered are not the same."
  msgstr ""
  
  msgid "The passwords entered are not the same."
  msgstr ""
  
-#: admin/change_current_user_password.php:56
+#: admin/change_current_user_password.php:68
  msgid "Password cannot be changed in demo mode."
  msgstr ""
  
  msgid "Password cannot be changed in demo mode."
  msgstr ""
  
-#: admin/change_current_user_password.php:61
+#: admin/change_current_user_password.php:73
  msgid "Your password has been updated."
  msgstr ""
  
  msgid "Your password has been updated."
  msgstr ""
  
-#: admin/change_current_user_password.php:73 admin/users.php:180
+#: admin/change_current_user_password.php:85 admin/users.php:180
  msgid "User login:"
  msgstr ""
  
  msgid "User login:"
  msgstr ""
  
-#: admin/change_current_user_password.php:79
-msgid "Repeat password:"
+#: admin/change_current_user_password.php:91
+msgid "Current Password:"
+msgstr ""
+
+#: admin/change_current_user_password.php:92
+msgid "New Password:"
+msgstr ""
+
+#: admin/change_current_user_password.php:93
+msgid "Repeat New Password:"
  msgstr ""
  
  msgstr ""
  
-#: admin/change_current_user_password.php:81
+#: admin/change_current_user_password.php:95
  msgid "Enter your new password in the fields."
  msgstr ""
  
  msgid "Enter your new password in the fields."
  msgstr ""
  
@@ -493,7 +501,7 @@ msgstr ""
  
  #: admin/company_preferences.php:165 admin/shipping_companies.php:142
  #: includes/ui/contacts_view.inc:109 inventory/manage/locations.php:202
  
  #: admin/company_preferences.php:165 admin/shipping_companies.php:142
  #: includes/ui/contacts_view.inc:109 inventory/manage/locations.php:202
-#: sales/manage/customers.php:231 sales/includes/ui/sales_order_ui.inc:634
+#: sales/manage/customers.php:231 sales/includes/ui/sales_order_ui.inc:633
  msgid "Address:"
  msgstr ""
  
  msgid "Address:"
  msgstr ""
  
@@ -621,25 +629,24 @@ msgstr ""
  #: 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
  #: 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:403 gl/gl_budget.php:135
-#: gl/manage/gl_quick_entries.php:60 gl/includes/ui/gl_bank_ui.inc:276
-#: gl/includes/ui/gl_bank_ui.inc.orig:257 gl/includes/ui/gl_journal_ui.inc:221
-#: includes/ui/db_pager_view.inc:174 includes/ui/radio.ui_input.inc:206
-#: includes/ui/radio.ui_input.inc:901 includes/ui/simple_crud_class.inc:56
-#: includes/ui/simple_crud_class.inc:227 includes/ui/ui_input.inc:207
-#: includes/ui/ui_input.inc:905 inventory/adjustments.php:233
-#: inventory/cost_update.php:138 inventory/reorder_level.php:114
-#: inventory/transfers.php:234 inventory/includes/item_adjustments_ui.inc:157
+#: dimensions/dimension_entry.php:293 gl/gl_bank.php:408 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
  #: 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:298 purchasing/includes/ui/po_ui.inc:441
-#: purchasing/po_receive_items.php:333 sales/credit_note_entry.php:284
-#: sales/customer_credit_invoice.php:380 sales/customer_delivery.php:531
+#: 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:582 sales/inquiry/sales_orders_view.php:323
  #: sales/includes/ui/sales_credit_ui.inc:293
  #: sales/includes/ui/sales_order_ui.inc:243
  #: sales/customer_invoice.php:582 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:561
+#: sales/includes/ui/sales_order_ui.inc:560
  msgid "Update"
  msgstr ""
  
  msgid "Update"
  msgstr ""
  
@@ -756,11 +763,10 @@ 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
  
  #: 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/bank_accounts.php.orig:125
-#: gl/manage/currencies.php:162 gl/manage/gl_account_classes.php:127
-#: gl/manage/gl_quick_entries.php:230 includes/system_tests.inc:38
-#: includes/system_tests.inc:113 includes/system_tests.inc:126
-#: includes/ui/sav.ui_lists.inc:1650 includes/ui/ui_lists.inc:1673
+#: 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:1673
  #: purchasing/manage/suppliers.php:120 reporting/rep101.php:128
  #: reporting/rep102.php:113 reporting/rep102.php:115 reporting/rep104.php:107
  #: reporting/rep106.php:77 reporting/rep114.php:76 reporting/rep201.php:117
  #: purchasing/manage/suppliers.php:120 reporting/rep101.php:128
  #: reporting/rep102.php:113 reporting/rep102.php:115 reporting/rep104.php:107
  #: reporting/rep106.php:77 reporting/rep114.php:76 reporting/rep201.php:117
@@ -1054,8 +1060,7 @@ msgid "Fiscal Year End"
  msgstr ""
  
  #: admin/fiscalyears.php:138 dimensions/inquiry/search_dimensions.php:133
  msgstr ""
  
  #: admin/fiscalyears.php:138 dimensions/inquiry/search_dimensions.php:133
-#: dimensions/inquiry/search_dimensions.php:139
-#: includes/ui/sav.ui_lists.inc:659 includes/ui/ui_lists.inc:676
+#: dimensions/inquiry/search_dimensions.php:139 includes/ui/ui_lists.inc:676
  #: manufacturing/search_work_orders.php:108 reporting/rep501.php:87
  #: reporting/rep710.php:113 reporting/includes/excel_report.inc:234
  #: reporting/includes/pdf_report.inc:266
  #: manufacturing/search_work_orders.php:108 reporting/rep501.php:87
  #: reporting/rep710.php:113 reporting/includes/excel_report.inc:234
  #: reporting/includes/pdf_report.inc:266
@@ -1352,9 +1357,9 @@ msgstr ""
  #: dimensions/view/view_dimension.php:55
  #: inventory/manage/item_categories.php:98
  #: manufacturing/manage/work_centres.php:101
  #: dimensions/view/view_dimension.php:55
  #: inventory/manage/item_categories.php:98
  #: manufacturing/manage/work_centres.php:101
-#: purchasing/includes/ui/invoice_ui.inc:245
-#: purchasing/includes/ui/invoice_ui.inc:247
-#: purchasing/includes/ui/invoice_ui.inc:249 reporting/rep501.php:87
+#: purchasing/includes/ui/invoice_ui.inc:258
+#: purchasing/includes/ui/invoice_ui.inc:260
+#: purchasing/includes/ui/invoice_ui.inc:262 reporting/rep501.php:87
  #: reporting/rep709.php:111 reporting/rep709.php:112
  #: sales/manage/customer_branches.php:294 sales/manage/sales_people.php:99
  #: taxes/item_tax_types.php:117
  #: reporting/rep709.php:111 reporting/rep709.php:112
  #: sales/manage/customer_branches.php:294 sales/manage/sales_people.php:99
  #: taxes/item_tax_types.php:117
@@ -1454,8 +1459,7 @@ msgstr ""
  msgid "Install third-party extension."
  msgstr ""
  
  msgid "Install third-party extension."
  msgstr ""
  
-#: admin/inst_module.php:168 includes/ui/sav.ui_lists.inc:659
-#: includes/ui/sav.ui_lists.inc:2131 includes/ui/ui_lists.inc:676
+#: admin/inst_module.php:168 includes/ui/ui_lists.inc:676
  #: includes/ui/ui_lists.inc:2153 reporting/includes/excel_report.inc:232
  #: reporting/includes/pdf_report.inc:264
  msgid "Active"
  #: includes/ui/ui_lists.inc:2153 reporting/includes/excel_report.inc:232
  #: reporting/includes/pdf_report.inc:264
  msgid "Active"
@@ -1593,10 +1597,9 @@ msgstr ""
  #: 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
  #: 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/bank_accounts.php.orig:106
-#: gl/manage/gl_quick_entries.php:186 gl/view/accrual_trans.php:52
-#: gl/includes/ui/gl_bank_ui.inc:92 gl/includes/ui/gl_bank_ui.inc.orig:80
-#: includes/ui/ui_view.inc:489 inventory/inquiry/stock_movements.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
  #: inventory/manage/item_categories.php:98
  #: manufacturing/search_work_orders.php:161
  #: manufacturing/includes/manufacturing_ui.inc:236
@@ -1805,8 +1808,8 @@ msgid "Role:"
  msgstr ""
  
  #: admin/security_roles.php:180 gl/manage/gl_accounts.php:199
  msgstr ""
  
  #: admin/security_roles.php:180 gl/manage/gl_accounts.php:199
-#: gl/manage/gl_accounts.php.orig:198 inventory/manage/items.php:433
-#: purchasing/manage/suppliers.php:289 sales/manage/customers.php:326
+#: inventory/manage/items.php:433 purchasing/manage/suppliers.php:289
+#: sales/manage/customers.php:326
  msgid "Show inactive:"
  msgstr ""
  
  msgid "Show inactive:"
  msgstr ""
  
@@ -1847,17 +1850,16 @@ msgid "Delete This Role"
  msgstr ""
  
  #: admin/security_roles.php:249 admin/void_transaction.php:229
  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:278
-#: gl/includes/ui/gl_bank_ui.inc.orig:259 gl/includes/ui/gl_journal_ui.inc:223
-#: includes/ui/radio.ui_input.inc:209 includes/ui/simple_crud_class.inc:58
-#: includes/ui/simple_crud_class.inc:231 includes/ui/ui_controls.inc:587
+#: 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
  #: 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:443
+#: purchasing/includes/ui/po_ui.inc:441
  #: sales/includes/ui/sales_credit_ui.inc:295
  #: sales/includes/ui/sales_credit_ui.inc:295
-#: sales/includes/ui/sales_order_ui.inc:563
+#: sales/includes/ui/sales_order_ui.inc:562
  msgid "Cancel"
  msgstr ""
  
  msgid "Cancel"
  msgstr ""
  
@@ -1917,8 +1919,8 @@ msgid "Address"
  msgstr ""
  
  #: admin/shipping_companies.php:134 gl/manage/gl_account_types.php:188
  msgstr ""
  
  #: admin/shipping_companies.php:134 gl/manage/gl_account_types.php:188
-#: gl/includes/ui/gl_bank_ui.inc:56 gl/includes/ui/gl_bank_ui.inc.orig:55
-#: inventory/manage/items.php:299 manufacturing/manage/work_centres.php:137
+#: gl/includes/ui/gl_bank_ui.inc:57 inventory/manage/items.php:299
+#: manufacturing/manage/work_centres.php:137
  msgid "Name:"
  msgstr ""
  
  msgid "Name:"
  msgstr ""
  
@@ -2089,7 +2091,7 @@ 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
  #: admin/view_print_transaction.php:83 admin/void_transaction.php:170
  #: dimensions/inquiry/search_dimensions.php:88
  #: gl/inquiry/journal_inquiry.php:53 manufacturing/search_work_orders.php:78
-#: purchasing/includes/ui/invoice_ui.inc:453
+#: purchasing/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/po_search_completed.php:77
  #: purchasing/inquiry/po_search.php:76
  #: purchasing/inquiry/supplier_allocation_inquiry.php:57
@@ -2129,8 +2131,8 @@ msgstr ""
  #: manufacturing/includes/manufacturing_ui.inc:276
  #: manufacturing/includes/manufacturing_ui.inc:280
  #: manufacturing/includes/manufacturing_ui.inc:331
  #: manufacturing/includes/manufacturing_ui.inc:276
  #: manufacturing/includes/manufacturing_ui.inc:280
  #: manufacturing/includes/manufacturing_ui.inc:331
-#: purchasing/includes/ui/grn_ui.inc:36 purchasing/includes/ui/grn_ui.inc:53
-#: purchasing/includes/ui/po_ui.inc:313 purchasing/view/view_po.php:115
+#: 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/view/view_supp_credit.php:43
  #: purchasing/view/view_supp_invoice.php:46
  #: purchasing/view/view_supp_payment.php:73
@@ -2152,7 +2154,7 @@ msgstr ""
  #: sales/inquiry/sales_deliveries_view.php:184
  #: sales/includes/ui/sales_credit_ui.inc:85
  #: sales/includes/ui/sales_credit_ui.inc:87
  #: 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
+#: sales/includes/ui/sales_order_ui.inc:378
  msgid "Reference"
  msgstr ""
  
  msgid "Reference"
  msgstr ""
  
@@ -2164,7 +2166,7 @@ msgstr ""
  #: 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
  #: gl/inquiry/journal_inquiry.php:128 gl/view/accrual_trans.php:52
  #: gl/view/bank_transfer_view.php:83 gl/view/gl_deposit_view.php:68
  #: gl/view/gl_payment_view.php:66 gl/view/gl_trans_view.php:36
-#: includes/ui/allocation_cart.inc:263 includes/ui/ui_view.inc:489
+#: includes/ui/allocation_cart.inc:263 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
  #: inventory/inquiry/stock_movements.php:84
  #: inventory/view/view_adjustment.php:45 inventory/view/view_transfer.php:47
  #: manufacturing/search_work_orders.php:166
@@ -2177,8 +2179,8 @@ msgstr ""
  #: manufacturing/includes/manufacturing_ui.inc:277
  #: manufacturing/includes/manufacturing_ui.inc:281
  #: manufacturing/includes/manufacturing_ui.inc:332
  #: manufacturing/includes/manufacturing_ui.inc:277
  #: manufacturing/includes/manufacturing_ui.inc:281
  #: manufacturing/includes/manufacturing_ui.inc:332
-#: purchasing/includes/ui/invoice_ui.inc:103
-#: purchasing/includes/ui/po_ui.inc:327 purchasing/view/view_po.php:140
+#: 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
  #: purchasing/inquiry/supplier_allocation_inquiry.php:131
  #: purchasing/inquiry/supplier_inquiry.php:173
  #: purchasing/allocations/supplier_allocation_main.php:97
@@ -2207,9 +2209,8 @@ msgid "Void a Transaction"
  msgstr ""
  
  #: admin/void_transaction.php:126 admin/void_transaction.php:185
  msgstr ""
  
  #: admin/void_transaction.php:126 admin/void_transaction.php:185
-#: includes/ui/radio.ui_input.inc:136 includes/ui/radio.ui_input.inc:280
-#: includes/ui/sav.ui_lists.inc:20 includes/ui/ui_input.inc:137
-#: includes/ui/ui_input.inc:281 includes/ui/ui_lists.inc:20
+#: includes/ui/ui_input.inc:137 includes/ui/ui_input.inc:281
+#: includes/ui/ui_lists.inc:20
  msgid "Select"
  msgstr ""
  
  msgid "Select"
  msgstr ""
  
@@ -2223,12 +2224,12 @@ msgstr ""
  
  #: admin/void_transaction.php:208 dimensions/dimension_entry.php:283
  #: gl/bank_transfer.php:98 gl/inquiry/journal_inquiry.php:56
  
  #: admin/void_transaction.php:208 dimensions/dimension_entry.php:283
  #: gl/bank_transfer.php:98 gl/inquiry/journal_inquiry.php:56
-#: gl/manage/revaluate_currencies.php:106 includes/ui/ui_view.inc:308
+#: 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
  #: 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:161 purchasing/po_entry_items.php:523
-#: purchasing/supplier_payment.php:321 sales/customer_payments.php:398
+#: purchasing/includes/ui/invoice_ui.inc:174 purchasing/po_entry_items.php:529
+#: purchasing/supplier_payment.php:326 sales/customer_payments.php:408
  msgid "Memo:"
  msgstr ""
  
  msgid "Memo:"
  msgstr ""
  
@@ -2246,7 +2247,7 @@ msgid ""
  "undone."
  msgstr ""
  
  "undone."
  msgstr ""
  
-#: admin/void_transaction.php:228 includes/ui/ui_controls.inc:586
+#: admin/void_transaction.php:228 includes/ui/ui_controls.inc:588
  msgid "Proceed"
  msgstr ""
  
  msgid "Proceed"
  msgstr ""
  
@@ -2259,21 +2260,21 @@ msgstr ""
  #: 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
  #: 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:175 sales/customer_credit_invoice.php:91
-#: sales/sales_order_entry.php:349 sales/manage/recurrent_invoices.php:41
+#: purchasing/supplier_payment.php:183 sales/customer_credit_invoice.php:91
+#: sales/sales_order_entry.php:350 sales/manage/recurrent_invoices.php:41
  #: sales/manage/recurrent_invoices.php:46
  #: sales/manage/recurrent_invoices.php:51
  msgid "The entered date is invalid."
  msgstr ""
  
  #: admin/void_transaction.php:254 gl/accruals.php:38 gl/bank_transfer.php:121
  #: sales/manage/recurrent_invoices.php:46
  #: sales/manage/recurrent_invoices.php:51
  msgid "The entered date is invalid."
  msgstr ""
  
  #: admin/void_transaction.php:254 gl/accruals.php:38 gl/bank_transfer.php:121
-#: gl/gl_bank.php:267 gl/gl_journal.php:162
+#: gl/gl_bank.php:265 gl/gl_journal.php:162
  #: 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:89
  #: manufacturing/work_order_entry.php:160
  #: manufacturing/work_order_issue.php:83 purchasing/supplier_credit.php:176
  #: 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:89
  #: manufacturing/work_order_entry.php:160
  #: manufacturing/work_order_issue.php:83 purchasing/supplier_credit.php:176
-#: purchasing/supplier_invoice.php:174 purchasing/supplier_payment.php:181
+#: purchasing/supplier_invoice.php:174 purchasing/supplier_payment.php:189
  #: sales/create_recurrent_invoices.php:121 sales/credit_note_entry.php:157
  #: sales/customer_credit_invoice.php:95 sales/customer_payments.php:151
  msgid "The entered date is not in fiscal year."
  #: sales/create_recurrent_invoices.php:121 sales/credit_note_entry.php:157
  #: sales/customer_credit_invoice.php:95 sales/customer_payments.php:151
  msgid "The entered date is not in fiscal year."
@@ -2353,7 +2354,7 @@ msgstr ""
  #: admin/db/voiding_db.inc:114
  #: manufacturing/includes/db/work_orders_db.inc:446
  #: manufacturing/includes/db/work_orders_db.inc:462
  #: 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:206
+#: sales/includes/db/sales_invoice_db.inc:208
  msgid "Voided."
  msgstr ""
  
  msgid "Voided."
  msgstr ""
  
@@ -2919,17 +2920,17 @@ msgid "The dimension reference must be entered."
  msgstr ""
  
  #: dimensions/dimension_entry.php:123 gl/bank_transfer.php:176
  msgstr ""
  
  #: dimensions/dimension_entry.php:123 gl/bank_transfer.php:176
-#: gl/gl_bank.php:255 gl/gl_journal.php:176
+#: gl/gl_bank.php:253 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
  #: 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:154 purchasing/supplier_payment.php:204
+#: purchasing/supplier_invoice.php:154 purchasing/supplier_payment.php:212
  #: 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:319 sales/customer_payments.php:164
  #: 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:319 sales/customer_payments.php:164
-#: sales/customer_payments.php:171 sales/sales_order_entry.php:441
+#: sales/customer_payments.php:171 sales/sales_order_entry.php:442
  msgid "The entered reference is already in use."
  msgstr ""
  
  msgid "The entered reference is already in use."
  msgstr ""
  
@@ -3016,9 +3017,9 @@ msgid "Delete unused dimension"
  msgstr ""
  
  #: dimensions/dimension_entry.php:302 includes/ui/simple_crud_class.inc:225
  msgstr ""
  
  #: dimensions/dimension_entry.php:302 includes/ui/simple_crud_class.inc:225
-#: purchasing/includes/ui/invoice_ui.inc:186
-#: purchasing/includes/ui/invoice_ui.inc:392
-#: purchasing/includes/ui/invoice_ui.inc:394
+#: purchasing/includes/ui/invoice_ui.inc:199
+#: purchasing/includes/ui/invoice_ui.inc:405
+#: purchasing/includes/ui/invoice_ui.inc:407
  msgid "Add"
  msgstr ""
  
  msgid "Add"
  msgstr ""
  
@@ -3033,9 +3034,9 @@ 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
  #: 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:245
-#: purchasing/includes/ui/invoice_ui.inc:247
-#: purchasing/includes/ui/invoice_ui.inc:249 reporting/rep701.php:111
+#: 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
  msgid "Account"
  #: reporting/rep705.php:238 reporting/rep706.php:185 reporting/rep707.php:210
  #: reporting/rep708.php:192
  msgid "Account"
@@ -3098,8 +3099,8 @@ msgstr ""
  
  #: dimensions/inquiry/search_dimensions.php:73 gl/bank_transfer.php:79
  #: gl/inquiry/journal_inquiry.php:45 gl/manage/revaluate_currencies.php:105
  
  #: dimensions/inquiry/search_dimensions.php:73 gl/bank_transfer.php:79
  #: gl/inquiry/journal_inquiry.php:45 gl/manage/revaluate_currencies.php:105
-#: gl/includes/ui/gl_bank_ui.inc:26 gl/includes/ui/gl_bank_ui.inc.orig:25
-#: gl/includes/ui/gl_journal_ui.inc:30 includes/ui/contacts_view.inc:94
+#: 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
  #: inventory/includes/item_adjustments_ui.inc:35
  #: inventory/includes/stock_transfers_ui.inc:40
  #: manufacturing/search_work_orders.php:67
@@ -3107,34 +3108,32 @@ msgstr ""
  #: manufacturing/work_order_entry.php:378
  #: manufacturing/work_order_entry.php:385
  #: manufacturing/includes/work_order_issue_ui.inc:156
  #: manufacturing/work_order_entry.php:378
  #: manufacturing/work_order_entry.php:385
  #: manufacturing/includes/work_order_issue_ui.inc:156
-#: purchasing/includes/ui/invoice_ui.inc:92
-#: purchasing/includes/ui/po_ui.inc:158 purchasing/includes/ui/po_ui.inc:163
-#: purchasing/supplier_payment.php:294 sales/customer_payments.php:367
+#: 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:300 sales/customer_payments.php:372
  msgid "Reference:"
  msgstr ""
  
  #: dimensions/inquiry/search_dimensions.php:75
  msgid "Reference:"
  msgstr ""
  
  #: dimensions/inquiry/search_dimensions.php:75
-#: includes/ui/allocation_cart.inc:284 includes/ui/sav.ui_lists.inc:1898
-#: includes/ui/ui_lists.inc:1920 reporting/rep101.php:115
-#: reporting/rep102.php:96 reporting/rep104.php:97 reporting/rep104.php:101
-#: reporting/rep105.php:95 reporting/rep105.php:99 reporting/rep201.php:104
-#: 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
+#: includes/ui/allocation_cart.inc:284 includes/ui/ui_lists.inc:1920
+#: reporting/rep101.php:115 reporting/rep102.php:96 reporting/rep104.php:97
+#: reporting/rep104.php:101 reporting/rep105.php:95 reporting/rep105.php:99
+#: reporting/rep201.php:104 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
  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:51
-#: gl/includes/ui/gl_bank_ui.inc:118 gl/includes/ui/gl_bank_ui.inc.orig:50
-#: gl/includes/ui/gl_bank_ui.inc.orig:105
-#: inventory/inquiry/stock_movements.php:62
+#: 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
  #: purchasing/inquiry/supplier_allocation_inquiry.php:50
  #: purchasing/inquiry/supplier_inquiry.php:53
  #: sales/inquiry/customer_inquiry.php:50
@@ -3143,8 +3142,7 @@ 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
  
  #: 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 gl/includes/ui/gl_bank_ui.inc.orig:105
-#: inventory/inquiry/stock_movements.php:63
+#: 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
  #: purchasing/inquiry/supplier_allocation_inquiry.php:51
  #: purchasing/inquiry/supplier_inquiry.php:54
  #: sales/inquiry/customer_inquiry.php:51
@@ -3163,7 +3161,7 @@ msgstr ""
  
  #: dimensions/inquiry/search_dimensions.php:132
  #: dimensions/view/view_dimension.php:55 includes/ui/allocation_cart.inc:263
  
  #: dimensions/inquiry/search_dimensions.php:132
  #: dimensions/view/view_dimension.php:55 includes/ui/allocation_cart.inc:263
-#: purchasing/includes/ui/invoice_ui.inc:112
+#: 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/view/view_supp_credit.php:48
  #: purchasing/view/view_supp_invoice.php:51
  #: purchasing/inquiry/supplier_allocation_inquiry.php:132
@@ -3176,7 +3174,7 @@ msgstr ""
  #: sales/view/view_invoice.php:96
  #: sales/inquiry/customer_allocation_inquiry.php:148
  #: sales/inquiry/customer_inquiry.php:229
  #: sales/view/view_invoice.php:96
  #: sales/inquiry/customer_allocation_inquiry.php:148
  #: sales/inquiry/customer_inquiry.php:229
-#: sales/includes/ui/sales_order_ui.inc:602
+#: sales/includes/ui/sales_order_ui.inc:601
  msgid "Due Date"
  msgstr ""
  
  msgid "Due Date"
  msgstr ""
  
@@ -3257,17 +3255,14 @@ msgstr ""
  #: gl/view/accrual_trans.php:56 gl/view/gl_deposit_view.php:99
  #: gl/view/gl_deposit_view.php:102 gl/view/gl_payment_view.php:98
  #: gl/view/gl_payment_view.php:101 gl/view/gl_trans_view.php:63
  #: gl/view/accrual_trans.php:56 gl/view/gl_deposit_view.php:99
  #: gl/view/gl_deposit_view.php:102 gl/view/gl_payment_view.php:98
  #: gl/view/gl_payment_view.php:101 gl/view/gl_trans_view.php:63
-#: gl/view/gl_trans_view.php:66 gl/includes/ui/gl_bank_ui.inc:151
-#: gl/includes/ui/gl_bank_ui.inc:152 gl/includes/ui/gl_bank_ui.inc:154
-#: gl/includes/ui/gl_bank_ui.inc.orig:132
-#: gl/includes/ui/gl_bank_ui.inc.orig:133
-#: gl/includes/ui/gl_bank_ui.inc.orig:135 gl/includes/ui/gl_journal_ui.inc:83
-#: gl/includes/ui/gl_journal_ui.inc:84 gl/includes/ui/gl_journal_ui.inc:86
-#: includes/sysnames.inc:43 includes/sysnames.inc:165
-#: inventory/manage/item_categories.php:216
+#: 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/item_categories.php:218 inventory/manage/items.php:343
-#: inventory/manage/items.php:345 purchasing/includes/ui/invoice_ui.inc:245
-#: purchasing/includes/ui/invoice_ui.inc:247
+#: 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
  #: 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
@@ -3289,8 +3284,8 @@ msgstr ""
  #: sales/customer_invoice.php:447 sales/manage/customers.php:270
  #: sales/manage/customers.php:272 sales/includes/ui/sales_credit_ui.inc:132
  #: sales/includes/ui/sales_credit_ui.inc:137
  #: sales/customer_invoice.php:447 sales/manage/customers.php:270
  #: sales/manage/customers.php:272 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
+#: sales/includes/ui/sales_order_ui.inc:456
+#: sales/includes/ui/sales_order_ui.inc:461
  msgid "Dimension"
  msgstr ""
  
  msgid "Dimension"
  msgstr ""
  
@@ -3301,21 +3296,18 @@ msgstr ""
  #: gl/view/gl_deposit_view.php:106 gl/view/gl_payment_view.php:99
  #: gl/view/gl_payment_view.php:102 gl/view/gl_payment_view.php:105
  #: gl/view/gl_trans_view.php:64 gl/view/gl_trans_view.php:67
  #: gl/view/gl_deposit_view.php:106 gl/view/gl_payment_view.php:99
  #: gl/view/gl_payment_view.php:102 gl/view/gl_payment_view.php:105
  #: gl/view/gl_trans_view.php:64 gl/view/gl_trans_view.php:67
-#: gl/view/gl_trans_view.php:70 gl/includes/ui/gl_bank_ui.inc:152
-#: gl/includes/ui/gl_bank_ui.inc:155 gl/includes/ui/gl_bank_ui.inc:158
-#: gl/includes/ui/gl_bank_ui.inc:298 gl/includes/ui/gl_bank_ui.inc.orig:133
-#: gl/includes/ui/gl_bank_ui.inc.orig:136
-#: gl/includes/ui/gl_bank_ui.inc.orig:139
-#: gl/includes/ui/gl_bank_ui.inc.orig:279 gl/includes/ui/gl_journal_ui.inc:84
+#: gl/view/gl_trans_view.php:70 gl/includes/ui/gl_bank_ui.inc:153
+#: gl/includes/ui/gl_bank_ui.inc:156 gl/includes/ui/gl_bank_ui.inc:159
+#: gl/includes/ui/gl_bank_ui.inc:312 gl/includes/ui/gl_journal_ui.inc:84
  #: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90
  #: gl/includes/ui/gl_journal_ui.inc:240
  #: inventory/includes/item_adjustments_ui.inc:181
  #: inventory/includes/stock_transfers_ui.inc:161
  #: manufacturing/includes/work_order_issue_ui.inc:169
  #: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90
  #: gl/includes/ui/gl_journal_ui.inc:240
  #: inventory/includes/item_adjustments_ui.inc:181
  #: inventory/includes/stock_transfers_ui.inc:161
  #: manufacturing/includes/work_order_issue_ui.inc:169
-#: purchasing/includes/ui/invoice_ui.inc:245
-#: purchasing/includes/ui/invoice_ui.inc:247
-#: purchasing/includes/ui/invoice_ui.inc:249
-#: sales/customer_credit_invoice.php:364 sales/customer_delivery.php:527
+#: purchasing/includes/ui/invoice_ui.inc:258
+#: purchasing/includes/ui/invoice_ui.inc:260
+#: purchasing/includes/ui/invoice_ui.inc:262
+#: sales/customer_credit_invoice.php:364 sales/customer_delivery.php:529
  #: sales/customer_invoice.php:578 sales/includes/ui/sales_credit_ui.inc:339
  msgid "Memo"
  msgstr ""
  #: sales/customer_invoice.php:578 sales/includes/ui/sales_credit_ui.inc:339
  msgid "Memo"
  msgstr ""
@@ -3367,16 +3359,13 @@ msgstr ""
  #: gl/view/gl_deposit_view.php:103 gl/view/gl_deposit_view.php:106
  #: gl/view/gl_payment_view.php:65 gl/view/gl_payment_view.php:99
  #: gl/view/gl_payment_view.php:102 gl/view/gl_payment_view.php:105
  #: gl/view/gl_deposit_view.php:103 gl/view/gl_deposit_view.php:106
  #: gl/view/gl_payment_view.php:65 gl/view/gl_payment_view.php:99
  #: gl/view/gl_payment_view.php:102 gl/view/gl_payment_view.php:105
-#: gl/includes/ui/gl_bank_ui.inc:152 gl/includes/ui/gl_bank_ui.inc:155
-#: gl/includes/ui/gl_bank_ui.inc:158 gl/includes/ui/gl_bank_ui.inc.orig:133
-#: gl/includes/ui/gl_bank_ui.inc.orig:136
-#: gl/includes/ui/gl_bank_ui.inc.orig:139 includes/sysnames.inc:132
-#: includes/ui/allocation_cart.inc:263 includes/ui/sav.ui_lists.inc:1163
-#: includes/ui/ui_lists.inc:1184
+#: 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:263 includes/ui/ui_lists.inc:1184
  #: manufacturing/includes/manufacturing_ui.inc:236
  #: manufacturing/includes/manufacturing_ui.inc:236
-#: purchasing/includes/ui/invoice_ui.inc:245
-#: purchasing/includes/ui/invoice_ui.inc:247
-#: purchasing/includes/ui/invoice_ui.inc:249
+#: purchasing/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
  #: 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
@@ -3510,12 +3499,12 @@ msgid "Transfer Date:"
  msgstr ""
  
  #: gl/bank_transfer.php:87 gl/bank_transfer.php:94
  msgstr ""
  
  #: gl/bank_transfer.php:87 gl/bank_transfer.php:94
-#: sales/customer_payments.php:396
+#: sales/customer_payments.php:406
  msgid "Amount:"
  msgstr ""
  
  #: gl/bank_transfer.php:88 gl/bank_transfer.php:95
  msgid "Amount:"
  msgstr ""
  
  #: gl/bank_transfer.php:88 gl/bank_transfer.php:95
-#: purchasing/supplier_payment.php:307 sales/customer_payments.php:381
+#: purchasing/supplier_payment.php:313 sales/customer_payments.php:391
  msgid "Bank Charge:"
  msgstr ""
  
  msgid "Bank Charge:"
  msgstr ""
  
@@ -3523,12 +3512,12 @@ msgstr ""
  msgid "Enter Transfer"
  msgstr ""
  
  msgid "Enter Transfer"
  msgstr ""
  
-#: gl/bank_transfer.php:128 gl/bank_transfer.php:158
+#: gl/bank_transfer.php:128 gl/bank_transfer.php:158 gl/bank_transfer.php:190
  #: purchasing/supplier_payment.php:126 purchasing/supplier_payment.php:132
  msgid "The entered amount is invalid or less than zero."
  msgstr ""
  
  #: purchasing/supplier_payment.php:126 purchasing/supplier_payment.php:132
  msgid "The entered amount is invalid or less than zero."
  msgstr ""
  
-#: gl/bank_transfer.php:133 gl/gl_bank.php:225
+#: gl/bank_transfer.php:133 gl/gl_bank.php:223
  msgid "The total bank amount cannot be 0."
  msgstr ""
  
  msgid "The total bank amount cannot be 0."
  msgstr ""
  
@@ -3537,7 +3526,7 @@ msgstr ""
  msgid "The total bank amount exceeds allowed limit (%s) for source account."
  msgstr ""
  
  msgid "The total bank amount exceeds allowed limit (%s) for source account."
  msgstr ""
  
-#: gl/bank_transfer.php:150 gl/gl_bank.php:242
+#: gl/bank_transfer.php:150 gl/gl_bank.php:240
  #, php-format
  msgid ""
  "The bank transaction would result in exceed of authorized overdraft limit "
  #, php-format
  msgid ""
  "The bank transaction would result in exceed of authorized overdraft limit "
@@ -3550,15 +3539,15 @@ msgid ""
  "The Bank Charge Account has not been set in System and General GL Setup."
  msgstr ""
  
  "The Bank Charge Account has not been set in System and General GL Setup."
  msgstr ""
  
-#: gl/bank_transfer.php:169 gl/gl_bank.php:249 gl/gl_journal.php:168
+#: gl/bank_transfer.php:169 gl/gl_bank.php:247 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
  #: 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:197 sales/credit_note_entry.php:147
+#: purchasing/supplier_payment.php:205 sales/credit_note_entry.php:147
  #: sales/customer_credit_invoice.php:102 sales/customer_delivery.php:166
  #: sales/customer_invoice.php:280 sales/customer_payments.php:157
  #: sales/customer_credit_invoice.php:102 sales/customer_delivery.php:166
  #: sales/customer_invoice.php:280 sales/customer_payments.php:157
-#: sales/sales_order_entry.php:412
+#: sales/sales_order_entry.php:413
  msgid "You must enter a reference."
  msgstr ""
  
  msgid "You must enter a reference."
  msgstr ""
  
@@ -3566,6 +3555,10 @@ msgstr ""
  msgid "The source and destination bank accouts cannot be the same."
  msgstr ""
  
  msgid "The source and destination bank accouts cannot be the same."
  msgstr ""
  
+#: gl/bank_transfer.php:195
+msgid "The incomming bank amount cannot be 0."
+msgstr ""
+
  #: gl/gl_bank.php:34
  msgid "Bank Account Payment Entry"
  msgstr ""
  #: gl/gl_bank.php:34
  msgid "Bank Account Payment Entry"
  msgstr ""
@@ -3582,24 +3575,24 @@ msgstr ""
  msgid "Modify Bank Deposit Entry"
  msgstr ""
  
  msgid "Modify Bank Deposit Entry"
  msgstr ""
  
-#: gl/gl_bank.php:73
+#: gl/gl_bank.php:74
  #, php-format
  msgid "Payment %d has been entered"
  msgstr ""
  
  #, php-format
  msgid "Payment %d has been entered"
  msgstr ""
  
-#: gl/gl_bank.php:75 gl/gl_bank.php:93
+#: gl/gl_bank.php:76 gl/gl_bank.php:94
  msgid "&View the GL Postings for this Payment"
  msgstr ""
  
  msgid "&View the GL Postings for this Payment"
  msgstr ""
  
-#: gl/gl_bank.php:77 gl/gl_bank.php:95
+#: gl/gl_bank.php:78 gl/gl_bank.php:96
  msgid "Enter Another &Payment"
  msgstr ""
  
  msgid "Enter Another &Payment"
  msgstr ""
  
-#: gl/gl_bank.php:79 gl/gl_bank.php:97
+#: gl/gl_bank.php:80 gl/gl_bank.php:98
  msgid "Enter A &Deposit"
  msgstr ""
  
  msgid "Enter A &Deposit"
  msgstr ""
  
-#: gl/gl_bank.php:81 gl/gl_journal.php:61 inventory/adjustments.php:50
+#: 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:52 sales/credit_note_entry.php:77
  #: 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:52 sales/credit_note_entry.php:77
@@ -3608,83 +3601,87 @@ msgstr ""
  msgid "Add an Attachment"
  msgstr ""
  
  msgid "Add an Attachment"
  msgstr ""
  
-#: gl/gl_bank.php:91
+#: gl/gl_bank.php:92
  #, php-format
  msgid "Payment %d has been modified"
  msgstr ""
  
  #, php-format
  msgid "Payment %d has been modified"
  msgstr ""
  
-#: gl/gl_bank.php:107
+#: gl/gl_bank.php:108
  #, php-format
  msgid "Deposit %d has been entered"
  msgstr ""
  
  #, php-format
  msgid "Deposit %d has been entered"
  msgstr ""
  
-#: gl/gl_bank.php:109
+#: gl/gl_bank.php:110
  msgid "View the GL Postings for this Deposit"
  msgstr ""
  
  msgid "View the GL Postings for this Deposit"
  msgstr ""
  
-#: gl/gl_bank.php:111
+#: gl/gl_bank.php:112
  msgid "Enter Another Deposit"
  msgstr ""
  
  msgid "Enter Another Deposit"
  msgstr ""
  
-#: gl/gl_bank.php:113
+#: gl/gl_bank.php:114
  msgid "Enter A Payment"
  msgstr ""
  
  msgid "Enter A Payment"
  msgstr ""
  
-#: gl/gl_bank.php:122
+#: gl/gl_bank.php:123
  #, php-format
  msgid "Deposit %d has been modified"
  msgstr ""
  
  #, php-format
  msgid "Deposit %d has been modified"
  msgstr ""
  
-#: gl/gl_bank.php:124
+#: gl/gl_bank.php:125
  msgid "&View the GL Postings for this Deposit"
  msgstr ""
  
  msgid "&View the GL Postings for this Deposit"
  msgstr ""
  
-#: gl/gl_bank.php:126
+#: gl/gl_bank.php:127
  msgid "Enter Another &Deposit"
  msgstr ""
  
  msgid "Enter Another &Deposit"
  msgstr ""
  
-#: gl/gl_bank.php:128
+#: gl/gl_bank.php:129
  msgid "Enter A &Payment"
  msgstr ""
  
  msgid "Enter A &Payment"
  msgstr ""
  
-#: gl/gl_bank.php:219
+#: gl/gl_bank.php:217
  msgid "You must enter at least one payment line."
  msgstr ""
  
  msgid "You must enter at least one payment line."
  msgstr ""
  
-#: gl/gl_bank.php:236 purchasing/supplier_payment.php:190
+#: gl/gl_bank.php:234 purchasing/supplier_payment.php:198
  #, php-format
  msgid "The total bank amount exceeds allowed limit (%s)."
  msgstr ""
  
  #, php-format
  msgid "The total bank amount exceeds allowed limit (%s)."
  msgstr ""
  
-#: gl/gl_bank.php:261
+#: gl/gl_bank.php:259
  msgid "The entered date for the payment is invalid."
  msgstr ""
  
  msgid "The entered date for the payment is invalid."
  msgstr ""
  
-#: gl/gl_bank.php:273
+#: gl/gl_bank.php:271
  msgid "You have to select customer and customer branch."
  msgstr ""
  
  msgid "You have to select customer and customer branch."
  msgstr ""
  
-#: gl/gl_bank.php:277
+#: gl/gl_bank.php:275
  msgid "You have to select supplier."
  msgstr ""
  
  msgid "You have to select supplier."
  msgstr ""
  
-#: gl/gl_bank.php:325
+#: gl/gl_bank.php:324
  msgid "The amount entered is not a valid number or is less than zero."
  msgstr ""
  
  msgid "The amount entered is not a valid number or is less than zero."
  msgstr ""
  
-#: gl/gl_bank.php:397
+#: gl/gl_bank.php:330 gl/manage/exchange_rates.php:39
+msgid "The exchange rate cannot be zero or a negative number."
+msgstr ""
+
+#: gl/gl_bank.php:402
  msgid "Payment Items"
  msgstr ""
  
  msgid "Payment Items"
  msgstr ""
  
-#: gl/gl_bank.php:397
+#: gl/gl_bank.php:402
  msgid "Deposit Items"
  msgstr ""
  
  msgid "Deposit Items"
  msgstr ""
  
-#: gl/gl_bank.php:405
+#: gl/gl_bank.php:410
  msgid "Process Payment"
  msgstr ""
  
  msgid "Process Payment"
  msgstr ""
  
-#: gl/gl_bank.php:405
+#: gl/gl_bank.php:410
  msgid "Process Deposit"
  msgstr ""
  
  msgid "Process Deposit"
  msgstr ""
  
@@ -3693,7 +3690,6 @@ msgid "Budget Entry"
  msgstr ""
  
  #: gl/gl_budget.php:26 gl/manage/gl_accounts.php:23
  msgstr ""
  
  #: gl/gl_budget.php:26 gl/manage/gl_accounts.php:23
-#: gl/manage/gl_accounts.php.orig:23
  msgid ""
  "There are no account groups defined. Please define at least one account "
  "group before entering accounts."
  msgid ""
  "There are no account groups defined. Please define at least one account "
  "group before entering accounts."
@@ -3708,8 +3704,7 @@ msgid "The Budget has been deleted."
  msgstr ""
  
  #: gl/gl_budget.php:64 gl/manage/gl_accounts.php:231
  msgstr ""
  
  #: gl/gl_budget.php:64 gl/manage/gl_accounts.php:231
-#: gl/manage/gl_accounts.php:241 gl/manage/gl_accounts.php.orig:230
-#: gl/manage/gl_accounts.php.orig:240
+#: gl/manage/gl_accounts.php:241
  msgid "Account Code:"
  msgstr ""
  
  msgid "Account Code:"
  msgstr ""
  
@@ -3720,7 +3715,7 @@ 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:141
  #: reporting/rep105.php:118 reporting/rep106.php:92 reporting/rep114.php:90
  #: 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:141
  #: reporting/rep105.php:118 reporting/rep106.php:92 reporting/rep114.php:90
-#: reporting/rep201.php:130 reporting/rep304.php:121 reporting/rep305.php:105
+#: reporting/rep201.php:130 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/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
@@ -3745,24 +3740,23 @@ msgstr ""
  #: 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:132
  #: gl/view/gl_payment_view.php:131 gl/view/gl_trans_view.php:106
  #: 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:132
  #: gl/view/gl_payment_view.php:131 gl/view/gl_trans_view.php:106
-#: gl/includes/ui/gl_bank_ui.inc:201 gl/includes/ui/gl_bank_ui.inc.orig:182
-#: gl/includes/ui/gl_journal_ui.inc:141
+#: 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
  #: inventory/includes/item_adjustments_ui.inc:63
  #: inventory/includes/item_adjustments_ui.inc:102
  #: manufacturing/includes/manufacturing_ui.inc:178
-#: purchasing/includes/ui/invoice_ui.inc:309
-#: purchasing/includes/ui/invoice_ui.inc:474
-#: purchasing/includes/ui/invoice_ui.inc:544
+#: purchasing/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:252 reporting/rep106.php:84 reporting/rep106.php:119
  #: reporting/rep106.php:162 reporting/rep114.php:161 reporting/rep201.php:237
  #: reporting/rep203.php:94 reporting/rep203.php:171 reporting/rep204.php:113
  #: reporting/rep204.php:141 reporting/rep301.php:133 reporting/rep301.php:170
  #: purchasing/po_receive_items.php:63 purchasing/view/view_po.php:140
  #: purchasing/allocations/supplier_allocation_main.php:100
  #: reporting/rep101.php:252 reporting/rep106.php:84 reporting/rep106.php:119
  #: reporting/rep106.php:162 reporting/rep114.php:161 reporting/rep201.php:237
  #: 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:100
-#: reporting/rep305.php:126 reporting/rep305.php:182 reporting/rep306.php:141
-#: reporting/rep306.php:177 reporting/rep306.php:197 reporting/rep306.php:213
-#: reporting/rep306.php:262 reporting/rep306.php:277 reporting/rep306.php:288
+#: 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/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
@@ -3844,7 +3838,7 @@ msgstr ""
  msgid "The credit amount entered is not a valid number or is less than zero."
  msgstr ""
  
  msgid "The credit amount entered is not a valid number or is less than zero."
  msgstr ""
  
-#: gl/gl_journal.php:243 includes/ui/ui_view.inc:674
+#: gl/gl_journal.php:243 includes/ui/ui_view.inc:732
  #: purchasing/supplier_credit.php:119 purchasing/supplier_invoice.php:119
  msgid "Cannot post to GL account used by more than one tax type."
  msgstr ""
  #: purchasing/supplier_credit.php:119 purchasing/supplier_invoice.php:119
  msgid "Cannot post to GL account used by more than one tax type."
  msgstr ""
@@ -3955,10 +3949,10 @@ msgid "The from date cannot be bigger than the fiscal year end."
  msgstr ""
  
  #: gl/inquiry/gl_trial_balance.php:186 gl/manage/bank_accounts.php:106
  msgstr ""
  
  #: gl/inquiry/gl_trial_balance.php:186 gl/manage/bank_accounts.php:106
-#: gl/manage/bank_accounts.php.orig:106 gl/view/gl_trans_view.php:63
-#: gl/view/gl_trans_view.php:66 gl/view/gl_trans_view.php:69
-#: reporting/rep701.php:111 reporting/rep702.php:53 reporting/rep705.php:238
-#: reporting/rep706.php:185 reporting/rep707.php:210 reporting/rep708.php:192
+#: 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
  msgid "Account Name"
  msgstr ""
  
  msgid "Account Name"
  msgstr ""
  
@@ -4073,48 +4067,46 @@ msgstr ""
  msgid "Total payable or refund"
  msgstr ""
  
  msgid "Total payable or refund"
  msgstr ""
  
-#: gl/manage/bank_accounts.php:16 gl/manage/bank_accounts.php.orig:16
-#: reporting/reports_main.php:310
+#: gl/manage/bank_accounts.php:16 reporting/reports_main.php:310
  msgid "Bank Accounts"
  msgstr ""
  
  msgid "Bank Accounts"
  msgstr ""
  
-#: gl/manage/bank_accounts.php:33 gl/manage/bank_accounts.php.orig:33
+#: gl/manage/bank_accounts.php:33
  msgid "The bank account name cannot be empty."
  msgstr ""
  
  msgid "The bank account name cannot be empty."
  msgstr ""
  
-#: gl/manage/bank_accounts.php:39 gl/manage/bank_accounts.php.orig:39
+#: gl/manage/bank_accounts.php:39
  msgid "The GL account selected is already in use. Select another GL account."
  msgstr ""
  
  msgid "The GL account selected is already in use. Select another GL account."
  msgstr ""
  
-#: gl/manage/bank_accounts.php:52 gl/manage/bank_accounts.php.orig:52
+#: gl/manage/bank_accounts.php:52
  msgid "Bank account has been updated"
  msgstr ""
  
  msgid "Bank account has been updated"
  msgstr ""
  
-#: gl/manage/bank_accounts.php:61 gl/manage/bank_accounts.php.orig:61
+#: gl/manage/bank_accounts.php:61
  msgid "New bank account has been added"
  msgstr ""
  
  msgid "New bank account has been added"
  msgstr ""
  
-#: gl/manage/bank_accounts.php:76 gl/manage/bank_accounts.php.orig:76
+#: gl/manage/bank_accounts.php:76
  msgid ""
  "Cannot delete this bank account because transactions have been created using "
  "this account."
  msgstr ""
  
  msgid ""
  "Cannot delete this bank account because transactions have been created using "
  "this account."
  msgstr ""
  
-#: gl/manage/bank_accounts.php:82 gl/manage/bank_accounts.php.orig:82
+#: gl/manage/bank_accounts.php:82
  msgid ""
  "Cannot delete this bank account because POS definitions have been created "
  "using this account."
  msgstr ""
  
  msgid ""
  "Cannot delete this bank account because POS definitions have been created "
  "using this account."
  msgstr ""
  
-#: gl/manage/bank_accounts.php:87 gl/manage/bank_accounts.php.orig:87
+#: gl/manage/bank_accounts.php:87
  msgid "Selected bank account has been deleted"
  msgstr ""
  
  msgid "Selected bank account has been deleted"
  msgstr ""
  
-#: gl/manage/bank_accounts.php:106 gl/manage/bank_accounts.php.orig:106
-#: gl/view/bank_transfer_view.php:69 gl/view/bank_transfer_view.php:78
-#: gl/view/gl_deposit_view.php:66 gl/view/gl_payment_view.php:64
-#: inventory/prices.php:149 inventory/purchasing_data.php:149
-#: purchasing/view/view_supp_credit.php:49
+#: 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/view/view_supp_invoice.php:53
  #: purchasing/inquiry/po_search_completed.php:127
  #: purchasing/inquiry/po_search.php:136
@@ -4145,60 +4137,55 @@ msgstr ""
  msgid "Currency"
  msgstr ""
  
  msgid "Currency"
  msgstr ""
  
-#: gl/manage/bank_accounts.php:106 gl/manage/bank_accounts.php.orig:106
+#: gl/manage/bank_accounts.php:106
  msgid "GL Account"
  msgstr ""
  
  msgid "GL Account"
  msgstr ""
  
-#: gl/manage/bank_accounts.php:107 gl/manage/bank_accounts.php.orig:107
-#: reporting/includes/doctext.inc:247
+#: gl/manage/bank_accounts.php:107 reporting/includes/doctext.inc:247
  msgid "Bank"
  msgstr ""
  
  msgid "Bank"
  msgstr ""
  
-#: gl/manage/bank_accounts.php:107 gl/manage/bank_accounts.php.orig:107
-#: includes/ui/ui_view.inc:489
+#: gl/manage/bank_accounts.php:107 includes/ui/ui_view.inc:547
  msgid "Number"
  msgstr ""
  
  msgid "Number"
  msgstr ""
  
-#: gl/manage/bank_accounts.php:107 gl/manage/bank_accounts.php.orig:107
+#: gl/manage/bank_accounts.php:107
  msgid "Bank Address"
  msgstr ""
  
  msgid "Bank Address"
  msgstr ""
  
-#: gl/manage/bank_accounts.php:107 gl/manage/bank_accounts.php.orig:107
+#: gl/manage/bank_accounts.php:107
  msgid "Dflt"
  msgstr ""
  
  msgid "Dflt"
  msgstr ""
  
-#: gl/manage/bank_accounts.php:163 gl/manage/bank_accounts.php.orig:163
+#: gl/manage/bank_accounts.php:163
  msgid "Bank Account Name:"
  msgstr ""
  
  #: gl/manage/bank_accounts.php:167 gl/manage/bank_accounts.php:171
  msgid "Bank Account Name:"
  msgstr ""
  
  #: gl/manage/bank_accounts.php:167 gl/manage/bank_accounts.php:171
-#: gl/manage/bank_accounts.php.orig:167 gl/manage/bank_accounts.php.orig:171
  msgid "Account Type:"
  msgstr ""
  
  #: gl/manage/bank_accounts.php:175 gl/manage/bank_accounts.php:179
  msgid "Account Type:"
  msgstr ""
  
  #: gl/manage/bank_accounts.php:175 gl/manage/bank_accounts.php:179
-#: gl/manage/bank_accounts.php.orig:175 gl/manage/bank_accounts.php.orig:179
  msgid "Bank Account Currency:"
  msgstr ""
  
  msgid "Bank Account Currency:"
  msgstr ""
  
-#: gl/manage/bank_accounts.php:182 gl/manage/bank_accounts.php.orig:182
+#: gl/manage/bank_accounts.php:182
  msgid "Default currency account:"
  msgstr ""
  
  #: gl/manage/bank_accounts.php:185 gl/manage/bank_accounts.php:187
  msgid "Default currency account:"
  msgstr ""
  
  #: gl/manage/bank_accounts.php:185 gl/manage/bank_accounts.php:187
-#: gl/manage/bank_accounts.php.orig:185 gl/manage/bank_accounts.php.orig:187
  msgid "Bank Account GL Code:"
  msgstr ""
  
  msgid "Bank Account GL Code:"
  msgstr ""
  
-#: gl/manage/bank_accounts.php:189 gl/manage/bank_accounts.php.orig:189
+#: gl/manage/bank_accounts.php:189
  msgid "Bank Name:"
  msgstr ""
  
  msgid "Bank Name:"
  msgstr ""
  
-#: gl/manage/bank_accounts.php:190 gl/manage/bank_accounts.php.orig:190
+#: gl/manage/bank_accounts.php:190
  msgid "Bank Account Number:"
  msgstr ""
  
  msgid "Bank Account Number:"
  msgstr ""
  
-#: gl/manage/bank_accounts.php:191 gl/manage/bank_accounts.php.orig:191
+#: gl/manage/bank_accounts.php:191
  msgid "Bank Address:"
  msgstr ""
  
  msgid "Bank Address:"
  msgstr ""
  
@@ -4314,10 +4301,6 @@ msgstr ""
  msgid "Exchange Rates"
  msgstr ""
  
  msgid "Exchange Rates"
  msgstr ""
  
-#: gl/manage/exchange_rates.php:39
-msgid "The exchange rate cannot be zero or a negative number."
-msgstr ""
-
  #: gl/manage/exchange_rates.php:45
  msgid "The exchange rate for the date is already there."
  msgstr ""
  #: gl/manage/exchange_rates.php:45
  msgid "The exchange rate for the date is already there."
  msgstr ""
@@ -4326,8 +4309,7 @@ msgstr ""
  msgid "Date to Use From:"
  msgstr ""
  
  msgid "Date to Use From:"
  msgstr ""
  
-#: gl/manage/exchange_rates.php:141 includes/ui/ui_view.inc:288
-#: includes/ui/ui_view.inc:290
+#: gl/manage/exchange_rates.php:141 includes/ui/ui_view.inc:325
  msgid "Exchange Rate:"
  msgstr ""
  
  msgid "Exchange Rate:"
  msgstr ""
  
@@ -4420,32 +4402,31 @@ msgstr ""
  msgid "Class Type:"
  msgstr ""
  
  msgid "Class Type:"
  msgstr ""
  
-#: gl/manage/gl_accounts.php:16 gl/manage/gl_accounts.php.orig:16
-#: reporting/rep701.php:117
+#: gl/manage/gl_accounts.php:16 reporting/rep701.php:117
  msgid "Chart of Accounts"
  msgstr ""
  
  msgid "Chart of Accounts"
  msgstr ""
  
-#: gl/manage/gl_accounts.php:53 gl/manage/gl_accounts.php.orig:53
+#: gl/manage/gl_accounts.php:53
  msgid "The account code must be entered."
  msgstr ""
  
  msgid "The account code must be entered."
  msgstr ""
  
-#: gl/manage/gl_accounts.php:59 gl/manage/gl_accounts.php.orig:59
+#: gl/manage/gl_accounts.php:59
  msgid "The account name cannot be empty."
  msgstr ""
  
  msgid "The account name cannot be empty."
  msgstr ""
  
-#: gl/manage/gl_accounts.php:65 gl/manage/gl_accounts.php.orig:65
+#: gl/manage/gl_accounts.php:65
  msgid "The account code must be numeric."
  msgstr ""
  
  msgid "The account code must be numeric."
  msgstr ""
  
-#: gl/manage/gl_accounts.php:80 gl/manage/gl_accounts.php.orig:81
+#: gl/manage/gl_accounts.php:80
  msgid "The account belongs to a bank account and cannot be inactivated."
  msgstr ""
  
  msgid "The account belongs to a bank account and cannot be inactivated."
  msgstr ""
  
-#: gl/manage/gl_accounts.php:89 gl/manage/gl_accounts.php.orig:90
+#: gl/manage/gl_accounts.php:89
  msgid "Account data has been updated."
  msgstr ""
  
  msgid "Account data has been updated."
  msgstr ""
  
-#: gl/manage/gl_accounts.php:98 gl/manage/gl_accounts.php.orig:99
+#: gl/manage/gl_accounts.php:98
  msgid "New account has been added."
  msgstr ""
  
  msgid "New account has been added."
  msgstr ""
  
@@ -4453,88 +4434,88 @@ msgstr ""
  msgid "Account not added, possible duplicate Account Code."
  msgstr ""
  
  msgid "Account not added, possible duplicate Account Code."
  msgstr ""
  
-#: gl/manage/gl_accounts.php:117 gl/manage/gl_accounts.php.orig:116
+#: gl/manage/gl_accounts.php:117
  msgid ""
  "Cannot delete this account because transactions have been created using this "
  "account."
  msgstr ""
  
  msgid ""
  "Cannot delete this account because transactions have been created using this "
  "account."
  msgstr ""
  
-#: gl/manage/gl_accounts.php:123 gl/manage/gl_accounts.php.orig:122
+#: gl/manage/gl_accounts.php:123
  msgid ""
  "Cannot delete this account because it is used as one of the company default "
  "GL accounts."
  msgstr ""
  
  msgid ""
  "Cannot delete this account because it is used as one of the company default "
  "GL accounts."
  msgstr ""
  
-#: gl/manage/gl_accounts.php:129 gl/manage/gl_accounts.php.orig:128
+#: gl/manage/gl_accounts.php:129
  msgid "Cannot delete this account because it is used by a bank account."
  msgstr ""
  
  msgid "Cannot delete this account because it is used by a bank account."
  msgstr ""
  
-#: gl/manage/gl_accounts.php:135 gl/manage/gl_accounts.php.orig:134
+#: gl/manage/gl_accounts.php:135
  msgid ""
  "Cannot delete this account because it is used by one or more Item Categories."
  msgstr ""
  
  msgid ""
  "Cannot delete this account because it is used by one or more Item Categories."
  msgstr ""
  
-#: gl/manage/gl_accounts.php:141 gl/manage/gl_accounts.php.orig:140
+#: gl/manage/gl_accounts.php:141
  msgid "Cannot delete this account because it is used by one or more Items."
  msgstr ""
  
  msgid "Cannot delete this account because it is used by one or more Items."
  msgstr ""
  
-#: gl/manage/gl_accounts.php:147 gl/manage/gl_accounts.php.orig:146
+#: gl/manage/gl_accounts.php:147
  msgid "Cannot delete this account because it is used by one or more Taxes."
  msgstr ""
  
  msgid "Cannot delete this account because it is used by one or more Taxes."
  msgstr ""
  
-#: gl/manage/gl_accounts.php:153 gl/manage/gl_accounts.php.orig:152
+#: gl/manage/gl_accounts.php:153
  msgid ""
  "Cannot delete this account because it is used by one or more Customer "
  "Branches."
  msgstr ""
  
  msgid ""
  "Cannot delete this account because it is used by one or more Customer "
  "Branches."
  msgstr ""
  
-#: gl/manage/gl_accounts.php:159 gl/manage/gl_accounts.php.orig:158
+#: gl/manage/gl_accounts.php:159
  msgid "Cannot delete this account because it is used by one or more suppliers."
  msgstr ""
  
  msgid "Cannot delete this account because it is used by one or more suppliers."
  msgstr ""
  
-#: gl/manage/gl_accounts.php:165 gl/manage/gl_accounts.php.orig:164
+#: gl/manage/gl_accounts.php:165
  msgid ""
  "Cannot delete this account because it is used by one or more Quick Entry "
  "Lines."
  msgstr ""
  
  msgid ""
  "Cannot delete this account because it is used by one or more Quick Entry "
  "Lines."
  msgstr ""
  
-#: gl/manage/gl_accounts.php:183 gl/manage/gl_accounts.php.orig:182
+#: gl/manage/gl_accounts.php:183
  msgid "Selected account has been deleted"
  msgstr ""
  
  msgid "Selected account has been deleted"
  msgstr ""
  
-#: gl/manage/gl_accounts.php:198 gl/manage/gl_accounts.php.orig:197
+#: gl/manage/gl_accounts.php:198
  msgid "New account"
  msgstr ""
  
  msgid "New account"
  msgstr ""
  
-#: gl/manage/gl_accounts.php:244 gl/manage/gl_accounts.php.orig:243
+#: gl/manage/gl_accounts.php:244
  msgid "Account Code 2:"
  msgstr ""
  
  msgid "Account Code 2:"
  msgstr ""
  
-#: gl/manage/gl_accounts.php:246 gl/manage/gl_accounts.php.orig:245
+#: gl/manage/gl_accounts.php:246
  msgid "Account Name:"
  msgstr ""
  
  msgid "Account Name:"
  msgstr ""
  
-#: gl/manage/gl_accounts.php:248 gl/manage/gl_accounts.php.orig:247
+#: gl/manage/gl_accounts.php:248
  msgid "Account Group:"
  msgstr ""
  
  msgid "Account Group:"
  msgstr ""
  
-#: gl/manage/gl_accounts.php:250 gl/manage/gl_accounts.php.orig:249
+#: gl/manage/gl_accounts.php:250
  msgid "Account Tags:"
  msgstr ""
  
  msgid "Account Tags:"
  msgstr ""
  
-#: gl/manage/gl_accounts.php:252 gl/manage/gl_accounts.php.orig:251
+#: gl/manage/gl_accounts.php:252
  msgid "Account status:"
  msgstr ""
  
  msgid "Account status:"
  msgstr ""
  
-#: gl/manage/gl_accounts.php:257 gl/manage/gl_accounts.php.orig:256
+#: gl/manage/gl_accounts.php:257
  msgid "Add Account"
  msgstr ""
  
  msgid "Add Account"
  msgstr ""
  
-#: gl/manage/gl_accounts.php:261 gl/manage/gl_accounts.php.orig:260
+#: gl/manage/gl_accounts.php:261
  msgid "Update Account"
  msgstr ""
  
  msgid "Update Account"
  msgstr ""
  
-#: gl/manage/gl_accounts.php:262 gl/manage/gl_accounts.php.orig:261
+#: gl/manage/gl_accounts.php:262
  msgid "Delete account"
  msgstr ""
  
  msgid "Delete account"
  msgstr ""
  
@@ -4610,8 +4591,8 @@ msgstr ""
  msgid "Quick Entries"
  msgstr ""
  
  msgid "Quick Entries"
  msgstr ""
  
-#: gl/manage/gl_quick_entries.php:58 includes/ui/radio.ui_input.inc:204
-#: includes/ui/simple_crud_class.inc:221 includes/ui/ui_input.inc:205
+#: gl/manage/gl_quick_entries.php:58 includes/ui/simple_crud_class.inc:221
+#: includes/ui/ui_input.inc:205
  msgid "Add new"
  msgstr ""
  
  msgid "Add new"
  msgstr ""
  
@@ -4799,23 +4780,18 @@ msgstr ""
  #: gl/view/gl_deposit_view.php:105 gl/view/gl_payment_view.php:98
  #: gl/view/gl_payment_view.php:101 gl/view/gl_payment_view.php:104
  #: gl/view/gl_trans_view.php:63 gl/view/gl_trans_view.php:66
  #: gl/view/gl_deposit_view.php:105 gl/view/gl_payment_view.php:98
  #: gl/view/gl_payment_view.php:101 gl/view/gl_payment_view.php:104
  #: gl/view/gl_trans_view.php:63 gl/view/gl_trans_view.php:66
-#: gl/view/gl_trans_view.php:69 gl/includes/ui/gl_bank_ui.inc:151
-#: gl/includes/ui/gl_bank_ui.inc:154 gl/includes/ui/gl_bank_ui.inc:157
-#: gl/includes/ui/gl_bank_ui.inc.orig:132
-#: gl/includes/ui/gl_bank_ui.inc.orig:135
-#: gl/includes/ui/gl_bank_ui.inc.orig:138 gl/includes/ui/gl_journal_ui.inc:83
-#: gl/includes/ui/gl_journal_ui.inc:86 gl/includes/ui/gl_journal_ui.inc:89
-#: reporting/rep701.php:111
+#: gl/view/gl_trans_view.php:69 gl/includes/ui/gl_bank_ui.inc:152
+#: gl/includes/ui/gl_bank_ui.inc:155 gl/includes/ui/gl_bank_ui.inc:158
+#: gl/includes/ui/gl_journal_ui.inc:83 gl/includes/ui/gl_journal_ui.inc:86
+#: gl/includes/ui/gl_journal_ui.inc:89 reporting/rep701.php:111
  msgid "Account Code"
  msgstr ""
  
  #: gl/view/gl_deposit_view.php:99 gl/view/gl_deposit_view.php:102
  #: gl/view/gl_deposit_view.php:105 gl/view/gl_payment_view.php:98
  #: gl/view/gl_payment_view.php:101 gl/view/gl_payment_view.php:104
  msgid "Account Code"
  msgstr ""
  
  #: gl/view/gl_deposit_view.php:99 gl/view/gl_deposit_view.php:102
  #: gl/view/gl_deposit_view.php:105 gl/view/gl_payment_view.php:98
  #: gl/view/gl_payment_view.php:101 gl/view/gl_payment_view.php:104
-#: gl/includes/ui/gl_bank_ui.inc:151 gl/includes/ui/gl_bank_ui.inc:154
-#: gl/includes/ui/gl_bank_ui.inc:157 gl/includes/ui/gl_bank_ui.inc.orig:132
-#: gl/includes/ui/gl_bank_ui.inc.orig:135
-#: gl/includes/ui/gl_bank_ui.inc.orig:138 gl/includes/ui/gl_journal_ui.inc:83
+#: gl/includes/ui/gl_bank_ui.inc:152 gl/includes/ui/gl_bank_ui.inc:155
+#: gl/includes/ui/gl_bank_ui.inc:158 gl/includes/ui/gl_journal_ui.inc:83
  #: gl/includes/ui/gl_journal_ui.inc:86 gl/includes/ui/gl_journal_ui.inc:89
  msgid "Account Description"
  msgstr ""
  #: gl/includes/ui/gl_journal_ui.inc:86 gl/includes/ui/gl_journal_ui.inc:89
  msgid "Account Description"
  msgstr ""
@@ -4878,23 +4854,16 @@ msgstr ""
  msgid "To"
  msgstr ""
  
  msgid "To"
  msgstr ""
  
-#: gl/includes/db/gl_db_banking.inc:428
+#: gl/includes/db/gl_db_banking.inc:439
  msgid "Document reentered."
  msgstr ""
  
  msgid "Document reentered."
  msgstr ""
  
-#: gl/includes/db/gl_db_rates.inc:139
-#, php-format
-msgid ""
-"Cannot retrieve currency rate from %s page. Please set the rate manually."
-msgstr ""
-
  #: gl/includes/db/gl_db_trans.inc:93
  #, php-format
  msgid "Rounding error %s encountered for trans_type:%s,trans_no:%s"
  msgstr ""
  
  #: gl/includes/db/gl_db_trans.inc:93
  #, php-format
  msgid "Rounding error %s encountered for trans_type:%s,trans_no:%s"
  msgstr ""
  
-#: gl/includes/ui/gl_bank_ui.inc:24 gl/includes/ui/gl_bank_ui.inc.orig:23
-#: gl/includes/ui/gl_journal_ui.inc:27
+#: gl/includes/ui/gl_bank_ui.inc:24 gl/includes/ui/gl_journal_ui.inc:27
  #: inventory/includes/item_adjustments_ui.inc:39
  #: inventory/includes/stock_transfers_ui.inc:42
  #: manufacturing/work_order_add_finished.php:208
  #: inventory/includes/item_adjustments_ui.inc:39
  #: inventory/includes/stock_transfers_ui.inc:42
  #: manufacturing/work_order_add_finished.php:208
@@ -4905,118 +4874,121 @@ msgstr ""
  msgid "Date:"
  msgstr ""
  
  msgid "Date:"
  msgstr ""
  
-#: gl/includes/ui/gl_bank_ui.inc:51 gl/includes/ui/gl_bank_ui.inc.orig:50
+#: gl/includes/ui/gl_bank_ui.inc:52
  msgid "Pay To:"
  msgstr ""
  
  msgid "Pay To:"
  msgstr ""
  
-#: gl/includes/ui/gl_bank_ui.inc:56 gl/includes/ui/gl_bank_ui.inc.orig:55
+#: gl/includes/ui/gl_bank_ui.inc:57
  msgid "To the Order of:"
  msgstr ""
  
  msgid "To the Order of:"
  msgstr ""
  
-#: gl/includes/ui/gl_bank_ui.inc:63 gl/includes/ui/gl_bank_ui.inc.orig:62
-#: inventory/purchasing_data.php:210 inventory/purchasing_data.php:214
-#: purchasing/includes/ui/invoice_ui.inc:73
-#: purchasing/includes/ui/invoice_ui.inc:80
-#: purchasing/includes/ui/po_ui.inc:119 purchasing/includes/ui/po_ui.inc:124
+#: 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
  msgid "Supplier:"
  msgstr ""
  
  msgid "Supplier:"
  msgstr ""
  
-#: gl/includes/ui/gl_bank_ui.inc:66 gl/includes/ui/gl_bank_ui.inc.orig:65
-#: sales/manage/recurrent_invoices.php:169
+#: gl/includes/ui/gl_bank_ui.inc:67 sales/manage/recurrent_invoices.php:169
  #: sales/includes/ui/sales_credit_ui.inc:29
  #: sales/includes/ui/sales_order_ui.inc:284
  msgid "Customer:"
  msgstr ""
  
  #: sales/includes/ui/sales_credit_ui.inc:29
  #: sales/includes/ui/sales_order_ui.inc:284
  msgid "Customer:"
  msgstr ""
  
-#: gl/includes/ui/gl_bank_ui.inc:70 gl/includes/ui/gl_bank_ui.inc.orig:69
-#: sales/customer_payments.php:347 sales/manage/recurrent_invoices.php:172
+#: gl/includes/ui/gl_bank_ui.inc:71 sales/customer_payments.php:350
+#: sales/manage/recurrent_invoices.php:172
  #: sales/includes/ui/sales_credit_ui.inc:37
  #: sales/includes/ui/sales_order_ui.inc:291
  msgid "Branch:"
  msgstr ""
  
  #: sales/includes/ui/sales_credit_ui.inc:37
  #: sales/includes/ui/sales_order_ui.inc:291
  msgid "Branch:"
  msgstr ""
  
-#: gl/includes/ui/gl_bank_ui.inc:84 gl/includes/ui/gl_bank_ui.inc:87
-#: sales/customer_payments.php:356
+#: gl/includes/ui/gl_bank_ui.inc:85 gl/includes/ui/gl_bank_ui.inc:88
+#: sales/customer_payments.php:365
  msgid "This customer account is on hold."
  msgstr ""
  
  msgid "This customer account is on hold."
  msgstr ""
  
-#: gl/includes/ui/gl_bank_ui.inc:99 gl/includes/ui/gl_bank_ui.inc.orig:87
-#: gl/includes/ui/gl_journal_ui.inc:58 gl/includes/ui/gl_journal_ui.inc:62
-#: purchasing/includes/ui/invoice_ui.inc:231
+#: gl/includes/ui/gl_bank_ui.inc:101 gl/includes/ui/gl_journal_ui.inc:58
+#: gl/includes/ui/gl_journal_ui.inc:62
+#: purchasing/includes/ui/invoice_ui.inc:244
  msgid "Go"
  msgstr ""
  
  msgid "Go"
  msgstr ""
  
-#: gl/includes/ui/gl_bank_ui.inc:118
+#: gl/includes/ui/gl_bank_ui.inc:120
  msgid "Into:"
  msgstr ""
  
  msgid "Into:"
  msgstr ""
  
-#: gl/includes/ui/gl_bank_ui.inc:186 gl/includes/ui/gl_bank_ui.inc.orig:167
-#: includes/ui/simple_crud_class.inc:52
+#: 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
  #: inventory/includes/item_adjustments_ui.inc:88
  #: inventory/includes/stock_transfers_ui.inc:80
  #: manufacturing/includes/work_order_issue_ui.inc:59
-#: purchasing/includes/ui/invoice_ui.inc:520
-#: purchasing/includes/ui/po_ui.inc:266
+#: 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
  msgid "Edit document line"
  msgstr ""
  
  #: sales/includes/ui/sales_credit_ui.inc:198
  #: sales/includes/ui/sales_order_ui.inc:209
  msgid "Edit document line"
  msgstr ""
  
-#: gl/includes/ui/gl_bank_ui.inc:188 gl/includes/ui/gl_bank_ui.inc.orig:169
-#: includes/ui/simple_crud_class.inc:54
+#: 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
  #: inventory/includes/item_adjustments_ui.inc:90
  #: inventory/includes/stock_transfers_ui.inc:82
  #: manufacturing/includes/work_order_issue_ui.inc:61
-#: purchasing/includes/ui/invoice_ui.inc:285
-#: purchasing/includes/ui/po_ui.inc:268
+#: 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
  msgid "Remove line from document"
  msgstr ""
  
  #: sales/includes/ui/sales_credit_ui.inc:200
  #: sales/includes/ui/sales_order_ui.inc:211
  msgid "Remove line from document"
  msgstr ""
  
-#: gl/includes/ui/gl_bank_ui.inc:277 gl/includes/ui/gl_bank_ui.inc.orig:258
-#: gl/includes/ui/gl_journal_ui.inc:222 includes/ui/simple_crud_class.inc:56
+#: 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
  #: 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:442
+#: purchasing/includes/ui/po_ui.inc:440
  #: sales/includes/ui/sales_credit_ui.inc:294
  #: sales/includes/ui/sales_credit_ui.inc:294
-#: sales/includes/ui/sales_order_ui.inc:562
+#: sales/includes/ui/sales_order_ui.inc:561
  msgid "Confirm changes"
  msgstr ""
  
  msgid "Confirm changes"
  msgstr ""
  
-#: gl/includes/ui/gl_bank_ui.inc:279 gl/includes/ui/gl_bank_ui.inc.orig:260
-#: gl/includes/ui/gl_journal_ui.inc:224 includes/ui/simple_crud_class.inc:58
+#: 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
  #: 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:444
+#: purchasing/includes/ui/po_ui.inc:442
  #: sales/includes/ui/sales_credit_ui.inc:296
  #: sales/includes/ui/sales_credit_ui.inc:296
-#: sales/includes/ui/sales_order_ui.inc:564
+#: sales/includes/ui/sales_order_ui.inc:563
  msgid "Cancel changes"
  msgstr ""
  
  msgid "Cancel changes"
  msgstr ""
  
-#: gl/includes/ui/gl_bank_ui.inc:284 gl/includes/ui/gl_bank_ui.inc.orig:265
-#: gl/includes/ui/gl_journal_ui.inc:228
+#: 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
  #: 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:450
+#: purchasing/includes/ui/po_ui.inc:448
  #: sales/includes/ui/sales_credit_ui.inc:302
  #: sales/includes/ui/sales_credit_ui.inc:302
-#: sales/includes/ui/sales_order_ui.inc:570
+#: sales/includes/ui/sales_order_ui.inc:569
  msgid "Add Item"
  msgstr ""
  
  msgid "Add Item"
  msgstr ""
  
-#: gl/includes/ui/gl_bank_ui.inc:285 gl/includes/ui/gl_bank_ui.inc.orig:266
+#: 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
  #: 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:451
+#: purchasing/includes/ui/po_ui.inc:449
  #: sales/includes/ui/sales_credit_ui.inc:303
  #: sales/includes/ui/sales_credit_ui.inc:303
-#: sales/includes/ui/sales_order_ui.inc:571
+#: sales/includes/ui/sales_order_ui.inc:570
  msgid "Add new item to document"
  msgstr ""
  
  msgid "Add new item to document"
  msgstr ""
  
+#: gl/includes/ui/gl_bank_ui.inc:309
+msgid "Settled AR Amount:"
+msgstr ""
+
+#: gl/includes/ui/gl_bank_ui.inc:309
+msgid "Settled AP Amount:"
+msgstr ""
+
  #: gl/includes/ui/gl_journal_ui.inc:38
  msgid "Reverse Transaction:"
  msgstr ""
  #: gl/includes/ui/gl_journal_ui.inc:38
  msgid "Reverse Transaction:"
  msgstr ""
@@ -5585,22 +5557,22 @@ msgid ""
  "rate manually on Exchange Rates page."
  msgstr ""
  
  "rate manually on Exchange Rates page."
  msgstr ""
  
-#: includes/current_user.inc:91 includes/ldap.current_user.inc:96
+#: includes/current_user.inc:91
  msgid ""
  "Before software upgrade you have to include old $security_groups and "
  "$security_headings arrays from old config.php file to the new one."
  msgstr ""
  
  msgid ""
  "Before software upgrade you have to include old $security_groups and "
  "$security_headings arrays from old config.php file to the new one."
  msgstr ""
  
-#: includes/current_user.inc:92 includes/ldap.current_user.inc:97
-#: includes/ui/ui_controls.inc:190 includes/ui/ui_view.inc:845
+#: includes/current_user.inc:92 includes/ui/ui_controls.inc:190
+#: includes/ui/ui_view.inc:903
  msgid "Back"
  msgstr ""
  
  msgid "Back"
  msgstr ""
  
-#: includes/current_user.inc:102 includes/ldap.current_user.inc:107
+#: includes/current_user.inc:102
  msgid "System is available for site admin only until full database upgrade"
  msgstr ""
  
  msgid "System is available for site admin only until full database upgrade"
  msgstr ""
  
-#: includes/current_user.inc:523 includes/ldap.current_user.inc:544
+#: includes/current_user.inc:523
  msgid "Requesting data..."
  msgstr ""
  
  msgid "Requesting data..."
  msgstr ""
  
@@ -5676,58 +5648,58 @@ msgstr ""
  msgid "Package '%s' not found."
  msgstr ""
  
  msgid "Package '%s' not found."
  msgstr ""
  
-#: includes/session.inc:132 includes/session.inc.ldap.inc:39
+#: includes/session.inc:136
  msgid "Incorrect Password"
  msgstr ""
  
  msgid "Incorrect Password"
  msgstr ""
  
-#: includes/session.inc:133 includes/session.inc.ldap.inc:40
+#: includes/session.inc:137
  msgid "The user and password combination is not valid for the system."
  msgstr ""
  
  msgid "The user and password combination is not valid for the system."
  msgstr ""
  
-#: includes/session.inc:135 includes/session.inc.ldap.inc:42
+#: includes/session.inc:139
  msgid ""
  "If you are not an authorized user, please contact your system administrator "
  "to obtain an account to enable you to use the system."
  msgstr ""
  
  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:136 includes/session.inc.ldap.inc:43
+#: includes/session.inc:140
  msgid "Try again"
  msgstr ""
  
  msgid "Try again"
  msgstr ""
  
-#: includes/session.inc:176
+#: includes/session.inc:180
  #, php-format
  msgid ""
  "Brute force attack on account '%s' detected. Access for non-logged users "
  "temporarily blocked."
  msgstr ""
  
  #, php-format
  msgid ""
  "Brute force attack on account '%s' detected. Access for non-logged users "
  "temporarily blocked."
  msgstr ""
  
-#: includes/session.inc:207 includes/session.inc.ldap.inc:62
+#: includes/session.inc:211
  msgid "Security settings have not been defined for your user account."
  msgstr ""
  
  msgid "Security settings have not been defined for your user account."
  msgstr ""
  
-#: includes/session.inc:208 includes/session.inc.ldap.inc:63
+#: includes/session.inc:212
  msgid "Please contact your system administrator."
  msgstr ""
  
  msgid "Please contact your system administrator."
  msgstr ""
  
-#: includes/session.inc:209 includes/session.inc.ldap.inc:64
+#: includes/session.inc:213
  msgid ""
  "Please remove $security_groups and $security_headings arrays from config.php "
  "file!"
  msgstr ""
  
  msgid ""
  "Please remove $security_groups and $security_headings arrays from config.php "
  "file!"
  msgstr ""
  
-#: includes/session.inc:211 includes/session.inc.ldap.inc:66
+#: includes/session.inc:215
  msgid ""
  "Access to application has been blocked until database upgrade is completed "
  "by system administrator."
  msgstr ""
  
  msgid ""
  "Access to application has been blocked until database upgrade is completed "
  "by system administrator."
  msgstr ""
  
-#: includes/session.inc:225 includes/session.inc.ldap.inc:80
+#: includes/session.inc:229
  msgid ""
  "The security settings on your account do not permit you to access this "
  "function"
  msgstr ""
  
  msgid ""
  "The security settings on your account do not permit you to access this "
  "function"
  msgstr ""
  
-#: includes/session.inc:234 includes/session.inc.ldap.inc:89
+#: includes/session.inc:238
  msgid ""
  "System is blocked after source upgrade until database is updated on System/"
  "Software Upgrade page"
  msgid ""
  "System is blocked after source upgrade until database is updated on System/"
  "Software Upgrade page"
@@ -5769,7 +5741,7 @@ msgstr ""
  msgid "Inventory Adjustment"
  msgstr ""
  
  msgid "Inventory Adjustment"
  msgstr ""
  
-#: includes/sysnames.inc:32 purchasing/includes/ui/po_ui.inc:322
+#: includes/sysnames.inc:32 purchasing/includes/ui/po_ui.inc:320
  #: purchasing/view/view_po.php:30
  msgid "Purchase Order"
  msgstr ""
  #: purchasing/view/view_po.php:30
  msgid "Purchase Order"
  msgstr ""
@@ -5807,7 +5779,7 @@ msgstr ""
  msgid "Sales Order"
  msgstr ""
  
  msgid "Sales Order"
  msgstr ""
  
-#: includes/sysnames.inc:41 sales/sales_order_entry.php:636
+#: includes/sysnames.inc:41 sales/sales_order_entry.php:637
  msgid "Sales Quotation"
  msgstr ""
  
  msgid "Sales Quotation"
  msgstr ""
  
@@ -5871,7 +5843,7 @@ msgstr ""
  msgid "SP"
  msgstr ""
  
  msgid "SP"
  msgstr ""
  
-#: includes/sysnames.inc:61 reporting/rep204.php:84 reporting/rep305.php:100
+#: includes/sysnames.inc:61 reporting/rep204.php:84 reporting/rep305.php:101
  msgid "GRN"
  msgstr ""
  
  msgid "GRN"
  msgstr ""
  
@@ -5954,8 +5926,8 @@ msgid "Customer"
  msgstr ""
  
  #: includes/sysnames.inc:97 includes/sysnames.inc:172
  msgstr ""
  
  #: includes/sysnames.inc:97 includes/sysnames.inc:172
-#: inventory/purchasing_data.php:149 purchasing/includes/ui/grn_ui.inc:20
-#: purchasing/includes/ui/po_ui.inc:315
+#: 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/view/view_supp_credit.php:42
  #: purchasing/view/view_supp_invoice.php:45
  #: purchasing/inquiry/po_search_completed.php:123
@@ -6120,7 +6092,7 @@ msgstr ""
  msgid "Apr"
  msgstr ""
  
  msgid "Apr"
  msgstr ""
  
-#: includes/sysnames.inc:187 includes/ui/ui_view.inc:842
+#: includes/sysnames.inc:187 includes/ui/ui_view.inc:900
  msgid "May"
  msgstr ""
  
  msgid "May"
  msgstr ""
  
@@ -6417,13 +6389,13 @@ msgid ""
  "trail record."
  msgstr ""
  
  "trail record."
  msgstr ""
  
-#: includes/db/inventory_db.inc:252
+#: includes/db/inventory_db.inc:253
  #: inventory/includes/db/items_trans_db.inc:60
  #, php-format
  msgid "Cost was %s changed to %s x quantity on hand for item '%s'"
  msgstr ""
  
  #: inventory/includes/db/items_trans_db.inc:60
  #, php-format
  msgid "Cost was %s changed to %s x quantity on hand for item '%s'"
  msgstr ""
  
-#: includes/db/inventory_db.inc:293
+#: includes/db/inventory_db.inc:294
  msgid "Zero/negative inventory handling"
  msgstr ""
  
  msgid "Zero/negative inventory handling"
  msgstr ""
  
@@ -6447,13 +6419,13 @@ msgstr ""
  msgid "Other Allocations"
  msgstr ""
  
  msgid "Other Allocations"
  msgstr ""
  
-#: includes/ui/allocation_cart.inc:264 includes/ui/ui_view.inc:490
+#: includes/ui/allocation_cart.inc:264 includes/ui/ui_view.inc:548
  #: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186
  msgid "This Allocation"
  msgstr ""
  
  #: includes/ui/allocation_cart.inc:264 includes/ui/allocation_cart.inc:311
  #: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186
  msgid "This Allocation"
  msgstr ""
  
  #: includes/ui/allocation_cart.inc:264 includes/ui/allocation_cart.inc:311
-#: includes/ui/ui_view.inc:490
+#: includes/ui/ui_view.inc:548
  #: purchasing/allocations/supplier_allocation_main.php:101
  #: reporting/rep112.php:156 reporting/rep210.php:163
  #: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186
  #: purchasing/allocations/supplier_allocation_main.php:101
  #: reporting/rep112.php:156 reporting/rep210.php:163
  #: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186
@@ -6549,8 +6521,7 @@ msgstr ""
  msgid "You have to select at least one category."
  msgstr ""
  
  msgid "You have to select at least one category."
  msgstr ""
  
-#: includes/ui/db_pager_view.inc:166 includes/ui/radio.ui_input.inc:899
-#: includes/ui/ui_input.inc:903
+#: includes/ui/db_pager_view.inc:166 includes/ui/ui_input.inc:903
  msgid "Show also Inactive"
  msgstr ""
  
  msgid "Show also Inactive"
  msgstr ""
  
@@ -6579,390 +6550,378 @@ msgstr ""
  msgid "No records"
  msgstr ""
  
  msgid "No records"
  msgstr ""
  
-#: includes/ui/radio.ui_input.inc:206 includes/ui/simple_crud_class.inc:227
-#: includes/ui/ui_input.inc:207
+#: includes/ui/simple_crud_class.inc:227 includes/ui/ui_input.inc:207
  msgid "Submit changes"
  msgstr ""
  
  msgid "Submit changes"
  msgstr ""
  
-#: includes/ui/radio.ui_input.inc:207 includes/ui/simple_crud_class.inc:229
-#: includes/ui/ui_input.inc:208
+#: includes/ui/simple_crud_class.inc:229 includes/ui/ui_input.inc:208
  msgid "Clone"
  msgstr ""
  
  msgid "Clone"
  msgstr ""
  
-#: includes/ui/radio.ui_input.inc:208 includes/ui/simple_crud_class.inc:229
-#: includes/ui/ui_input.inc:209
+#: includes/ui/simple_crud_class.inc:229 includes/ui/ui_input.inc:209
  msgid "Edit new record with current data"
  msgstr ""
  
  msgid "Edit new record with current data"
  msgstr ""
  
-#: includes/ui/radio.ui_input.inc:209 includes/ui/simple_crud_class.inc:231
-#: includes/ui/ui_input.inc:210
+#: includes/ui/simple_crud_class.inc:231 includes/ui/ui_input.inc:210
  msgid "Cancel edition"
  msgstr ""
  
  msgid "Cancel edition"
  msgstr ""
  
-#: includes/ui/radio.ui_input.inc:628 includes/ui/ui_input.inc:631
-#: reporting/includes/reports_classes.inc:219
+#: includes/ui/ui_controls.inc:72
+msgid "Request from outside of this page is forbidden."
+msgstr ""
+
+#: includes/ui/ui_controls.inc:73
+msgid "CSRF attack detected from: "
+msgstr ""
+
+#: includes/ui/ui_controls.inc:139
+msgid "You should automatically be forwarded."
+msgstr ""
+
+#: includes/ui/ui_controls.inc:140
+msgid "If this does not happen"
+msgstr ""
+
+#: includes/ui/ui_controls.inc:140
+msgid "click here"
+msgstr ""
+
+#: includes/ui/ui_controls.inc:140
+msgid "to continue"
+msgstr ""
+
+#: includes/ui/ui_controls.inc:187
+msgid "View Attachment"
+msgstr ""
+
+#: includes/ui/ui_controls.inc:190
+msgid "Close"
+msgstr ""
+
+#: includes/ui/ui_controls.inc:452 sales/manage/customers.php:23
+msgid "Customers"
+msgstr ""
+
+#: includes/ui/ui_controls.inc:454
+msgid "Branches"
+msgstr ""
+
+#: includes/ui/ui_controls.inc:456 purchasing/manage/suppliers.php:22
+msgid "Suppliers"
+msgstr ""
+
+#: includes/ui/ui_controls.inc:458 inventory/transfers.php:228
+#: inventory/manage/items.php:21 reporting/reports_main.php:253
+msgid "Items"
+msgstr ""
+
+#: includes/ui/ui_controls.inc:603
+msgid "Entered data has not been saved yet.\\nDo you want to abandon changes?"
+msgstr ""
+
+#: includes/ui/ui_input.inc:631 reporting/includes/reports_classes.inc:219
  msgid "Click Here to Pick up the date"
  msgstr ""
  
  msgid "Click Here to Pick up the date"
  msgstr ""
  
-#: includes/ui/radio.ui_input.inc:911 includes/ui/sav.ui_lists.inc:2131
  #: includes/ui/ui_input.inc:915 includes/ui/ui_lists.inc:2153
  #: reporting/rep301.php:155 reporting/rep302.php:170 reporting/rep303.php:184
  #: includes/ui/ui_input.inc:915 includes/ui/ui_lists.inc:2153
  #: reporting/rep301.php:155 reporting/rep302.php:170 reporting/rep303.php:184
-#: reporting/rep304.php:170 reporting/rep304.php:174 reporting/rep306.php:236
-#: reporting/rep306.php:243 sales/manage/customer_branches.php:302
+#: reporting/rep304.php:170 reporting/rep304.php:174 reporting/rep306.php:235
+#: reporting/rep306.php:242 sales/manage/customer_branches.php:302
  msgid "Inactive"
  msgstr ""
  
  msgid "Inactive"
  msgstr ""
  
-#: includes/ui/radio.ui_input.inc:921 includes/ui/radio.ui_input.inc:933
  #: includes/ui/ui_input.inc:925 includes/ui/ui_input.inc:937
  msgid "Current Credit:"
  msgstr ""
  
  #: includes/ui/ui_input.inc:925 includes/ui/ui_input.inc:937
  msgid "Current Credit:"
  msgstr ""
  
-#: includes/ui/radio.ui_input.inc:947 includes/ui/ui_input.inc:951
+#: includes/ui/ui_input.inc:951
  msgid "Bank Balance:"
  msgstr ""
  
  msgid "Bank Balance:"
  msgstr ""
  
-#: includes/ui/sav.ui_lists.inc:17 includes/ui/ui_lists.inc:17
+#: includes/ui/ui_lists.inc:17
  msgid "Set filter"
  msgstr ""
  
  msgid "Set filter"
  msgstr ""
  
-#: includes/ui/sav.ui_lists.inc:100 includes/ui/ui_lists.inc:100
+#: includes/ui/ui_lists.inc:100
  msgid "Press Space tab for search pattern entry"
  msgstr ""
  
  msgid "Press Space tab for search pattern entry"
  msgstr ""
  
-#: includes/ui/sav.ui_lists.inc:104 includes/ui/ui_lists.inc:104
+#: includes/ui/ui_lists.inc:104
  msgid "Enter code fragment to search or * for all"
  msgstr ""
  
  msgid "Enter code fragment to search or * for all"
  msgstr ""
  
-#: includes/ui/sav.ui_lists.inc:105 includes/ui/ui_lists.inc:105
+#: includes/ui/ui_lists.inc:105
  msgid "Enter description fragment to search or * for all"
  msgstr ""
  
  msgid "Enter description fragment to search or * for all"
  msgstr ""
  
-#: includes/ui/sav.ui_lists.inc:449 includes/ui/sav.ui_lists.inc:1367
  #: includes/ui/ui_lists.inc:453 includes/ui/ui_lists.inc:1388
  msgid "All Suppliers"
  msgstr ""
  
  #: includes/ui/ui_lists.inc:453 includes/ui/ui_lists.inc:1388
  msgid "All Suppliers"
  msgstr ""
  
-#: includes/ui/sav.ui_lists.inc:453 includes/ui/ui_lists.inc:457
+#: includes/ui/ui_lists.inc:457
  msgid "Press Space tab to filter by name fragment"
  msgstr ""
  
  msgid "Press Space tab to filter by name fragment"
  msgstr ""
  
-#: includes/ui/sav.ui_lists.inc:454 includes/ui/ui_lists.inc:458
+#: includes/ui/ui_lists.inc:458
  msgid "Select supplier"
  msgstr ""
  
  msgid "Select supplier"
  msgstr ""
  
-#: includes/ui/sav.ui_lists.inc:498 includes/ui/ui_lists.inc:505
+#: includes/ui/ui_lists.inc:505
  msgid "All Customers"
  msgstr ""
  
  msgid "All Customers"
  msgstr ""
  
-#: includes/ui/sav.ui_lists.inc:502 includes/ui/ui_lists.inc:509
+#: includes/ui/ui_lists.inc:509
  msgid "Press Space tab to filter by name fragment; F2 - entry new customer"
  msgstr ""
  
  msgid "Press Space tab to filter by name fragment; F2 - entry new customer"
  msgstr ""
  
-#: includes/ui/sav.ui_lists.inc:503 includes/ui/ui_lists.inc:510
+#: includes/ui/ui_lists.inc:510
  msgid "Select customer"
  msgstr ""
  
  msgid "Select customer"
  msgstr ""
  
-#: includes/ui/sav.ui_lists.inc:546 includes/ui/ui_lists.inc:558
+#: includes/ui/ui_lists.inc:558
  msgid "All branches"
  msgstr ""
  
  msgid "All branches"
  msgstr ""
  
-#: includes/ui/sav.ui_lists.inc:549 includes/ui/ui_lists.inc:561
+#: includes/ui/ui_lists.inc:561
  msgid "Select customer branch"
  msgstr ""
  
  msgid "Select customer branch"
  msgstr ""
  
-#: includes/ui/sav.ui_lists.inc:584 includes/ui/ui_lists.inc:601
+#: includes/ui/ui_lists.inc:601
  msgid "All Locations"
  msgstr ""
  
  msgid "All Locations"
  msgstr ""
  
-#: includes/ui/sav.ui_lists.inc:736 includes/ui/sav.ui_lists.inc:801
  #: includes/ui/ui_lists.inc:753 includes/ui/ui_lists.inc:822
  msgid "All Items"
  msgstr ""
  
  #: includes/ui/ui_lists.inc:753 includes/ui/ui_lists.inc:822
  msgid "All Items"
  msgstr ""
  
-#: includes/ui/sav.ui_lists.inc:1274 includes/ui/ui_lists.inc:1295
+#: includes/ui/ui_lists.inc:1295
  msgid "All Sales Types"
  msgstr ""
  
  msgid "All Sales Types"
  msgstr ""
  
-#: includes/ui/sav.ui_lists.inc:1603 includes/ui/ui_lists.inc:1626
+#: includes/ui/ui_lists.inc:1626
  msgid "Use Item Sales Accounts"
  msgstr ""
  
  msgid "Use Item Sales Accounts"
  msgstr ""
  
-#: includes/ui/sav.ui_lists.inc:1915 includes/ui/sav.ui_lists.inc:1932
-#: includes/ui/sav.ui_lists.inc:1949 includes/ui/ui_lists.inc:1937
-#: includes/ui/ui_lists.inc:1954 includes/ui/ui_lists.inc:1971
+#: includes/ui/ui_lists.inc:1937 includes/ui/ui_lists.inc:1954
+#: includes/ui/ui_lists.inc:1971
  msgid "All Types"
  msgstr ""
  
  msgid "All Types"
  msgstr ""
  
-#: includes/ui/sav.ui_lists.inc:1916 includes/ui/ui_lists.inc:1938
-#: sales/view/view_sales_order.php:127
+#: includes/ui/ui_lists.inc:1938 sales/view/view_sales_order.php:127
  msgid "Sales Invoices"
  msgstr ""
  
  msgid "Sales Invoices"
  msgstr ""
  
-#: includes/ui/sav.ui_lists.inc:1917 includes/ui/sav.ui_lists.inc:1934
-#: includes/ui/sav.ui_lists.inc:1952 includes/ui/ui_lists.inc:1939
-#: includes/ui/ui_lists.inc:1956 includes/ui/ui_lists.inc:1974
+#: includes/ui/ui_lists.inc:1939 includes/ui/ui_lists.inc:1956
+#: includes/ui/ui_lists.inc:1974
  msgid "Overdue Invoices"
  msgstr ""
  
  msgid "Overdue Invoices"
  msgstr ""
  
-#: includes/ui/sav.ui_lists.inc:1918 includes/ui/sav.ui_lists.inc:1935
-#: includes/ui/sav.ui_lists.inc:1953 includes/ui/ui_lists.inc:1940
-#: includes/ui/ui_lists.inc:1957 includes/ui/ui_lists.inc:1975
-#: includes/ui/ui_view.inc:485
+#: includes/ui/ui_lists.inc:1940 includes/ui/ui_lists.inc:1957
+#: includes/ui/ui_lists.inc:1975 includes/ui/ui_view.inc:543
  msgid "Payments"
  msgstr ""
  
  msgid "Payments"
  msgstr ""
  
-#: includes/ui/sav.ui_lists.inc:1919 includes/ui/sav.ui_lists.inc:1936
-#: includes/ui/sav.ui_lists.inc:1954 includes/ui/ui_lists.inc:1941
-#: includes/ui/ui_lists.inc:1958 includes/ui/ui_lists.inc:1976
-#: sales/view/view_sales_order.php:158
+#: includes/ui/ui_lists.inc:1941 includes/ui/ui_lists.inc:1958
+#: includes/ui/ui_lists.inc:1976 sales/view/view_sales_order.php:158
  msgid "Credit Notes"
  msgstr ""
  
  msgid "Credit Notes"
  msgstr ""
  
-#: includes/ui/sav.ui_lists.inc:1920 includes/ui/ui_lists.inc:1942
-#: sales/view/view_sales_order.php:93
+#: includes/ui/ui_lists.inc:1942 sales/view/view_sales_order.php:93
  msgid "Delivery Notes"
  msgstr ""
  
  msgid "Delivery Notes"
  msgstr ""
  
-#: includes/ui/sav.ui_lists.inc:1933 includes/ui/sav.ui_lists.inc:1951
  #: includes/ui/ui_lists.inc:1955 includes/ui/ui_lists.inc:1973
  msgid "Invoices"
  msgstr ""
  
  #: includes/ui/ui_lists.inc:1955 includes/ui/ui_lists.inc:1973
  msgid "Invoices"
  msgstr ""
  
-#: includes/ui/sav.ui_lists.inc:1937 includes/ui/sav.ui_lists.inc:1955
  #: includes/ui/ui_lists.inc:1959 includes/ui/ui_lists.inc:1977
  msgid "Overdue Credit Notes"
  msgstr ""
  
  #: includes/ui/ui_lists.inc:1959 includes/ui/ui_lists.inc:1977
  msgid "Overdue Credit Notes"
  msgstr ""
  
-#: includes/ui/sav.ui_lists.inc:1950 includes/ui/ui_lists.inc:1972
+#: includes/ui/ui_lists.inc:1972
  msgid "GRNs"
  msgstr ""
  
  msgid "GRNs"
  msgstr ""
  
-#: includes/ui/sav.ui_lists.inc:1968 includes/ui/ui_lists.inc:1990
+#: includes/ui/ui_lists.inc:1990
  msgid "Automatically put balance on back order"
  msgstr ""
  
  msgid "Automatically put balance on back order"
  msgstr ""
  
-#: includes/ui/sav.ui_lists.inc:1969 includes/ui/ui_lists.inc:1991
+#: includes/ui/ui_lists.inc:1991
  msgid "Cancel any quantites not delivered"
  msgstr ""
  
  msgid "Cancel any quantites not delivered"
  msgstr ""
  
-#: includes/ui/sav.ui_lists.inc:1986 includes/ui/ui_lists.inc:2008
+#: includes/ui/ui_lists.inc:2008
  msgid "Items Returned to Inventory Location"
  msgstr ""
  
  msgid "Items Returned to Inventory Location"
  msgstr ""
  
-#: includes/ui/sav.ui_lists.inc:1987 includes/ui/ui_lists.inc:2009
+#: includes/ui/ui_lists.inc:2009
  msgid "Items Written Off"
  msgstr ""
  
  msgid "Items Written Off"
  msgstr ""
  
-#: includes/ui/sav.ui_lists.inc:2157 includes/ui/ui_lists.inc:2179
+#: includes/ui/ui_lists.inc:2179
  msgid "New role"
  msgstr ""
  
  msgid "New role"
  msgstr ""
  
-#: includes/ui/sav.ui_lists.inc:2215 includes/ui/ui_lists.inc:2231
+#: includes/ui/ui_lists.inc:2231
  msgid "No tags defined."
  msgstr ""
  
  msgid "No tags defined."
  msgstr ""
  
-#: includes/ui/sav.ui_lists.inc:2215 includes/ui/ui_lists.inc:2231
+#: includes/ui/ui_lists.inc:2231
  msgid "No active tags defined."
  msgstr ""
  
  msgid "No active tags defined."
  msgstr ""
  
-#: includes/ui/sav.ui_lists.inc:2253 includes/ui/ui_lists.inc:2269
+#: includes/ui/ui_lists.inc:2269
  #, php-format
  msgid "Activated for '%s'"
  msgstr ""
  
  #, php-format
  msgid "Activated for '%s'"
  msgstr ""
  
-#: includes/ui/sav.ui_lists.inc:2256 includes/ui/ui_lists.inc:2272
+#: includes/ui/ui_lists.inc:2272
  msgid "Available and/or installed"
  msgstr ""
  
  msgid "Available and/or installed"
  msgstr ""
  
-#: includes/ui/sav.ui_lists.inc:2326 includes/ui/ui_lists.inc:2342
+#: includes/ui/ui_lists.inc:2342
  msgid "Standard new company American COA (4 digit)"
  msgstr ""
  
  msgid "Standard new company American COA (4 digit)"
  msgstr ""
  
-#: includes/ui/sav.ui_lists.inc:2328 includes/ui/ui_lists.inc:2344
+#: includes/ui/ui_lists.inc:2344
  msgid "Standard American COA (4 digit) with demo data"
  msgstr ""
  
  msgid "Standard American COA (4 digit) with demo data"
  msgstr ""
  
-#: includes/ui/sav.ui_lists.inc:2349 includes/ui/ui_lists.inc:2365
+#: includes/ui/ui_lists.inc:2365
  msgid "No payment Link"
  msgstr ""
  
  msgid "No payment Link"
  msgstr ""
  
-#: includes/ui/ui_controls.inc:72
-msgid "Request from outside of this page is forbidden."
-msgstr ""
-
-#: includes/ui/ui_controls.inc:73
-msgid "CSRF attack detected from: "
-msgstr ""
-
-#: includes/ui/ui_controls.inc:139
-msgid "You should automatically be forwarded."
-msgstr ""
-
-#: includes/ui/ui_controls.inc:140
-msgid "If this does not happen"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:140
-msgid "click here"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:140
-msgid "to continue"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:187
-msgid "View Attachment"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:190
-msgid "Close"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:450 sales/manage/customers.php:23
-msgid "Customers"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:452
-msgid "Branches"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:454 purchasing/manage/suppliers.php:22
-msgid "Suppliers"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:456 inventory/transfers.php:228
-#: inventory/manage/items.php:21 reporting/reports_main.php:253
-msgid "Items"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:601
-msgid "Entered data has not been saved yet.\\nDo you want to abandon changes?"
-msgstr ""
-
  #: includes/ui/ui_msgs.inc:63
  msgid "in units of : "
  msgstr ""
  
  #: includes/ui/ui_msgs.inc:63
  msgid "in units of : "
  msgstr ""
  
-#: includes/ui/ui_view.inc:306
+#: includes/ui/ui_view.inc:301
+#, php-format
+msgid ""
+"Cannot retrieve exchange rate for currency %s. Please adjust approximate "
+"rate if needed."
+msgstr ""
+
+#: includes/ui/ui_view.inc:342
  msgid "Date Voided:"
  msgstr ""
  
  msgid "Date Voided:"
  msgstr ""
  
-#: includes/ui/ui_view.inc:407 reporting/rep107.php:175
+#: 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
  msgid "Total Tax Excluded"
  msgstr ""
  
  #: reporting/rep109.php:180 reporting/rep110.php:184 reporting/rep111.php:165
  #: reporting/rep113.php:169 reporting/rep209.php:183
  msgid "Total Tax Excluded"
  msgstr ""
  
-#: includes/ui/ui_view.inc:413 includes/ui/ui_view.inc:432
-#: includes/ui/ui_view.inc:451 reporting/rep107.php: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:184 reporting/rep109.php:189 reporting/rep110.php:193
+#: reporting/rep111.php:174 reporting/rep113.php:178 reporting/rep209.php:192
  msgid "Included"
  msgstr ""
  
  msgid "Included"
  msgstr ""
  
-#: includes/ui/ui_view.inc:485
+#: includes/ui/ui_view.inc:543
  #: purchasing/inquiry/supplier_allocation_inquiry.php:100
  msgid "Allocations"
  msgstr ""
  
  #: purchasing/inquiry/supplier_allocation_inquiry.php:100
  msgid "Allocations"
  msgstr ""
  
-#: includes/ui/ui_view.inc:489 reporting/includes/doctext.inc:145
+#: includes/ui/ui_view.inc:547 reporting/includes/doctext.inc:145
  #: reporting/includes/doctext.inc:186
  msgid "Total Amount"
  msgstr ""
  
  #: reporting/includes/doctext.inc:186
  msgid "Total Amount"
  msgstr ""
  
-#: includes/ui/ui_view.inc:514
+#: includes/ui/ui_view.inc:572
  msgid "Total Allocated:"
  msgstr ""
  
  msgid "Total Allocated:"
  msgstr ""
  
-#: includes/ui/ui_view.inc:518
+#: includes/ui/ui_view.inc:576
  msgid "Left to Allocate:"
  msgstr ""
  
  msgid "Left to Allocate:"
  msgstr ""
  
-#: includes/ui/ui_view.inc:571
+#: includes/ui/ui_view.inc:629
  msgid "No Quick Entries are defined."
  msgstr ""
  
  msgid "No Quick Entries are defined."
  msgstr ""
  
-#: includes/ui/ui_view.inc:599
+#: includes/ui/ui_view.inc:657
  msgid "No Quick Entry lines are defined."
  msgstr ""
  
  msgid "No Quick Entry lines are defined."
  msgstr ""
  
-#: includes/ui/ui_view.inc:781 purchasing/includes/ui/invoice_ui.inc:452
+#: includes/ui/ui_view.inc:839 purchasing/includes/ui/invoice_ui.inc:465
  msgid "and"
  msgstr ""
  
  msgid "and"
  msgstr ""
  
-#: includes/ui/ui_view.inc:842
+#: includes/ui/ui_view.inc:900
  msgid "January"
  msgstr ""
  
  msgid "January"
  msgstr ""
  
-#: includes/ui/ui_view.inc:842
+#: includes/ui/ui_view.inc:900
  msgid "February"
  msgstr ""
  
  msgid "February"
  msgstr ""
  
-#: includes/ui/ui_view.inc:842
+#: includes/ui/ui_view.inc:900
  msgid "March"
  msgstr ""
  
  msgid "March"
  msgstr ""
  
-#: includes/ui/ui_view.inc:842
+#: includes/ui/ui_view.inc:900
  msgid "April"
  msgstr ""
  
  msgid "April"
  msgstr ""
  
-#: includes/ui/ui_view.inc:842
+#: includes/ui/ui_view.inc:900
  msgid "June"
  msgstr ""
  
  msgid "June"
  msgstr ""
  
-#: includes/ui/ui_view.inc:842
+#: includes/ui/ui_view.inc:900
  msgid "July"
  msgstr ""
  
  msgid "July"
  msgstr ""
  
-#: includes/ui/ui_view.inc:842
+#: includes/ui/ui_view.inc:900
  msgid "August"
  msgstr ""
  
  msgid "August"
  msgstr ""
  
-#: includes/ui/ui_view.inc:842
+#: includes/ui/ui_view.inc:900
  msgid "September"
  msgstr ""
  
  msgid "September"
  msgstr ""
  
-#: includes/ui/ui_view.inc:842
+#: includes/ui/ui_view.inc:900
  msgid "October"
  msgstr ""
  
  msgid "October"
  msgstr ""
  
-#: includes/ui/ui_view.inc:842
+#: includes/ui/ui_view.inc:900
  msgid "November"
  msgstr ""
  
  msgid "November"
  msgstr ""
  
-#: includes/ui/ui_view.inc:842
+#: includes/ui/ui_view.inc:900
  msgid "December"
  msgstr ""
  
  msgid "December"
  msgstr ""
  
-#: includes/ui/ui_view.inc:843
+#: includes/ui/ui_view.inc:901
  msgid "Su"
  msgstr ""
  
  msgid "Su"
  msgstr ""
  
-#: includes/ui/ui_view.inc:843
+#: includes/ui/ui_view.inc:901
  msgid "Mo"
  msgstr ""
  
  msgid "Mo"
  msgstr ""
  
-#: includes/ui/ui_view.inc:843
+#: includes/ui/ui_view.inc:901
  msgid "Tu"
  msgstr ""
  
  msgid "Tu"
  msgstr ""
  
-#: includes/ui/ui_view.inc:843
+#: includes/ui/ui_view.inc:901
  msgid "We"
  msgstr ""
  
  msgid "We"
  msgstr ""
  
-#: includes/ui/ui_view.inc:843
+#: includes/ui/ui_view.inc:901
  msgid "Th"
  msgstr ""
  
  msgid "Th"
  msgstr ""
  
-#: includes/ui/ui_view.inc:843
+#: includes/ui/ui_view.inc:901
  msgid "Fr"
  msgstr ""
  
  msgid "Fr"
  msgstr ""
  
-#: includes/ui/ui_view.inc:843
+#: includes/ui/ui_view.inc:901
  msgid "Sa"
  msgstr ""
  
  msgid "Sa"
  msgstr ""
  
-#: includes/ui/ui_view.inc:844
+#: includes/ui/ui_view.inc:902
  msgid "W"
  msgstr ""
  
  msgid "W"
  msgstr ""
  
@@ -7057,7 +7016,7 @@ msgid "Enter &Another Adjustment"
  msgstr ""
  
  #: inventory/adjustments.php:88 inventory/transfers.php:85
  msgstr ""
  
  #: inventory/adjustments.php:88 inventory/transfers.php:85
-#: sales/sales_order_entry.php:359
+#: sales/sales_order_entry.php:360
  msgid "You must enter at least one non empty item line."
  msgstr ""
  
  msgid "You must enter at least one non empty item line."
  msgstr ""
  
@@ -7113,8 +7072,8 @@ msgstr ""
  msgid "View the GL Journal Entries for this Cost Update"
  msgstr ""
  
  msgid "View the GL Journal Entries for this Cost Update"
  msgstr ""
  
-#: inventory/cost_update.php:97 inventory/prices.php:64
-#: inventory/purchasing_data.php:119 inventory/reorder_level.php: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
  #: inventory/inquiry/stock_movements.php:53
  #: inventory/inquiry/stock_status.php:47 inventory/manage/item_codes.php:105
  #: manufacturing/work_order_entry.php:396
@@ -7124,15 +7083,15 @@ msgstr ""
  msgid "Item:"
  msgstr ""
  
  msgid "Item:"
  msgstr ""
  
-#: inventory/cost_update.php:118
+#: inventory/cost_update.php:116
  msgid "Standard Material Cost Per Unit"
  msgstr ""
  
  msgid "Standard Material Cost Per Unit"
  msgstr ""
  
-#: inventory/cost_update.php:127
+#: inventory/cost_update.php:125
  msgid "Standard Labour Cost Per Unit"
  msgstr ""
  
  msgid "Standard Labour Cost Per Unit"
  msgstr ""
  
-#: inventory/cost_update.php:128
+#: inventory/cost_update.php:126
  msgid "Standard Overhead Cost Per Unit"
  msgstr ""
  
  msgid "Standard Overhead Cost Per Unit"
  msgstr ""
  
@@ -7153,37 +7112,37 @@ msgid ""
  "entering pricing."
  msgstr ""
  
  "entering pricing."
  msgstr ""
  
-#: inventory/prices.php:80
+#: inventory/prices.php:77
  msgid "The price entered must be numeric."
  msgstr ""
  
  msgid "The price entered must be numeric."
  msgstr ""
  
-#: inventory/prices.php:86
+#: inventory/prices.php:83
  msgid ""
  "The sales pricing for this item, sales type and currency has already been "
  "added."
  msgstr ""
  
  msgid ""
  "The sales pricing for this item, sales type and currency has already been "
  "added."
  msgstr ""
  
-#: inventory/prices.php:99
+#: inventory/prices.php:96
  msgid "This price has been updated."
  msgstr ""
  
  msgid "This price has been updated."
  msgstr ""
  
-#: inventory/prices.php:107
+#: inventory/prices.php:104
  msgid "The new price has been added."
  msgstr ""
  
  msgid "The new price has been added."
  msgstr ""
  
-#: inventory/prices.php:121
+#: inventory/prices.php:118
  msgid "The selected price has been deleted."
  msgstr ""
  
  msgid "The selected price has been deleted."
  msgstr ""
  
-#: inventory/prices.php:149 reporting/rep104.php:118
+#: inventory/prices.php:146 reporting/rep104.php:118
  #: sales/customer_delivery.php:355 sales/customer_invoice.php:402
  #: sales/view/view_credit.php:73 sales/view/view_dispatch.php:93
  #: sales/view/view_invoice.php:92 sales/includes/ui/sales_credit_ui.inc:102
  msgid "Sales Type"
  msgstr ""
  
  #: sales/customer_delivery.php:355 sales/customer_invoice.php:402
  #: sales/view/view_credit.php:73 sales/view/view_dispatch.php:93
  #: sales/view/view_invoice.php:92 sales/includes/ui/sales_credit_ui.inc:102
  msgid "Sales Type"
  msgstr ""
  
-#: inventory/prices.php:149 inventory/purchasing_data.php:149
-#: purchasing/includes/ui/invoice_ui.inc:484
+#: 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
  #: 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
@@ -7195,27 +7154,27 @@ msgstr ""
  msgid "Price"
  msgstr ""
  
  msgid "Price"
  msgstr ""
  
-#: inventory/prices.php:171
+#: inventory/prices.php:168
  msgid "There are no prices set up for this part."
  msgstr ""
  
  msgid "There are no prices set up for this part."
  msgstr ""
  
-#: inventory/prices.php:195
+#: inventory/prices.php:192
  msgid "Currency:"
  msgstr ""
  
  msgid "Currency:"
  msgstr ""
  
-#: inventory/prices.php:197
+#: inventory/prices.php:194
  msgid "Sales Type:"
  msgstr ""
  
  msgid "Sales Type:"
  msgstr ""
  
-#: inventory/prices.php:205 inventory/purchasing_data.php:217
+#: inventory/prices.php:202 inventory/purchasing_data.php:215
  msgid "Price:"
  msgstr ""
  
  msgid "Price:"
  msgstr ""
  
-#: inventory/prices.php:205
+#: inventory/prices.php:202
  msgid "per"
  msgstr ""
  
  msgid "per"
  msgstr ""
  
-#: inventory/prices.php:209
+#: inventory/prices.php:206
  msgid "The price is calculated."
  msgstr ""
  
  msgid "The price is calculated."
  msgstr ""
  
@@ -7264,35 +7223,35 @@ msgstr ""
  msgid "The purchasing data item has been sucessfully deleted."
  msgstr ""
  
  msgid "The purchasing data item has been sucessfully deleted."
  msgstr ""
  
-#: inventory/purchasing_data.php:134
+#: inventory/purchasing_data.php:132
  msgid "Entered item is not defined. Please re-enter."
  msgstr ""
  
  msgid "Entered item is not defined. Please re-enter."
  msgstr ""
  
-#: inventory/purchasing_data.php:143
+#: inventory/purchasing_data.php:141
  msgid "There is no purchasing data set up for the part selected"
  msgstr ""
  
  msgid "There is no purchasing data set up for the part selected"
  msgstr ""
  
-#: inventory/purchasing_data.php:150
+#: inventory/purchasing_data.php:148
  msgid "Supplier's Unit"
  msgstr ""
  
  msgid "Supplier's Unit"
  msgstr ""
  
-#: inventory/purchasing_data.php:150
+#: inventory/purchasing_data.php:148
  msgid "Conversion Factor"
  msgstr ""
  
  msgid "Conversion Factor"
  msgstr ""
  
-#: inventory/purchasing_data.php:150
+#: inventory/purchasing_data.php:148
  msgid "Supplier's Description"
  msgstr ""
  
  msgid "Supplier's Description"
  msgstr ""
  
-#: inventory/purchasing_data.php:218
+#: inventory/purchasing_data.php:216
  msgid "Suppliers Unit of Measure:"
  msgstr ""
  
  msgid "Suppliers Unit of Measure:"
  msgstr ""
  
-#: inventory/purchasing_data.php:224
+#: inventory/purchasing_data.php:222
  msgid "Conversion Factor (to our UOM):"
  msgstr ""
  
  msgid "Conversion Factor (to our UOM):"
  msgstr ""
  
-#: inventory/purchasing_data.php:226
+#: inventory/purchasing_data.php:224
  msgid "Supplier's Code or Description:"
  msgstr ""
  
  msgid "Supplier's Code or Description:"
  msgstr ""
  
@@ -7306,7 +7265,7 @@ msgid ""
  "manufactured items)."
  msgstr ""
  
  "manufactured items)."
  msgstr ""
  
-#: inventory/reorder_level.php:68 inventory/inquiry/stock_movements.php:83
+#: 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
  #: 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
@@ -7324,19 +7283,19 @@ msgstr ""
  msgid "Location"
  msgstr ""
  
  msgid "Location"
  msgstr ""
  
-#: inventory/reorder_level.php:68 inventory/inquiry/stock_movements.php:84
+#: inventory/reorder_level.php:65 inventory/inquiry/stock_movements.php:84
  #: inventory/inquiry/stock_status.php:76 purchasing/supplier_credit.php:203
  #: inventory/inquiry/stock_status.php:76 purchasing/supplier_credit.php:203
-#: sales/sales_order_entry.php:514 sales/includes/ui/sales_order_ui.inc:181
+#: sales/sales_order_entry.php:515 sales/includes/ui/sales_order_ui.inc:181
  msgid "Quantity On Hand"
  msgstr ""
  
  msgid "Quantity On Hand"
  msgstr ""
  
-#: inventory/reorder_level.php:68 inventory/inquiry/stock_status.php:76
+#: 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:110
-#: sales/includes/db/sales_order_db.inc:263
+#: sales/includes/db/sales_order_db.inc:283
  msgid "Re-Order Level"
  msgstr ""
  
  msgid "Re-Order Level"
  msgstr ""
  
-#: inventory/reorder_level.php:92
+#: inventory/reorder_level.php:89
  msgid "Reorder levels has been updated."
  msgstr ""
  
  msgid "Reorder levels has been updated."
  msgstr ""
  
@@ -7407,7 +7366,7 @@ msgstr ""
  #: inventory/includes/item_adjustments_ui.inc:62
  #: inventory/includes/stock_transfers_ui.inc:60
  #: manufacturing/includes/work_order_issue_ui.inc:33
  #: 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:235 purchasing/po_receive_items.php:62
+#: 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
  #: 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
@@ -7422,7 +7381,7 @@ msgstr ""
  #: inventory/includes/item_adjustments_ui.inc:62
  #: inventory/includes/stock_transfers_ui.inc:60
  #: manufacturing/includes/work_order_issue_ui.inc:33
  #: 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:235 purchasing/view/view_grn.php:40
+#: 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
  #: 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
@@ -7444,8 +7403,8 @@ msgstr ""
  #: manufacturing/includes/manufacturing_ui.inc:157
  #: manufacturing/includes/manufacturing_ui.inc:332
  #: manufacturing/includes/work_order_issue_ui.inc:33
  #: manufacturing/includes/manufacturing_ui.inc:157
  #: manufacturing/includes/manufacturing_ui.inc:332
  #: manufacturing/includes/work_order_issue_ui.inc:33
-#: purchasing/includes/ui/invoice_ui.inc:484
-#: purchasing/includes/ui/po_ui.inc:235 purchasing/view/view_grn.php:40
+#: 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
  #: 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
@@ -7461,7 +7420,7 @@ msgstr ""
  #: inventory/includes/stock_transfers_ui.inc:60
  #: inventory/manage/item_units.php:94
  #: manufacturing/includes/work_order_issue_ui.inc:34
  #: 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:236 purchasing/view/view_grn.php:41
+#: 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
  #: 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
@@ -7527,7 +7486,7 @@ msgid "Show Movements"
  msgstr ""
  
  #: inventory/inquiry/stock_movements.php:65
  msgstr ""
  
  #: inventory/inquiry/stock_movements.php:65
-#: purchasing/includes/ui/invoice_ui.inc:453
+#: purchasing/includes/ui/invoice_ui.inc:466
  #: purchasing/inquiry/supplier_allocation_inquiry.php:57
  #: purchasing/inquiry/supplier_inquiry.php:58
  #: sales/inquiry/customer_allocation_inquiry.php:51
  #: purchasing/inquiry/supplier_allocation_inquiry.php:57
  #: purchasing/inquiry/supplier_inquiry.php:58
  #: sales/inquiry/customer_allocation_inquiry.php:51
@@ -7662,7 +7621,7 @@ msgstr ""
  msgid "Foreign Item Codes"
  msgstr ""
  
  msgid "Foreign Item Codes"
  msgstr ""
  
-#: inventory/manage/item_codes.php:23 sales/sales_order_entry.php:681
+#: inventory/manage/item_codes.php:23 sales/sales_order_entry.php:682
  msgid "There are no inventory items defined in the system."
  msgstr ""
  
  msgid "There are no inventory items defined in the system."
  msgstr ""
  
@@ -7779,8 +7738,8 @@ msgstr ""
  #: manufacturing/search_work_orders.php:163
  #: manufacturing/view/wo_issue_view.php:44
  #: manufacturing/view/wo_production_view.php:45
  #: manufacturing/search_work_orders.php:163
  #: manufacturing/view/wo_issue_view.php:44
  #: manufacturing/view/wo_production_view.php:45
-#: purchasing/includes/ui/invoice_ui.inc:471
-#: purchasing/includes/ui/invoice_ui.inc:483 reporting/rep204.php:84
+#: purchasing/includes/ui/invoice_ui.inc:484
+#: purchasing/includes/ui/invoice_ui.inc:496 reporting/rep204.php:84
  #: reporting/rep306.php:152
  msgid "Item"
  msgstr ""
  #: reporting/rep306.php:152
  msgid "Item"
  msgstr ""
@@ -8833,7 +8792,7 @@ msgstr ""
  #: manufacturing/includes/db/work_orders_db.inc:278
  #: purchasing/includes/db/po_db.inc:116
  #: sales/includes/db/cust_trans_db.inc:111
  #: manufacturing/includes/db/work_orders_db.inc:278
  #: purchasing/includes/db/po_db.inc:116
  #: sales/includes/db/cust_trans_db.inc:111
-#: sales/includes/db/sales_order_db.inc:249
+#: sales/includes/db/sales_order_db.inc:267
  msgid "Updated."
  msgstr ""
  
  msgid "Updated."
  msgstr ""
  
@@ -8858,45 +8817,42 @@ msgstr ""
  msgid "Produced"
  msgstr ""
  
  msgid "Produced"
  msgstr ""
  
-#: purchasing/includes/db/invoice_db.inc:282
+#: purchasing/includes/db/invoice_db.inc:311
  msgid "Supplier invoice adjustment for zero inventory of "
  msgstr ""
  
  msgid "Supplier invoice adjustment for zero inventory of "
  msgstr ""
  
-#: purchasing/includes/db/invoice_db.inc:282 reporting/rep106.php:83
+#: 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
  msgid "Invoice"
  msgstr ""
  
  #: sales/inquiry/sales_deliveries_view.php:166
  #: sales/inquiry/sales_orders_view.php:147
  msgid "Invoice"
  msgstr ""
  
-#: purchasing/includes/db/invoice_db.inc:681
-#: purchasing/includes/db/invoice_db.inc:683
+#: purchasing/includes/db/invoice_db.inc:659
+#: purchasing/includes/db/invoice_db.inc:661
  msgid "GRN Removal"
  msgstr ""
  
  msgid "GRN Removal"
  msgstr ""
  
-#: purchasing/includes/ui/grn_ui.inc:23 purchasing/includes/ui/po_ui.inc:318
-#: 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:316 sales/view/view_sales_order.php:74
  msgid "Order Currency"
  msgstr ""
  
  msgid "Order Currency"
  msgstr ""
  
-#: purchasing/includes/ui/grn_ui.inc:25
+#: purchasing/includes/ui/grn_ui.inc:25 purchasing/includes/ui/grn_ui.inc:57
  msgid "For Purchase Order"
  msgstr ""
  
  msgid "For Purchase Order"
  msgstr ""
  
-#: purchasing/includes/ui/grn_ui.inc:28 sales/view/view_sales_order.php:67
+#: purchasing/includes/ui/grn_ui.inc:28 purchasing/includes/ui/grn_ui.inc:59
+#: sales/view/view_sales_order.php:67
  msgid "Ordered On"
  msgstr ""
  
  msgid "Ordered On"
  msgstr ""
  
-#: purchasing/includes/ui/grn_ui.inc:40 purchasing/includes/ui/grn_ui.inc:54
-#: purchasing/includes/ui/po_ui.inc:333 purchasing/includes/ui/po_ui.inc:338
+#: 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
  msgid "Deliver Into Location"
  msgstr ""
  
  msgid "Deliver Into Location"
  msgstr ""
  
-#: purchasing/includes/ui/grn_ui.inc:46
-msgid "Date Items Received"
-msgstr ""
-
-#: purchasing/includes/ui/grn_ui.inc:49 purchasing/includes/ui/grn_ui.inc:55
-#: purchasing/includes/ui/po_ui.inc:343
+#: 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/view/view_supp_credit.php:44
  #: purchasing/view/view_supp_invoice.php:47
  #: purchasing/inquiry/po_search_completed.php:125
@@ -8906,261 +8862,266 @@ msgstr ""
  msgid "Supplier's Reference"
  msgstr ""
  
  msgid "Supplier's Reference"
  msgstr ""
  
-#: purchasing/includes/ui/grn_ui.inc:62 purchasing/includes/ui/po_ui.inc:347
-#: 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:345 sales/view/view_sales_order.php:79
  msgid "Delivery Address"
  msgstr ""
  
  msgid "Delivery Address"
  msgstr ""
  
-#: purchasing/includes/ui/grn_ui.inc:65 purchasing/includes/ui/po_ui.inc:351
+#: purchasing/includes/ui/grn_ui.inc:41 purchasing/includes/ui/grn_ui.inc:84
+#: purchasing/includes/ui/po_ui.inc:349
  msgid "Order Comments"
  msgstr ""
  
  msgid "Order Comments"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:96
-#: purchasing/includes/ui/invoice_ui.inc:99
+#: purchasing/includes/ui/grn_ui.inc:74
+msgid "Date Items Received"
+msgstr ""
+
+#: purchasing/includes/ui/invoice_ui.inc:109
+#: purchasing/includes/ui/invoice_ui.inc:112
  msgid "Supplier's Ref.:"
  msgstr ""
  
  msgid "Supplier's Ref.:"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:114
+#: purchasing/includes/ui/invoice_ui.inc:127
  msgid "Terms:"
  msgstr ""
  
  msgid "Terms:"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:126
+#: purchasing/includes/ui/invoice_ui.inc:139
  #: purchasing/manage/suppliers.php:98 purchasing/manage/suppliers.php:103
  msgid "Supplier's Currency:"
  msgstr ""
  
  #: purchasing/manage/suppliers.php:98 purchasing/manage/suppliers.php:103
  msgid "Supplier's Currency:"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:130
+#: purchasing/includes/ui/invoice_ui.inc:143
  #: purchasing/manage/suppliers.php:105 sales/manage/customer_branches.php:246
  #: sales/manage/customers.php:294
  msgid "Tax Group:"
  msgstr ""
  
  #: purchasing/manage/suppliers.php:105 sales/manage/customer_branches.php:246
  #: sales/manage/customers.php:294
  msgid "Tax Group:"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:145
+#: purchasing/includes/ui/invoice_ui.inc:158
  msgid "Sub-total:"
  msgstr ""
  
  msgid "Sub-total:"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:153
+#: purchasing/includes/ui/invoice_ui.inc:166
  msgid "Invoice Total:"
  msgstr ""
  
  msgid "Invoice Total:"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:156
+#: purchasing/includes/ui/invoice_ui.inc:169
  #: sales/customer_credit_invoice.php:330
  #: sales/includes/ui/sales_credit_ui.inc:233
  msgid "Credit Note Total"
  msgstr ""
  
  #: sales/customer_credit_invoice.php:330
  #: sales/includes/ui/sales_credit_ui.inc:233
  msgid "Credit Note Total"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:187
+#: purchasing/includes/ui/invoice_ui.inc:200
  msgid "Add GL Line"
  msgstr ""
  
  msgid "Add GL Line"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:188
+#: purchasing/includes/ui/invoice_ui.inc:201
  msgid "Reset"
  msgstr ""
  
  msgid "Reset"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:189
-#: purchasing/po_receive_items.php:334
+#: purchasing/includes/ui/invoice_ui.inc:202
+#: purchasing/po_receive_items.php:335
  msgid "Clear all GL entry fields"
  msgstr ""
  
  msgid "Clear all GL entry fields"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:207
+#: purchasing/includes/ui/invoice_ui.inc:220
  msgid "GL Items for this Invoice"
  msgstr ""
  
  msgid "GL Items for this Invoice"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:209
+#: purchasing/includes/ui/invoice_ui.inc:222
  msgid "GL Items for this Credit Note"
  msgstr ""
  
  msgid "GL Items for this Credit Note"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:219
+#: purchasing/includes/ui/invoice_ui.inc:232
  msgid "Quick Entry:"
  msgstr ""
  
  msgid "Quick Entry:"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:392
+#: purchasing/includes/ui/invoice_ui.inc:405
  msgid "Add to Invoice"
  msgstr ""
  
  msgid "Add to Invoice"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:394
+#: purchasing/includes/ui/invoice_ui.inc:407
  msgid "Add to Credit Note"
  msgstr ""
  
  msgid "Add to Credit Note"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:396 sales/customer_invoice.php:524
+#: purchasing/includes/ui/invoice_ui.inc:409 sales/customer_invoice.php:524
  msgid "Remove"
  msgstr ""
  
  msgid "Remove"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:396
-#: purchasing/includes/ui/invoice_ui.inc:431
+#: purchasing/includes/ui/invoice_ui.inc:409
+#: purchasing/includes/ui/invoice_ui.inc:444
  msgid ""
  "WARNING! Be careful with removal. The operation is executed immediately and "
  "cannot be undone !!!"
  msgstr ""
  
  msgid ""
  "WARNING! Be careful with removal. The operation is executed immediately and "
  "cannot be undone !!!"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:398
+#: purchasing/includes/ui/invoice_ui.inc:411
  msgid ""
  "You are about to remove all yet non-invoiced items from selected delivery "
  "line. This operation also irreversibly changes related order line. Do you "
  "want to continue ?"
  msgstr ""
  
  msgid ""
  "You are about to remove all yet non-invoiced items from selected delivery "
  "line. This operation also irreversibly changes related order line. Do you "
  "want to continue ?"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:429
+#: purchasing/includes/ui/invoice_ui.inc:442
  msgid "Items Received Yet to be Invoiced"
  msgstr ""
  
  msgid "Items Received Yet to be Invoiced"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:434
+#: purchasing/includes/ui/invoice_ui.inc:447
  msgid "Delivery Item Selected For Adding To A Supplier Credit Note"
  msgstr ""
  
  msgid "Delivery Item Selected For Adding To A Supplier Credit Note"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:439
+#: purchasing/includes/ui/invoice_ui.inc:452
  msgid "Received Items Charged on this Invoice"
  msgstr ""
  
  msgid "Received Items Charged on this Invoice"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:441
+#: purchasing/includes/ui/invoice_ui.inc:454
  msgid "Received Items Credited on this Note"
  msgstr ""
  
  msgid "Received Items Credited on this Note"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:451
+#: purchasing/includes/ui/invoice_ui.inc:464
  msgid "Received between"
  msgstr ""
  
  msgid "Received between"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:462
+#: purchasing/includes/ui/invoice_ui.inc:475
  msgid "Add All Items"
  msgstr ""
  
  msgid "Add All Items"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:471
-#: purchasing/includes/ui/invoice_ui.inc:483 reporting/rep308.php:149
+#: 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
  msgid "Delivery"
  msgstr ""
  
  #: sales/inquiry/sales_orders_view.php:155
  msgid "Delivery"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:471
+#: purchasing/includes/ui/invoice_ui.inc:484
  msgid "P.O."
  msgstr ""
  
  msgid "P.O."
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:472
+#: purchasing/includes/ui/invoice_ui.inc:485
  msgid "Received On"
  msgstr ""
  
  msgid "Received On"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:472 purchasing/view/view_po.php:46
+#: purchasing/includes/ui/invoice_ui.inc:485 purchasing/view/view_po.php:46
  msgid "Quantity Received"
  msgstr ""
  
  msgid "Quantity Received"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:472 purchasing/view/view_grn.php:41
+#: purchasing/includes/ui/invoice_ui.inc:485 purchasing/view/view_grn.php:41
  #: purchasing/view/view_po.php:46
  msgid "Quantity Invoiced"
  msgstr ""
  
  #: purchasing/view/view_po.php:46
  msgid "Quantity Invoiced"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:473
+#: purchasing/includes/ui/invoice_ui.inc:486
  msgid "Qty Yet To Invoice"
  msgstr ""
  
  msgid "Qty Yet To Invoice"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:473
-#: purchasing/includes/ui/po_ui.inc:237
+#: purchasing/includes/ui/invoice_ui.inc:486
+#: purchasing/includes/ui/po_ui.inc:235
  #: sales/includes/ui/sales_order_ui.inc:146
  msgid "Price after Tax"
  msgstr ""
  
  #: sales/includes/ui/sales_order_ui.inc:146
  msgid "Price after Tax"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:473
-#: purchasing/includes/ui/po_ui.inc:237
+#: purchasing/includes/ui/invoice_ui.inc:486
+#: purchasing/includes/ui/po_ui.inc:235
  #: sales/includes/ui/sales_order_ui.inc:146
  msgid "Price before Tax"
  msgstr ""
  
  #: sales/includes/ui/sales_order_ui.inc:146
  msgid "Price before Tax"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:479
+#: purchasing/includes/ui/invoice_ui.inc:492
  msgid "Qty Yet To Credit"
  msgstr ""
  
  msgid "Qty Yet To Credit"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:484
+#: purchasing/includes/ui/invoice_ui.inc:497
  msgid "Line Value"
  msgstr ""
  
  msgid "Line Value"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:551
+#: purchasing/includes/ui/invoice_ui.inc:564
  msgid ""
  "There are no outstanding items received from this supplier that have not "
  "been invoiced by them."
  msgstr ""
  
  msgid ""
  "There are no outstanding items received from this supplier that have not "
  "been invoiced by them."
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:554
+#: purchasing/includes/ui/invoice_ui.inc:567
  msgid ""
  "There are no received items for the selected supplier that have been "
  "invoiced."
  msgstr ""
  
  msgid ""
  "There are no received items for the selected supplier that have been "
  "invoiced."
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:555
+#: purchasing/includes/ui/invoice_ui.inc:568
  msgid "Credits can only be applied to invoiced items."
  msgstr ""
  
  msgid "Credits can only be applied to invoiced items."
  msgstr ""
  
-#: purchasing/includes/ui/po_ui.inc:148
-msgid "Supplier Currency:"
-msgstr ""
-
-#: purchasing/includes/ui/po_ui.inc:177 sales/sales_order_entry.php:705
+#: purchasing/includes/ui/po_ui.inc:154 sales/sales_order_entry.php:706
  msgid "Order Date:"
  msgstr ""
  
  msgid "Order Date:"
  msgstr ""
  
-#: purchasing/includes/ui/po_ui.inc:178 sales/sales_order_entry.php:692
+#: purchasing/includes/ui/po_ui.inc:155 sales/sales_order_entry.php:693
  msgid "Delivery Date:"
  msgstr ""
  
  msgid "Delivery Date:"
  msgstr ""
  
-#: purchasing/includes/ui/po_ui.inc:178 sales/sales_order_entry.php:686
+#: purchasing/includes/ui/po_ui.inc:155 sales/sales_order_entry.php:687
  msgid "Invoice Date:"
  msgstr ""
  
  msgid "Invoice Date:"
  msgstr ""
  
-#: purchasing/includes/ui/po_ui.inc:189
+#: purchasing/includes/ui/po_ui.inc:168
+msgid "Supplier Currency:"
+msgstr ""
+
+#: purchasing/includes/ui/po_ui.inc:187
  msgid "Due Date:"
  msgstr ""
  
  msgid "Due Date:"
  msgstr ""
  
-#: purchasing/includes/ui/po_ui.inc:191
+#: purchasing/includes/ui/po_ui.inc:189
  msgid "Supplier's Reference:"
  msgstr ""
  
  msgid "Supplier's Reference:"
  msgstr ""
  
-#: purchasing/includes/ui/po_ui.inc:192
+#: purchasing/includes/ui/po_ui.inc:190
  msgid "Receive Into:"
  msgstr ""
  
  msgid "Receive Into:"
  msgstr ""
  
-#: purchasing/includes/ui/po_ui.inc:217
+#: purchasing/includes/ui/po_ui.inc:215
  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 ""
  
  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:221
+#: purchasing/includes/ui/po_ui.inc:219
  msgid "Deliver to:"
  msgstr ""
  
  msgid "Deliver to:"
  msgstr ""
  
-#: purchasing/includes/ui/po_ui.inc:230
+#: purchasing/includes/ui/po_ui.inc:228
  msgid "Order Items"
  msgstr ""
  
  msgid "Order Items"
  msgstr ""
  
-#: purchasing/includes/ui/po_ui.inc:236 purchasing/po_receive_items.php:62
+#: purchasing/includes/ui/po_ui.inc:234 purchasing/po_receive_items.php:62
  msgid "Received"
  msgstr ""
  
  msgid "Received"
  msgstr ""
  
-#: purchasing/includes/ui/po_ui.inc:237
-#: sales/includes/ui/sales_order_ui.inc:617
+#: purchasing/includes/ui/po_ui.inc:235
+#: sales/includes/ui/sales_order_ui.inc:616
  msgid "Required Delivery Date"
  msgstr ""
  
  msgid "Required Delivery Date"
  msgstr ""
  
-#: purchasing/includes/ui/po_ui.inc:237 purchasing/view/view_grn.php:41
+#: purchasing/includes/ui/po_ui.inc:235 purchasing/view/view_grn.php:41
  #: purchasing/view/view_po.php:46
  msgid "Line Total"
  msgstr ""
  
  #: purchasing/view/view_po.php:46
  msgid "Line Total"
  msgstr ""
  
-#: purchasing/includes/ui/po_ui.inc:288 purchasing/po_receive_items.php:114
+#: 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
  #: 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:509
+#: sales/customer_credit_invoice.php:322 sales/customer_delivery.php:511
  #: sales/customer_invoice.php:565 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
  msgid "Sub-total"
  msgstr ""
  
  #: sales/customer_invoice.php:565 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
  msgid "Sub-total"
  msgstr ""
  
-#: purchasing/includes/ui/po_ui.inc:297 purchasing/po_receive_items.php:122
+#: 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
  #: purchasing/view/view_grn.php:79 purchasing/view/view_po.php:93
-#: sales/customer_delivery.php:516 sales/view/view_sales_order.php:244
+#: sales/customer_delivery.php:518 sales/view/view_sales_order.php:244
  #: sales/includes/ui/sales_order_ui.inc:242
  msgid "Amount Total"
  msgstr ""
  
  #: sales/includes/ui/sales_order_ui.inc:242
  msgid "Amount Total"
  msgstr ""
  
-#: purchasing/includes/ui/po_ui.inc:298
+#: purchasing/includes/ui/po_ui.inc:296
  #: purchasing/allocations/supplier_allocate.php:63
  #: sales/allocations/customer_allocate.php:62
  #: sales/includes/ui/sales_order_ui.inc:243
  #: purchasing/allocations/supplier_allocate.php:63
  #: sales/allocations/customer_allocate.php:62
  #: sales/includes/ui/sales_order_ui.inc:243
@@ -9282,7 +9243,7 @@ msgstr ""
  msgid "Enter a new purchase order"
  msgstr ""
  
  msgid "Enter a new purchase order"
  msgstr ""
  
-#: purchasing/po_entry_items.php:216 sales/sales_order_entry.php:486
+#: purchasing/po_entry_items.php:216 sales/sales_order_entry.php:487
  msgid "Item description cannot be empty."
  msgstr ""
  
  msgid "Item description cannot be empty."
  msgstr ""
  
@@ -9327,7 +9288,7 @@ msgid "The entered order date is invalid."
  msgstr ""
  
  #: purchasing/po_entry_items.php:343 purchasing/po_receive_items.php:181
  msgstr ""
  
  #: purchasing/po_entry_items.php:343 purchasing/po_receive_items.php:181
-#: sales/sales_order_entry.php:354
+#: sales/sales_order_entry.php:355
  msgid "The entered date is not in fiscal year"
  msgstr ""
  
  msgid "The entered date is not in fiscal year"
  msgstr ""
  
@@ -9361,39 +9322,39 @@ msgid ""
  "The order cannot be placed because there are no lines entered on this order."
  msgstr ""
  
  "The order cannot be placed because there are no lines entered on this order."
  msgstr ""
  
-#: purchasing/po_entry_items.php:528 sales/sales_order_entry.php:709
+#: purchasing/po_entry_items.php:534 sales/sales_order_entry.php:710
  msgid "Place Order"
  msgstr ""
  
  msgid "Place Order"
  msgstr ""
  
-#: purchasing/po_entry_items.php:529
+#: purchasing/po_entry_items.php:535
  msgid "Update Order"
  msgstr ""
  
  msgid "Update Order"
  msgstr ""
  
-#: purchasing/po_entry_items.php:530 sales/sales_order_entry.php:708
+#: purchasing/po_entry_items.php:536 sales/sales_order_entry.php:709
  msgid "Cancel Order"
  msgstr ""
  
  msgid "Cancel Order"
  msgstr ""
  
-#: purchasing/po_entry_items.php:532
+#: purchasing/po_entry_items.php:538
  msgid "Process GRN"
  msgstr ""
  
  msgid "Process GRN"
  msgstr ""
  
-#: purchasing/po_entry_items.php:533
+#: purchasing/po_entry_items.php:539
  msgid "Update GRN"
  msgstr ""
  
  msgid "Update GRN"
  msgstr ""
  
-#: purchasing/po_entry_items.php:534
+#: purchasing/po_entry_items.php:540
  msgid "Cancel GRN"
  msgstr ""
  
  msgid "Cancel GRN"
  msgstr ""
  
-#: purchasing/po_entry_items.php:537 sales/customer_invoice.php:584
+#: purchasing/po_entry_items.php:543 sales/customer_invoice.php:584
  msgid "Process Invoice"
  msgstr ""
  
  msgid "Process Invoice"
  msgstr ""
  
-#: purchasing/po_entry_items.php:538
+#: purchasing/po_entry_items.php:544
  msgid "Update Invoice"
  msgstr ""
  
  msgid "Update Invoice"
  msgstr ""
  
-#: purchasing/po_entry_items.php:539 sales/sales_order_entry.php:689
+#: purchasing/po_entry_items.php:545 sales/sales_order_entry.php:690
  msgid "Cancel Invoice"
  msgstr ""
  
  msgid "Cancel Invoice"
  msgstr ""
  
@@ -9467,11 +9428,11 @@ msgstr ""
  msgid "Re-Read the updated purchase order for receiving goods against"
  msgstr ""
  
  msgid "Re-Read the updated purchase order for receiving goods against"
  msgstr ""
  
-#: purchasing/po_receive_items.php:329
+#: purchasing/po_receive_items.php:330
  msgid "Items to Receive"
  msgstr ""
  
  msgid "Items to Receive"
  msgstr ""
  
-#: purchasing/po_receive_items.php:334
+#: purchasing/po_receive_items.php:335
  msgid "Process Receive Items"
  msgstr ""
  
  msgid "Process Receive Items"
  msgstr ""
  
@@ -9654,10 +9615,6 @@ msgstr ""
  msgid "Enter Another Supplier &Payment"
  msgstr ""
  
  msgid "Enter Another Supplier &Payment"
  msgstr ""
  
-#: purchasing/supplier_payment.php:148 sales/customer_payments.php:198
-msgid "The exchange rate must be numeric and greater than zero."
-msgstr ""
-
  #: purchasing/supplier_payment.php:160
  msgid "The entered discount is invalid or less than zero."
  msgstr ""
  #: purchasing/supplier_payment.php:160
  msgid "The entered discount is invalid or less than zero."
  msgstr ""
@@ -9668,29 +9625,34 @@ msgid ""
  "positive values."
  msgstr ""
  
  "positive values."
  msgstr ""
  
-#: purchasing/supplier_payment.php:275
+#: purchasing/supplier_payment.php:175
+msgid "The entered bank amount is zero or negative."
+msgstr ""
+
+#: purchasing/supplier_payment.php:284
  msgid "Payment To:"
  msgstr ""
  
  msgid "Payment To:"
  msgstr ""
  
-#: purchasing/supplier_payment.php:288
+#: purchasing/supplier_payment.php:294
  msgid "From Bank Account:"
  msgstr ""
  
  msgid "From Bank Account:"
  msgstr ""
  
-#: purchasing/supplier_payment.php:296
+#: purchasing/supplier_payment.php:302
  #: purchasing/view/view_supp_payment.php:55
  msgid "Date Paid"
  msgstr ""
  
  #: purchasing/view/view_supp_payment.php:55
  msgid "Date Paid"
  msgstr ""
  
-#: purchasing/supplier_payment.php:319 sales/customer_payments.php:394
-msgid "Amount of Discount:"
+#: purchasing/supplier_payment.php:319
+#, php-format
+msgid "Accounts Payable settled in %s:"
  msgstr ""
  
  msgstr ""
  
-#: purchasing/supplier_payment.php:320
-msgid "Amount of Payment:"
+#: purchasing/supplier_payment.php:324 sales/customer_payments.php:404
+msgid "Amount of Discount:"
  msgstr ""
  
  msgstr ""
  
-#: purchasing/supplier_payment.php:326
-msgid "The amount and discount are in the bank account's currency."
+#: purchasing/supplier_payment.php:325
+msgid "Amount of Payment:"
  msgstr ""
  
  #: purchasing/supplier_payment.php:329
  msgstr ""
  
  #: purchasing/supplier_payment.php:329
@@ -10213,7 +10175,7 @@ msgstr ""
  #: reporting/rep101.php:259 reporting/rep102.php:228 reporting/rep106.php:171
  #: reporting/rep201.php:247 reporting/rep202.php:235 reporting/rep203.php:181
  #: reporting/rep204.php:148 reporting/rep301.php:179 reporting/rep304.php:195
  #: reporting/rep101.php:259 reporting/rep102.php:228 reporting/rep106.php:171
  #: reporting/rep201.php:247 reporting/rep202.php:235 reporting/rep203.php:181
  #: reporting/rep204.php:148 reporting/rep301.php:179 reporting/rep304.php:195
-#: reporting/rep305.php:187 reporting/rep306.php:294 reporting/rep309.php:158
+#: reporting/rep305.php:188 reporting/rep306.php:293 reporting/rep309.php:158
  msgid "Grand Total"
  msgstr ""
  
  msgid "Grand Total"
  msgstr ""
  
@@ -10663,7 +10625,7 @@ msgstr ""
  msgid "Shortage"
  msgstr ""
  
  msgid "Shortage"
  msgstr ""
  
-#: reporting/rep303.php:121 reporting/rep303.php:127 reporting/rep305.php:100
+#: reporting/rep303.php:121 reporting/rep303.php:127 reporting/rep305.php:101
  msgid "Stock ID"
  msgstr ""
  
  msgid "Stock ID"
  msgstr ""
  
@@ -10679,7 +10641,7 @@ msgstr ""
  msgid "Stock Check Sheets"
  msgstr ""
  
  msgid "Stock Check Sheets"
  msgstr ""
  
-#: reporting/rep304.php:114 reporting/rep305.php:100 reporting/rep306.php:141
+#: reporting/rep304.php:114 reporting/rep305.php:101 reporting/rep306.php:141
  #: reporting/rep309.php:98
  msgid "Qty"
  msgstr ""
  #: reporting/rep309.php:98
  msgid "Qty"
  msgstr ""
@@ -10701,23 +10663,23 @@ msgstr ""
  msgid "Inventory Sales Report"
  msgstr ""
  
  msgid "Inventory Sales Report"
  msgstr ""
  
-#: reporting/rep305.php:100
+#: reporting/rep305.php:101
  msgid "PO No"
  msgstr ""
  
  msgid "PO No"
  msgstr ""
  
-#: reporting/rep305.php:100
+#: reporting/rep305.php:101
  msgid "Inv"
  msgstr ""
  
  msgid "Inv"
  msgstr ""
  
-#: reporting/rep305.php:100
+#: reporting/rep305.php:101
  msgid "Inv Price"
  msgstr ""
  
  msgid "Inv Price"
  msgstr ""
  
-#: reporting/rep305.php:100
+#: reporting/rep305.php:101
  msgid "PO Price"
  msgstr ""
  
  msgid "PO Price"
  msgstr ""
  
-#: reporting/rep305.php:107
+#: reporting/rep305.php:108
  msgid "GRN Valuation Report"
  msgstr ""
  
  msgid "GRN Valuation Report"
  msgstr ""
  
@@ -11325,7 +11287,7 @@ msgstr ""
  
  #: reporting/includes/doctext.inc:48 sales/view/view_sales_order.php:69
  #: sales/inquiry/sales_orders_view.php:282
  
  #: 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:612
+#: sales/includes/ui/sales_order_ui.inc:611
  msgid "Valid until"
  msgstr ""
  
  msgid "Valid until"
  msgstr ""
  
@@ -11678,7 +11640,7 @@ msgstr ""
  msgid "Modifying Customer Credit Note #%d"
  msgstr ""
  
  msgid "Modifying Customer Credit Note #%d"
  msgstr ""
  
-#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:683
+#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:684
  msgid ""
  "There are no customers, or there are no customers with branches. Please "
  "define customers and customer branches."
  msgid ""
  "There are no customers, or there are no customers with branches. Please "
  "define customers and customer branches."
@@ -11952,7 +11914,7 @@ msgstr ""
  msgid "There are no item quantities on this delivery note."
  msgstr ""
  
  msgid "There are no item quantities on this delivery note."
  msgstr ""
  
-#: sales/customer_delivery.php:285 sales/sales_order_entry.php:512
+#: sales/customer_delivery.php:285 sales/sales_order_entry.php:513
  #: sales/includes/ui/sales_order_ui.inc:250
  msgid ""
  "The delivery cannot be processed because there is an insufficient quantity "
  #: sales/includes/ui/sales_order_ui.inc:250
  msgid ""
  "The delivery cannot be processed because there is an insufficient quantity "
@@ -11992,38 +11954,38 @@ msgstr ""
  msgid "Delivered"
  msgstr ""
  
  msgid "Delivered"
  msgstr ""
  
-#: sales/customer_delivery.php:501 sales/customer_invoice.php:554
+#: sales/customer_delivery.php:503 sales/customer_invoice.php:554
  msgid "Shipping Cost"
  msgstr ""
  
  msgid "Shipping Cost"
  msgstr ""
  
-#: sales/customer_delivery.php:521 sales/includes/ui/sales_order_ui.inc:248
+#: sales/customer_delivery.php:523 sales/includes/ui/sales_order_ui.inc:248
  msgid ""
  "Marked items have insufficient quantities in stock as on day of delivery."
  msgstr ""
  
  msgid ""
  "Marked items have insufficient quantities in stock as on day of delivery."
  msgstr ""
  
-#: sales/customer_delivery.php:525
+#: sales/customer_delivery.php:527
  msgid "Action For Balance"
  msgstr ""
  
  msgid "Action For Balance"
  msgstr ""
  
-#: sales/customer_delivery.php:532 sales/customer_delivery.php:534
-#: sales/customer_delivery.php:537 sales/customer_invoice.php:583
+#: sales/customer_delivery.php:534 sales/customer_delivery.php:536
+#: sales/customer_delivery.php:539 sales/customer_invoice.php:583
  msgid "Refresh document page"
  msgstr ""
  
  msgid "Refresh document page"
  msgstr ""
  
-#: sales/customer_delivery.php:534
+#: sales/customer_delivery.php:536
  msgid "Reset quantity"
  msgstr ""
  
  msgid "Reset quantity"
  msgstr ""
  
-#: sales/customer_delivery.php:537
+#: sales/customer_delivery.php:539
  msgid "Clear quantity"
  msgstr ""
  
  msgid "Clear quantity"
  msgstr ""
  
-#: sales/customer_delivery.php:539
+#: sales/customer_delivery.php:541
  msgid "Process Dispatch"
  msgstr ""
  
  msgid "Process Dispatch"
  msgstr ""
  
-#: sales/customer_delivery.php:540 sales/customer_invoice.php:585
-#: sales/sales_order_entry.php:731
+#: sales/customer_delivery.php:542 sales/customer_invoice.php:585
+#: sales/sales_order_entry.php:732
  msgid "Check entered data and save document"
  msgstr ""
  
  msgid "Check entered data and save document"
  msgstr ""
  
@@ -12134,8 +12096,8 @@ msgstr ""
  msgid "Payment terms:"
  msgstr ""
  
  msgid "Payment terms:"
  msgstr ""
  
-#: sales/customer_invoice.php:388 sales/includes/ui/sales_order_ui.inc:411
-#: sales/includes/ui/sales_order_ui.inc:415
+#: sales/customer_invoice.php:388 sales/includes/ui/sales_order_ui.inc:410
+#: sales/includes/ui/sales_order_ui.inc:414
  msgid "Payment:"
  msgstr ""
  
  msgid "Payment:"
  msgstr ""
  
@@ -12195,11 +12157,11 @@ msgstr ""
  msgid "Select Another Customer Payment for &Edition"
  msgstr ""
  
  msgid "Select Another Customer Payment for &Edition"
  msgstr ""
  
-#: sales/customer_payments.php:134 sales/sales_order_entry.php:336
+#: sales/customer_payments.php:134 sales/sales_order_entry.php:337
  msgid "There is no customer selected."
  msgstr ""
  
  msgid "There is no customer selected."
  msgstr ""
  
-#: sales/customer_payments.php:141 sales/sales_order_entry.php:343
+#: sales/customer_payments.php:141 sales/sales_order_entry.php:344
  msgid "This customer has no branch defined."
  msgstr ""
  
  msgid "This customer has no branch defined."
  msgstr ""
  
@@ -12217,35 +12179,44 @@ msgstr ""
  
  #: sales/customer_payments.php:216
  msgid ""
  
  #: sales/customer_payments.php:216
  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 ""
  
  "valid amounts."
  msgstr ""
  
-#: sales/customer_payments.php:334 sales/customer_payments.php:336
-msgid "From Customer:"
+#: sales/customer_payments.php:223
+msgid "The entered payment amount is zero or negative."
  msgstr ""
  
  msgstr ""
  
-#: sales/customer_payments.php:365
+#: sales/customer_payments.php:340
  msgid "Into Bank Account:"
  msgstr ""
  
  msgid "Into Bank Account:"
  msgstr ""
  
-#: sales/customer_payments.php:371
+#: sales/customer_payments.php:343 sales/customer_payments.php:345
+msgid "From Customer:"
+msgstr ""
+
+#: sales/customer_payments.php:370
  msgid "Date of Deposit:"
  msgstr ""
  
  msgid "Date of Deposit:"
  msgstr ""
  
-#: sales/customer_payments.php:393
-msgid "Customer prompt payment discount :"
+#: sales/customer_payments.php:386
+msgid "Payment Amount:"
+msgstr ""
+
+#: sales/customer_payments.php:395
+#, php-format
+msgid "Accounts Receivable settled in %s:"
  msgstr ""
  
  #: sales/customer_payments.php:402
  msgstr ""
  
  #: sales/customer_payments.php:402
-msgid "Amount and discount are in customer's currency."
+msgid "Customer prompt payment discount :"
  msgstr ""
  
  msgstr ""
  
-#: sales/customer_payments.php:407
+#: sales/customer_payments.php:412
  msgid "Update Payment"
  msgstr ""
  
  msgid "Update Payment"
  msgstr ""
  
-#: sales/customer_payments.php:409
+#: sales/customer_payments.php:414
  msgid "Add Payment"
  msgstr ""
  
  msgid "Add Payment"
  msgstr ""
  
@@ -12380,192 +12351,192 @@ msgstr ""
  msgid "Enter a &New Direct Invoice"
  msgstr ""
  
  msgid "Enter a &New Direct Invoice"
  msgstr ""
  
-#: sales/sales_order_entry.php:365
+#: sales/sales_order_entry.php:366
  msgid ""
  "You must enter the person or company to whom delivery should be made to."
  msgstr ""
  
  msgid ""
  "You must enter the person or company to whom delivery should be made to."
  msgstr ""
  
-#: sales/sales_order_entry.php:372
+#: sales/sales_order_entry.php:373
  msgid ""
  "You should enter the street address in the box provided. Orders cannot be "
  "accepted without a valid street address."
  msgstr ""
  
  msgid ""
  "You should enter the street address in the box provided. Orders cannot be "
  "accepted without a valid street address."
  msgstr ""
  
-#: sales/sales_order_entry.php:381
+#: sales/sales_order_entry.php:382
  msgid "The shipping cost entered is expected to be numeric."
  msgstr ""
  
  msgid "The shipping cost entered is expected to be numeric."
  msgstr ""
  
-#: sales/sales_order_entry.php:387
+#: sales/sales_order_entry.php:388
  msgid "The Valid date is invalid."
  msgstr ""
  
  msgid "The Valid date is invalid."
  msgstr ""
  
-#: sales/sales_order_entry.php:389
+#: sales/sales_order_entry.php:390
  msgid "The delivery date is invalid."
  msgstr ""
  
  msgid "The delivery date is invalid."
  msgstr ""
  
-#: sales/sales_order_entry.php:396
+#: sales/sales_order_entry.php:397
  msgid "The requested valid date is before the date of the quotation."
  msgstr ""
  
  msgid "The requested valid date is before the date of the quotation."
  msgstr ""
  
-#: sales/sales_order_entry.php:398
+#: sales/sales_order_entry.php:399
  msgid "The requested delivery date is before the date of the order."
  msgstr ""
  
  msgid "The requested delivery date is before the date of the order."
  msgstr ""
  
-#: sales/sales_order_entry.php:407
+#: sales/sales_order_entry.php:408
  msgid "You need to define a cash account for your Sales Point."
  msgstr ""
  
  msgid "You need to define a cash account for your Sales Point."
  msgstr ""
  
-#: sales/sales_order_entry.php:445
+#: sales/sales_order_entry.php:446
  msgid ""
  "The reference number field has been increased. Please save the document "
  "again."
  msgstr ""
  
  msgid ""
  "The reference number field has been increased. Please save the document "
  "again."
  msgstr ""
  
-#: sales/sales_order_entry.php:491
+#: sales/sales_order_entry.php:492
  msgid ""
  "The item could not be updated because you are attempting to set the quantity "
  "ordered to less than 0, or the discount percent to more than 100."
  msgstr ""
  
  msgid ""
  "The item could not be updated because you are attempting to set the quantity "
  "ordered to less than 0, or the discount percent to more than 100."
  msgstr ""
  
-#: sales/sales_order_entry.php:495
+#: sales/sales_order_entry.php:496
  msgid "Price for inventory item must be entered and can not be less than 0"
  msgstr ""
  
  msgid "Price for inventory item must be entered and can not be less than 0"
  msgstr ""
  
-#: sales/sales_order_entry.php:502
+#: sales/sales_order_entry.php:503
  msgid ""
  "You attempting to make the quantity ordered a quantity less than has already "
  "been delivered. The quantity delivered cannot be modified retrospectively."
  msgstr ""
  
  msgid ""
  "You attempting to make the quantity ordered a quantity less than has already "
  "been delivered. The quantity delivered cannot be modified retrospectively."
  msgstr ""
  
-#: sales/sales_order_entry.php:533
+#: sales/sales_order_entry.php:534
  #, php-format
  msgid "Price %s is below Standard Cost %s"
  msgstr ""
  
  #, php-format
  msgid "Price %s is below Standard Cost %s"
  msgstr ""
  
-#: sales/sales_order_entry.php:558
+#: sales/sales_order_entry.php:559
  msgid ""
  "This item cannot be deleted because some of it has already been delivered."
  msgstr ""
  
  msgid ""
  "This item cannot be deleted because some of it has already been delivered."
  msgstr ""
  
-#: sales/sales_order_entry.php:587
+#: sales/sales_order_entry.php:588
  msgid "Direct delivery entry has been cancelled as requested."
  msgstr ""
  
  msgid "Direct delivery entry has been cancelled as requested."
  msgstr ""
  
-#: sales/sales_order_entry.php:588
+#: sales/sales_order_entry.php:589
  msgid "Enter a New Sales Delivery"
  msgstr ""
  
  msgid "Enter a New Sales Delivery"
  msgstr ""
  
-#: sales/sales_order_entry.php:590
+#: sales/sales_order_entry.php:591
  msgid "Direct invoice entry has been cancelled as requested."
  msgstr ""
  
  msgid "Direct invoice entry has been cancelled as requested."
  msgstr ""
  
-#: sales/sales_order_entry.php:591
+#: sales/sales_order_entry.php:592
  msgid "Enter a New Sales Invoice"
  msgstr ""
  
  msgid "Enter a New Sales Invoice"
  msgstr ""
  
-#: sales/sales_order_entry.php:595
+#: sales/sales_order_entry.php:596
  msgid "This sales quotation has been cancelled as requested."
  msgstr ""
  
  msgid "This sales quotation has been cancelled as requested."
  msgstr ""
  
-#: sales/sales_order_entry.php:596
+#: sales/sales_order_entry.php:597
  msgid "Enter a New Sales Quotation"
  msgstr ""
  
  msgid "Enter a New Sales Quotation"
  msgstr ""
  
-#: sales/sales_order_entry.php:603
+#: sales/sales_order_entry.php:604
  msgid "Undelivered part of order has been cancelled as requested."
  msgstr ""
  
  msgid "Undelivered part of order has been cancelled as requested."
  msgstr ""
  
-#: sales/sales_order_entry.php:604
+#: sales/sales_order_entry.php:605
  msgid "Select Another Sales Order for Edition"
  msgstr ""
  
  msgid "Select Another Sales Order for Edition"
  msgstr ""
  
-#: sales/sales_order_entry.php:608
+#: sales/sales_order_entry.php:609
  msgid "This sales order has been cancelled as requested."
  msgstr ""
  
  msgid "This sales order has been cancelled as requested."
  msgstr ""
  
-#: sales/sales_order_entry.php:609
+#: sales/sales_order_entry.php:610
  msgid "Enter a New Sales Order"
  msgstr ""
  
  msgid "Enter a New Sales Order"
  msgstr ""
  
-#: sales/sales_order_entry.php:687
+#: sales/sales_order_entry.php:688
  msgid "Sales Invoice Items"
  msgstr ""
  
  msgid "Sales Invoice Items"
  msgstr ""
  
-#: sales/sales_order_entry.php:688
+#: sales/sales_order_entry.php:689
  msgid "Enter Delivery Details and Confirm Invoice"
  msgstr ""
  
  msgid "Enter Delivery Details and Confirm Invoice"
  msgstr ""
  
-#: sales/sales_order_entry.php:690
+#: sales/sales_order_entry.php:691
  msgid "Place Invoice"
  msgstr ""
  
  msgid "Place Invoice"
  msgstr ""
  
-#: sales/sales_order_entry.php:693
+#: sales/sales_order_entry.php:694
  msgid "Delivery Note Items"
  msgstr ""
  
  msgid "Delivery Note Items"
  msgstr ""
  
-#: sales/sales_order_entry.php:694
+#: sales/sales_order_entry.php:695
  msgid "Enter Delivery Details and Confirm Dispatch"
  msgstr ""
  
  msgid "Enter Delivery Details and Confirm Dispatch"
  msgstr ""
  
-#: sales/sales_order_entry.php:695
+#: sales/sales_order_entry.php:696
  msgid "Cancel Delivery"
  msgstr ""
  
  msgid "Cancel Delivery"
  msgstr ""
  
-#: sales/sales_order_entry.php:696
+#: sales/sales_order_entry.php:697
  msgid "Place Delivery"
  msgstr ""
  
  msgid "Place Delivery"
  msgstr ""
  
-#: sales/sales_order_entry.php:698
+#: sales/sales_order_entry.php:699
  msgid "Quotation Date:"
  msgstr ""
  
  msgid "Quotation Date:"
  msgstr ""
  
-#: sales/sales_order_entry.php:699
+#: sales/sales_order_entry.php:700
  msgid "Sales Quotation Items"
  msgstr ""
  
  msgid "Sales Quotation Items"
  msgstr ""
  
-#: sales/sales_order_entry.php:700
+#: sales/sales_order_entry.php:701
  msgid "Enter Delivery Details and Confirm Quotation"
  msgstr ""
  
  msgid "Enter Delivery Details and Confirm Quotation"
  msgstr ""
  
-#: sales/sales_order_entry.php:701
+#: sales/sales_order_entry.php:702
  msgid "Cancel Quotation"
  msgstr ""
  
  msgid "Cancel Quotation"
  msgstr ""
  
-#: sales/sales_order_entry.php:702
+#: sales/sales_order_entry.php:703
  msgid "Place Quotation"
  msgstr ""
  
  msgid "Place Quotation"
  msgstr ""
  
-#: sales/sales_order_entry.php:703
+#: sales/sales_order_entry.php:704
  msgid "Commit Quotations Changes"
  msgstr ""
  
  msgid "Commit Quotations Changes"
  msgstr ""
  
-#: sales/sales_order_entry.php:706
+#: sales/sales_order_entry.php:707
  msgid "Sales Order Items"
  msgstr ""
  
  msgid "Sales Order Items"
  msgstr ""
  
-#: sales/sales_order_entry.php:707
+#: sales/sales_order_entry.php:708
  msgid "Enter Delivery Details and Confirm Order"
  msgstr ""
  
  msgid "Enter Delivery Details and Confirm Order"
  msgstr ""
  
-#: sales/sales_order_entry.php:710
+#: sales/sales_order_entry.php:711
  msgid "Commit Order Changes"
  msgstr ""
  
  msgid "Commit Order Changes"
  msgstr ""
  
-#: sales/sales_order_entry.php:732
+#: sales/sales_order_entry.php:733
  msgid "You are about to void this Document.\\nDo you want to continue?"
  msgstr ""
  
  msgid "You are about to void this Document.\\nDo you want to continue?"
  msgstr ""
  
-#: sales/sales_order_entry.php:735
+#: sales/sales_order_entry.php:736
  msgid ""
  "You are about to cancel undelivered part of this order.\\nDo you want to "
  "continue?"
  msgstr ""
  
  msgid ""
  "You are about to cancel undelivered part of this order.\\nDo you want to "
  "continue?"
  msgstr ""
  
-#: sales/sales_order_entry.php:737
+#: sales/sales_order_entry.php:738
  msgid "Validate changes and update document"
  msgstr ""
  
  msgid "Validate changes and update document"
  msgstr ""
  
-#: sales/sales_order_entry.php:741
+#: sales/sales_order_entry.php:742
  msgid ""
  "Cancels document entry or removes sales order when editing an old document"
  msgstr ""
  msgid ""
  "Cancels document entry or removes sales order when editing an old document"
  msgstr ""
@@ -13468,7 +13439,7 @@ msgstr ""
  msgid "Tmpl"
  msgstr ""
  
  msgid "Tmpl"
  msgstr ""
  
-#: sales/includes/cart_class.inc:377
+#: sales/includes/cart_class.inc:378
  msgid "You have to enter valid stock code or nonempty description"
  msgstr ""
  
  msgid "You have to enter valid stock code or nonempty description"
  msgstr ""
  
@@ -13486,22 +13457,22 @@ msgid ""
  "charges."
  msgstr ""
  
  "charges."
  msgstr ""
  
-#: sales/includes/db/sales_invoice_db.inc:174
+#: sales/includes/db/sales_invoice_db.inc:176
  msgid "Cash invoice"
  msgstr ""
  
  #: sales/includes/db/sales_order_db.inc:107
  msgid "Cash invoice"
  msgstr ""
  
  #: sales/includes/db/sales_order_db.inc:107
-#: sales/includes/db/sales_order_db.inc:259
+#: sales/includes/db/sales_order_db.inc:279
  msgid "Stocks below Re-Order Level at "
  msgstr ""
  
  #: sales/includes/db/sales_order_db.inc:110
  msgid "Stocks below Re-Order Level at "
  msgstr ""
  
  #: sales/includes/db/sales_order_db.inc:110
-#: sales/includes/db/sales_order_db.inc:264
+#: sales/includes/db/sales_order_db.inc:284
  msgid "Below"
  msgstr ""
  
  #: sales/includes/db/sales_order_db.inc:111
  msgid "Below"
  msgstr ""
  
  #: sales/includes/db/sales_order_db.inc:111
-#: sales/includes/db/sales_order_db.inc:265
+#: sales/includes/db/sales_order_db.inc:285
  msgid "Please reorder"
  msgstr ""
  
  msgid "Please reorder"
  msgstr ""
  
@@ -13510,17 +13481,17 @@ msgid "Deleted."
  msgstr ""
  
  #: sales/includes/ui/sales_credit_ui.inc:94
  msgstr ""
  
  #: sales/includes/ui/sales_credit_ui.inc:94
-#: sales/includes/ui/sales_order_ui.inc:385
+#: sales/includes/ui/sales_order_ui.inc:384
  msgid "Customer Currency:"
  msgstr ""
  
  #: sales/includes/ui/sales_credit_ui.inc:112
  msgid "Customer Currency:"
  msgstr ""
  
  #: sales/includes/ui/sales_credit_ui.inc:112
-#: sales/includes/ui/sales_order_ui.inc:645
+#: sales/includes/ui/sales_order_ui.inc:644
  msgid "Shipping Company:"
  msgstr ""
  
  #: sales/includes/ui/sales_credit_ui.inc:114
  msgid "Shipping Company:"
  msgstr ""
  
  #: sales/includes/ui/sales_credit_ui.inc:114
-#: sales/includes/ui/sales_order_ui.inc:392
+#: sales/includes/ui/sales_order_ui.inc:391
  msgid "Customer Discount:"
  msgstr ""
  
  msgid "Customer Discount:"
  msgstr ""
  
@@ -13547,85 +13518,85 @@ msgstr ""
  msgid "Customer's payment terms '%s' cannot be selected on this POS"
  msgstr ""
  
  msgid "Customer's payment terms '%s' cannot be selected on this POS"
  msgstr ""
  
-#: sales/includes/ui/sales_order_ui.inc:379
+#: sales/includes/ui/sales_order_ui.inc:378
  msgid "Reference number unique for this document type"
  msgstr ""
  
  msgid "Reference number unique for this document type"
  msgstr ""
  
-#: sales/includes/ui/sales_order_ui.inc:419
-#: sales/includes/ui/sales_order_ui.inc:421
+#: sales/includes/ui/sales_order_ui.inc:418
+#: sales/includes/ui/sales_order_ui.inc:420
  msgid "Price List:"
  msgstr ""
  
  msgid "Price List:"
  msgstr ""
  
-#: sales/includes/ui/sales_order_ui.inc:438
+#: sales/includes/ui/sales_order_ui.inc:437
  msgid "Date of order receive"
  msgstr ""
  
  msgid "Date of order receive"
  msgstr ""
  
-#: sales/includes/ui/sales_order_ui.inc:588
+#: sales/includes/ui/sales_order_ui.inc:587
  msgid "Cash payment"
  msgstr ""
  
  msgid "Cash payment"
  msgstr ""
  
-#: sales/includes/ui/sales_order_ui.inc:591
-#: sales/includes/ui/sales_order_ui.inc:623
+#: sales/includes/ui/sales_order_ui.inc:590
+#: sales/includes/ui/sales_order_ui.inc:622
  msgid "Deliver from Location:"
  msgstr ""
  
  msgid "Deliver from Location:"
  msgstr ""
  
-#: sales/includes/ui/sales_order_ui.inc:594
+#: sales/includes/ui/sales_order_ui.inc:593
  msgid "Cash account:"
  msgstr ""
  
  msgid "Cash account:"
  msgstr ""
  
-#: sales/includes/ui/sales_order_ui.inc:601
+#: sales/includes/ui/sales_order_ui.inc:600
  msgid "Delivery Details"
  msgstr ""
  
  msgid "Delivery Details"
  msgstr ""
  
-#: sales/includes/ui/sales_order_ui.inc:606
+#: sales/includes/ui/sales_order_ui.inc:605
  msgid "Invoice Delivery Details"
  msgstr ""
  
  msgid "Invoice Delivery Details"
  msgstr ""
  
-#: sales/includes/ui/sales_order_ui.inc:607
+#: sales/includes/ui/sales_order_ui.inc:606
  msgid "Invoice before"
  msgstr ""
  
  msgid "Invoice before"
  msgstr ""
  
-#: sales/includes/ui/sales_order_ui.inc:611
+#: sales/includes/ui/sales_order_ui.inc:610
  msgid "Quotation Delivery Details"
  msgstr ""
  
  msgid "Quotation Delivery Details"
  msgstr ""
  
-#: sales/includes/ui/sales_order_ui.inc:616
+#: sales/includes/ui/sales_order_ui.inc:615
  msgid "Order Delivery Details"
  msgstr ""
  
  msgid "Order Delivery Details"
  msgstr ""
  
-#: sales/includes/ui/sales_order_ui.inc:629
+#: sales/includes/ui/sales_order_ui.inc:628
  msgid "Enter requested day of delivery"
  msgstr ""
  
  msgid "Enter requested day of delivery"
  msgstr ""
  
-#: sales/includes/ui/sales_order_ui.inc:630
+#: sales/includes/ui/sales_order_ui.inc:629
  msgid "Enter Valid until Date"
  msgstr ""
  
  msgid "Enter Valid until Date"
  msgstr ""
  
-#: sales/includes/ui/sales_order_ui.inc:631
+#: sales/includes/ui/sales_order_ui.inc:630
  msgid "Deliver To:"
  msgstr ""
  
  msgid "Deliver To:"
  msgstr ""
  
-#: sales/includes/ui/sales_order_ui.inc:632
+#: sales/includes/ui/sales_order_ui.inc:631
  msgid "Additional identifier for delivery e.g. name of receiving person"
  msgstr ""
  
  msgid "Additional identifier for delivery e.g. name of receiving person"
  msgstr ""
  
-#: sales/includes/ui/sales_order_ui.inc:635
+#: sales/includes/ui/sales_order_ui.inc:634
  msgid "Delivery address. Default is address of customer branch"
  msgstr ""
  
  msgid "Delivery address. Default is address of customer branch"
  msgstr ""
  
-#: sales/includes/ui/sales_order_ui.inc:639
+#: sales/includes/ui/sales_order_ui.inc:638
  msgid "Contact Phone Number:"
  msgstr ""
  
  msgid "Contact Phone Number:"
  msgstr ""
  
-#: sales/includes/ui/sales_order_ui.inc:640
+#: sales/includes/ui/sales_order_ui.inc:639
  msgid "Phone number of ordering person. Defaults to branch phone number"
  msgstr ""
  
  msgid "Phone number of ordering person. Defaults to branch phone number"
  msgstr ""
  
-#: sales/includes/ui/sales_order_ui.inc:641
+#: sales/includes/ui/sales_order_ui.inc:640
  msgid "Customer Reference:"
  msgstr ""
  
  msgid "Customer Reference:"
  msgstr ""
  
-#: sales/includes/ui/sales_order_ui.inc:642
+#: sales/includes/ui/sales_order_ui.inc:641
  msgid "Customer reference number for this order (if any)"
  msgstr ""
  
  msgid "Customer reference number for this order (if any)"
  msgstr ""
author	Janusz Dobrowolski <janusz@frontaccounting.eu>
	Thu, 1 Aug 2013 10:35:53 +0000 (12:35 +0200)
committer	Janusz Dobrowolski <janusz@frontaccounting.eu>
	Thu, 1 Aug 2013 10:35:53 +0000 (12:35 +0200)