Fixes in sales reports to use debtor_trans.tax_included field instead of trans_tax_de...

[fa-stable.git] / lang / new_language_template / LC_MESSAGES / empty.po
diff --git a/lang/new_language_template/LC_MESSAGES/empty.po b/lang/new_language_template/LC_MESSAGES/empty.po

index 0c07a25d6d8a26c76069a891fca838aa8ab289c5..544060b546edd43fe73fdaaff806bc9d0c065fa1 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: 2011-06-09 15:26+0200\n"
+"POT-Creation-Date: 2011-11-10 11:14+0100\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"
@@ -97,7 +97,7 @@ msgid "Attachment has been deleted."
  msgstr ""
  
  #: admin/attachments.php:155 admin/view_print_transaction.php:72
  msgstr ""
  
  #: admin/attachments.php:155 admin/view_print_transaction.php:72
-#: admin/void_transaction.php:151 gl/inquiry/journal_inquiry.php:47
+#: admin/void_transaction.php:155 gl/inquiry/journal_inquiry.php:47
  #: inventory/includes/item_adjustments_ui.inc:47
  #: manufacturing/work_order_add_finished.php:203
  #: manufacturing/work_order_costs.php:150
  #: inventory/includes/item_adjustments_ui.inc:47
  #: manufacturing/work_order_add_finished.php:203
  #: manufacturing/work_order_costs.php:150
@@ -109,12 +109,12 @@ msgid "Type:"
  msgstr ""
  
  #: admin/attachments.php:167 admin/view_print_transaction.php:126
  msgstr ""
  
  #: admin/attachments.php:167 admin/view_print_transaction.php:126
-#: admin/void_transaction.php:175 dimensions/inquiry/search_dimensions.php:127
+#: admin/void_transaction.php:179 dimensions/inquiry/search_dimensions.php:127
  #: dimensions/view/view_dimension.php:54 gl/bank_account_reconcile.php:234
  #: dimensions/view/view_dimension.php:54 gl/bank_account_reconcile.php:234
-#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:125
+#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126
  #: gl/inquiry/journal_inquiry.php:120 gl/inquiry/journal_inquiry.php:133
  #: includes/ui/allocation_cart.inc:263
  #: gl/inquiry/journal_inquiry.php:120 gl/inquiry/journal_inquiry.php:133
  #: includes/ui/allocation_cart.inc:263
-#: inventory/inquiry/stock_movements.php:76
+#: inventory/inquiry/stock_movements.php:81
  #: manufacturing/search_work_orders.php:159
  #: manufacturing/includes/manufacturing_ui.inc:157
  #: manufacturing/includes/manufacturing_ui.inc:200
  #: manufacturing/search_work_orders.php:159
  #: manufacturing/includes/manufacturing_ui.inc:157
  #: manufacturing/includes/manufacturing_ui.inc:200
@@ -123,21 +123,23 @@ msgstr ""
  #: manufacturing/includes/manufacturing_ui.inc:280
  #: manufacturing/includes/manufacturing_ui.inc:331
  #: purchasing/view/view_po.php:115 purchasing/view/view_po.php:140
  #: manufacturing/includes/manufacturing_ui.inc:280
  #: manufacturing/includes/manufacturing_ui.inc:331
  #: purchasing/view/view_po.php:115 purchasing/view/view_po.php:140
-#: purchasing/inquiry/po_search_completed.php:116
+#: purchasing/inquiry/po_search_completed.php:121
  #: purchasing/inquiry/po_search.php:130
  #: purchasing/inquiry/po_search.php:130
-#: purchasing/inquiry/supplier_allocation_inquiry.php:126
-#: purchasing/inquiry/supplier_inquiry.php:163
+#: purchasing/inquiry/supplier_allocation_inquiry.php:127
+#: purchasing/inquiry/supplier_inquiry.php:169
  #: purchasing/inquiry/supplier_inquiry.php.orig:163
  #: purchasing/allocations/supplier_allocation_main.php:95
  #: reporting/rep101.php:130 reporting/rep201.php:118 reporting/rep203.php:91
  #: purchasing/inquiry/supplier_inquiry.php.orig:163
  #: purchasing/allocations/supplier_allocation_main.php:95
  #: reporting/rep101.php:130 reporting/rep201.php:118 reporting/rep203.php:91
-#: reporting/rep601.php:76 reporting/rep704.php:78 reporting/rep704.php:81
-#: reporting/rep704.php:84 reporting/rep710.php:76
-#: reporting/includes/doctext.inc:110 reporting/includes/doctext.inc:118
+#: reporting/rep601.php:76 reporting/rep704.php:79 reporting/rep704.php:82
+#: reporting/rep704.php:85 reporting/rep710.php:76
+#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186
+#: reporting/includes/doctext.inc:224
  #: sales/allocations/customer_allocation_main.php:94
  #: sales/view/view_sales_order.php:96 sales/view/view_sales_order.php:129
  #: sales/view/view_sales_order.php:161
  #: sales/allocations/customer_allocation_main.php:94
  #: sales/view/view_sales_order.php:96 sales/view/view_sales_order.php:129
  #: sales/view/view_sales_order.php:161
-#: sales/inquiry/customer_allocation_inquiry.php:142
-#: sales/inquiry/customer_inquiry.php:213
+#: sales/inquiry/customer_allocation_inquiry.php:145
+#: sales/inquiry/customer_inquiry.php:225
+#: sales/inquiry/customer_inquiry.php.orig:225
  msgid "#"
  msgstr ""
  
  msgid "#"
  msgstr ""
  
@@ -151,20 +153,22 @@ 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:470
-#: purchasing/includes/ui/invoice_ui.inc:482
+#: purchasing/includes/ui/invoice_ui.inc:471
+#: purchasing/includes/ui/invoice_ui.inc:483
  #: purchasing/po_receive_items.php:62 reporting/rep104.php:109
  #: reporting/rep105.php:112 reporting/rep204.php:82 reporting/rep303.php:109
  #: purchasing/po_receive_items.php:62 reporting/rep104.php:109
  #: reporting/rep105.php:112 reporting/rep204.php:82 reporting/rep303.php:109
-#: reporting/rep303.php:115 reporting/rep304.php:114 reporting/rep305.php:95
+#: reporting/rep303.php:115 reporting/rep304.php:112 reporting/rep305.php:95
  #: reporting/rep401.php:69 sales/create_recurrent_invoices.php:115
  #: sales/manage/credit_status.php:97 sales/manage/recurrent_invoices.php:102
  #: reporting/rep401.php:69 sales/create_recurrent_invoices.php:115
  #: sales/manage/credit_status.php:97 sales/manage/recurrent_invoices.php:102
-#: sales/inquiry/sales_orders_view.php:286
-#: sales/inquiry/sales_orders_view.php:290 taxes/tax_groups.php:124
+#: sales/inquiry/sales_orders_view.php:293
+#: sales/inquiry/sales_orders_view.php:297
+#: sales/inquiry/sales_orders_view.php.orig:293
+#: sales/inquiry/sales_orders_view.php.orig:297 taxes/tax_groups.php:124
  #: taxes/tax_types.php:115
  msgid "Description"
  msgstr ""
  
  #: taxes/tax_types.php:115
  msgid "Description"
  msgstr ""
  
-#: admin/attachments.php:167 admin/backups.php:60 admin/backups.php:142
+#: admin/attachments.php:167 admin/backups.php:63 admin/backups.php:149
  msgid "Filename"
  msgstr ""
  
  msgid "Filename"
  msgstr ""
  
@@ -185,14 +189,14 @@ msgstr ""
  #: admin/inst_lang.php:100 admin/payment_terms.php:142 admin/printers.php:96
  #: admin/shipping_companies.php:106 admin/tags.php:140 admin/users.php:144
  #: dimensions/inquiry/search_dimensions.php:120
  #: admin/inst_lang.php:100 admin/payment_terms.php:142 admin/printers.php:96
  #: admin/shipping_companies.php:106 admin/tags.php:140 admin/users.php:144
  #: dimensions/inquiry/search_dimensions.php:120
-#: gl/inquiry/journal_inquiry.php:111 gl/manage/bank_accounts.php:126
-#: gl/manage/currencies.php:166 gl/manage/exchange_rates.php:94
-#: gl/manage/gl_account_classes.php:132 gl/manage/gl_account_types.php:155
-#: gl/manage/gl_quick_entries.php:196 gl/manage/gl_quick_entries.php:295
-#: gl/includes/ui/gl_bank_ui.inc:166 gl/includes/ui/gl_bank_ui.inc.orig:166
-#: gl/includes/ui/gl_journal_ui.inc:122 includes/ui/contacts_view.inc:64
-#: includes/ui/simple_crud_class.inc:52 inventory/prices.php:145
-#: inventory/purchasing_data.php:146
+#: gl/inquiry/journal_inquiry.php:111 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:166
+#: gl/includes/ui/gl_bank_ui.inc.orig:166 gl/includes/ui/gl_journal_ui.inc:122
+#: includes/ui/contacts_view.inc:64 includes/ui/simple_crud_class.inc:52
+#: inventory/prices.php:145 inventory/purchasing_data.php:146
  #: 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
@@ -202,17 +206,19 @@ 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:519
+#: purchasing/includes/ui/invoice_ui.inc:520
  #: purchasing/includes/ui/po_ui.inc:266
  #: purchasing/includes/ui/po_ui.inc:266
-#: purchasing/inquiry/po_search_completed.php:101
+#: purchasing/inquiry/po_search_completed.php:106
  #: purchasing/inquiry/po_search.php:87 sales/manage/credit_status.php:119
  #: sales/manage/customer_branches.php:159
  #: sales/manage/recurrent_invoices.php:130 sales/manage/sales_areas.php:103
  #: sales/manage/sales_groups.php:99 sales/manage/sales_people.php:119
  #: sales/manage/sales_points.php:99 sales/manage/sales_types.php:121
  #: purchasing/inquiry/po_search.php:87 sales/manage/credit_status.php:119
  #: sales/manage/customer_branches.php:159
  #: sales/manage/recurrent_invoices.php:130 sales/manage/sales_areas.php:103
  #: sales/manage/sales_groups.php:99 sales/manage/sales_people.php:119
  #: sales/manage/sales_points.php:99 sales/manage/sales_types.php:121
-#: sales/inquiry/customer_inquiry.php:186
+#: sales/inquiry/customer_inquiry.php:198
+#: sales/inquiry/customer_inquiry.php.orig:198
  #: sales/inquiry/sales_deliveries_view.php:154
  #: sales/inquiry/sales_deliveries_view.php:154
-#: sales/inquiry/sales_orders_view.php:123
+#: sales/inquiry/sales_orders_view.php:126
+#: sales/inquiry/sales_orders_view.php.orig:126
  #: sales/includes/ui/sales_credit_ui.inc:197
  #: sales/includes/ui/sales_order_ui.inc:202 taxes/item_tax_types.php:139
  #: taxes/tax_groups.php:142 taxes/tax_types.php:132
  #: sales/includes/ui/sales_credit_ui.inc:197
  #: sales/includes/ui/sales_order_ui.inc:202 taxes/item_tax_types.php:139
  #: taxes/tax_groups.php:142 taxes/tax_types.php:132
@@ -232,14 +238,15 @@ msgstr ""
  #: admin/inst_chart.php:80 admin/inst_lang.php:109 admin/inst_module.php:144
  #: admin/inst_theme.php:102 admin/payment_terms.php:143 admin/printers.php:97
  #: admin/shipping_companies.php:107 admin/tags.php:141 admin/users.php:146
  #: admin/inst_chart.php:80 admin/inst_lang.php:109 admin/inst_module.php:144
  #: admin/inst_theme.php:102 admin/payment_terms.php:143 admin/printers.php:97
  #: admin/shipping_companies.php:107 admin/tags.php:141 admin/users.php:146
-#: gl/gl_budget.php:137 gl/manage/bank_accounts.php:127
-#: gl/manage/currencies.php:168 gl/manage/exchange_rates.php:99
-#: gl/manage/gl_account_classes.php:133 gl/manage/gl_account_types.php:156
-#: gl/manage/gl_quick_entries.php:197 gl/manage/gl_quick_entries.php:296
-#: gl/includes/ui/gl_bank_ui.inc:168 gl/includes/ui/gl_bank_ui.inc.orig:168
-#: gl/includes/ui/gl_journal_ui.inc:124 includes/ui/contacts_view.inc:67
-#: includes/ui/simple_crud_class.inc:54 includes/ui/ui_input.inc:281
-#: inventory/prices.php:146 inventory/purchasing_data.php:147
+#: gl/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:168
+#: gl/includes/ui/gl_bank_ui.inc.orig:168 gl/includes/ui/gl_journal_ui.inc:124
+#: includes/ui/contacts_view.inc:67 includes/ui/simple_crud_class.inc:54
+#: includes/ui/ui_input.inc:281 inventory/prices.php:146
+#: inventory/purchasing_data.php:147
  #: 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
@@ -268,123 +275,125 @@ msgstr ""
  msgid "Attached File"
  msgstr ""
  
  msgid "Attached File"
  msgstr ""
  
-#: admin/backups.php:21 admin/backups.php:111
+#: admin/backups.php:21 admin/backups.php:40 admin/backups.php:114
+#: admin/backups.php:142 admin/backups.php:155 admin/backups.php:173
  msgid "Select backup file first."
  msgstr ""
  
  msgid "Select backup file first."
  msgstr ""
  
-#: admin/backups.php:40
+#: admin/backups.php:43
  msgid "Backup and Restore Database"
  msgstr ""
  
  msgid "Backup and Restore Database"
  msgstr ""
  
-#: admin/backups.php:47
+#: admin/backups.php:50
  msgid "Backup paths have not been set correctly."
  msgstr ""
  
  msgid "Backup paths have not been set correctly."
  msgstr ""
  
-#: admin/backups.php:48
+#: admin/backups.php:51
  msgid "Please contact System Administrator."
  msgstr ""
  
  msgid "Please contact System Administrator."
  msgstr ""
  
-#: admin/backups.php:49
+#: admin/backups.php:52
  msgid "cannot find backup directory"
  msgstr ""
  
  msgid "cannot find backup directory"
  msgstr ""
  
-#: admin/backups.php:59
+#: admin/backups.php:62
  msgid "Backup successfully generated."
  msgstr ""
  
  msgid "Backup successfully generated."
  msgstr ""
  
-#: admin/backups.php:62
+#: admin/backups.php:65
  msgid "Database backup failed."
  msgstr ""
  
  msgid "Database backup failed."
  msgstr ""
  
-#: admin/backups.php:95 admin/create_coy.php:261 admin/fiscalyears.php:155
+#: admin/backups.php:98 admin/create_coy.php:261 admin/fiscalyears.php:155
  #: admin/inst_lang.php:85 admin/inst_lang.php:97
  #: dimensions/inquiry/search_dimensions.php:107
  #: admin/inst_lang.php:85 admin/inst_lang.php:97
  #: dimensions/inquiry/search_dimensions.php:107
-#: gl/manage/bank_accounts.php:123 gl/manage/currencies.php:164
-#: 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:1638
-#: purchasing/manage/suppliers.php:123 reporting/rep101.php:126
-#: reporting/rep102.php:114 reporting/rep102.php:116 reporting/rep104.php:103
-#: reporting/rep106.php:73 reporting/rep114.php:73 reporting/rep201.php:114
-#: reporting/rep202.php:116 reporting/rep202.php:118 reporting/rep203.php:87
-#: reporting/rep303.php:101 reporting/rep303.php:105 reporting/rep501.php:109
-#: sales/manage/sales_points.php:94 sales/manage/sales_points.php:95
-#: sales/manage/sales_types.php:119 taxes/item_tax_types.php:129
-#: taxes/tax_groups.php:139
+#: 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:1638
+#: includes/ui/ui_lists.inc.orig:1649 purchasing/manage/suppliers.php:117
+#: reporting/rep101.php:126 reporting/rep102.php:112 reporting/rep102.php:114
+#: reporting/rep104.php:103 reporting/rep106.php:73 reporting/rep114.php:73
+#: reporting/rep201.php:114 reporting/rep202.php:116 reporting/rep202.php:118
+#: reporting/rep203.php:87 reporting/rep303.php:101 reporting/rep303.php:105
+#: reporting/rep501.php:109 sales/manage/sales_points.php:94
+#: sales/manage/sales_points.php:95 sales/manage/sales_types.php:119
+#: taxes/item_tax_types.php:129 taxes/tax_groups.php:139
  msgid "No"
  msgstr ""
  
  msgid "No"
  msgstr ""
  
-#: admin/backups.php:135
+#: admin/backups.php:139
  msgid "Restore backup completed."
  msgstr ""
  
  msgid "Restore backup completed."
  msgstr ""
  
-#: admin/backups.php:141
+#: admin/backups.php:148
  msgid "File successfully deleted."
  msgstr ""
  
  msgid "File successfully deleted."
  msgstr ""
  
-#: admin/backups.php:146
+#: admin/backups.php:153
  msgid "Can't delete backup file."
  msgstr ""
  
  msgid "Can't delete backup file."
  msgstr ""
  
-#: admin/backups.php:155
+#: admin/backups.php:165
  msgid "You can only upload *.sql backup files"
  msgstr ""
  
  msgid "You can only upload *.sql backup files"
  msgstr ""
  
-#: admin/backups.php:161
+#: admin/backups.php:171
  msgid "File was not uploaded into the system."
  msgstr ""
  
  msgid "File was not uploaded into the system."
  msgstr ""
  
-#: admin/backups.php:167
+#: admin/backups.php:180
  msgid "Create backup"
  msgstr ""
  
  msgid "Create backup"
  msgstr ""
  
-#: admin/backups.php:168 sales/includes/ui/sales_order_ui.inc:589
+#: admin/backups.php:181 sales/includes/ui/sales_order_ui.inc:589
  #: sales/includes/ui/sales_order_ui.inc:636
  msgid "Comments:"
  msgstr ""
  
  #: sales/includes/ui/sales_order_ui.inc:636
  msgid "Comments:"
  msgstr ""
  
-#: admin/backups.php:169
+#: admin/backups.php:182
  msgid "Compression:"
  msgstr ""
  
  msgid "Compression:"
  msgstr ""
  
-#: admin/backups.php:171
+#: admin/backups.php:184
  msgid "Create Backup"
  msgstr ""
  
  msgid "Create Backup"
  msgstr ""
  
-#: admin/backups.php:173
+#: admin/backups.php:186
  msgid "Backup scripts maintenance"
  msgstr ""
  
  msgid "Backup scripts maintenance"
  msgstr ""
  
-#: admin/backups.php:179
+#: admin/backups.php:192
  msgid "View Backup"
  msgstr ""
  
  msgid "View Backup"
  msgstr ""
  
-#: admin/backups.php:180
+#: admin/backups.php:193
  msgid "Download Backup"
  msgstr ""
  
  msgid "Download Backup"
  msgstr ""
  
-#: admin/backups.php:181
+#: admin/backups.php:194
  msgid "Restore Backup"
  msgstr ""
  
  msgid "Restore Backup"
  msgstr ""
  
-#: admin/backups.php:182
+#: admin/backups.php:195
  msgid ""
  "You are about to restore database from backup file.\n"
  "Do you want to continue?"
  msgstr ""
  
  msgid ""
  "You are about to restore database from backup file.\n"
  "Do you want to continue?"
  msgstr ""
  
-#: admin/backups.php:184
+#: admin/backups.php:197
  msgid "Delete Backup"
  msgstr ""
  
  msgid "Delete Backup"
  msgstr ""
  
-#: admin/backups.php:186
+#: admin/backups.php:199
  #, php-format
  msgid ""
  "You are about to remove selected backup file.\n"
  "Do you want to continue ?"
  msgstr ""
  
  #, php-format
  msgid ""
  "You are about to remove selected backup file.\n"
  "Do you want to continue ?"
  msgstr ""
  
-#: admin/backups.php:192
+#: admin/backups.php:205
  msgid "Upload file"
  msgstr ""
  
  msgid "Upload file"
  msgstr ""
  
@@ -443,17 +452,17 @@ msgid ""
  "expected"
  msgstr ""
  
  "expected"
  msgstr ""
  
-#: admin/company_preferences.php:59 inventory/manage/items.php:74
+#: admin/company_preferences.php:59 inventory/manage/items.php:83
  msgid ""
  "The file size is over the maximum allowed. The maximum size allowed in KB is"
  msgstr ""
  
  msgid ""
  "The file size is over the maximum allowed. The maximum size allowed in KB is"
  msgstr ""
  
-#: admin/company_preferences.php:64 inventory/manage/items.php:79
+#: admin/company_preferences.php:64 inventory/manage/items.php:73
  msgid "Only graphics files can be uploaded"
  msgstr ""
  
  #: admin/company_preferences.php:72 admin/company_preferences.php:93
  msgid "Only graphics files can be uploaded"
  msgstr ""
  
  #: admin/company_preferences.php:72 admin/company_preferences.php:93
-#: inventory/manage/items.php:87
+#: inventory/manage/items.php:91
  msgid "The existing image could not be removed"
  msgstr ""
  
  msgid "The existing image could not be removed"
  msgstr ""
  
@@ -461,154 +470,157 @@ msgstr ""
  msgid "Error uploading logo file"
  msgstr ""
  
  msgid "Error uploading logo file"
  msgstr ""
  
-#: admin/company_preferences.php:116
+#: admin/company_preferences.php:115
  msgid "Company setup has been updated."
  msgstr ""
  
  msgid "Company setup has been updated."
  msgstr ""
  
-#: admin/company_preferences.php:160
+#: admin/company_preferences.php:159
  msgid "Name (to appear on reports):"
  msgstr ""
  
  msgid "Name (to appear on reports):"
  msgstr ""
  
-#: admin/company_preferences.php:161 admin/shipping_companies.php:142
+#: admin/company_preferences.php:160 admin/shipping_companies.php:142
  #: includes/ui/contacts_view.inc:109 inventory/manage/locations.php:202
  #: includes/ui/contacts_view.inc:109 inventory/manage/locations.php:202
-#: sales/manage/customers.php:203 sales/includes/ui/sales_order_ui.inc:627
+#: sales/manage/customers.php:227 sales/manage/customers.php.orig:228
+#: sales/includes/ui/sales_order_ui.inc:627
  msgid "Address:"
  msgstr ""
  
  msgid "Address:"
  msgstr ""
  
-#: admin/company_preferences.php:162
+#: admin/company_preferences.php:161
  msgid "Domicile:"
  msgstr ""
  
  msgid "Domicile:"
  msgstr ""
  
-#: admin/company_preferences.php:164 admin/shipping_companies.php:138
-#: purchasing/manage/suppliers.php:105 sales/manage/customer_branches.php:260
+#: admin/company_preferences.php:163 admin/shipping_companies.php:138
+#: purchasing/manage/suppliers.php:126 sales/manage/customer_branches.php:260
  msgid "Phone Number:"
  msgstr ""
  
  msgid "Phone Number:"
  msgstr ""
  
-#: admin/company_preferences.php:165 includes/ui/contacts_view.inc:104
-#: purchasing/manage/suppliers.php:107 sales/manage/customer_branches.php:262
+#: admin/company_preferences.php:164 includes/ui/contacts_view.inc:104
+#: purchasing/manage/suppliers.php:156 sales/manage/customer_branches.php:262
+#: sales/manage/customers.php:250 sales/manage/customers.php.orig:251
  msgid "Fax Number:"
  msgstr ""
  
  msgid "Fax Number:"
  msgstr ""
  
-#: admin/company_preferences.php:166 admin/users.php:202
+#: admin/company_preferences.php:165 admin/users.php:202
  msgid "Email Address:"
  msgstr ""
  
  msgid "Email Address:"
  msgstr ""
  
-#: admin/company_preferences.php:168
+#: admin/company_preferences.php:167
  msgid "Official Company Number:"
  msgstr ""
  
  msgid "Official Company Number:"
  msgstr ""
  
-#: admin/company_preferences.php:169 purchasing/manage/suppliers.php:88
-#: sales/manage/customers.php:205
+#: admin/company_preferences.php:168 purchasing/manage/suppliers.php:91
+#: sales/manage/customers.php:229 sales/manage/customers.php.orig:230
  msgid "GSTNo:"
  msgstr ""
  
  msgid "GSTNo:"
  msgstr ""
  
-#: admin/company_preferences.php:171
+#: admin/company_preferences.php:170
  msgid "Home Currency:"
  msgstr ""
  
  msgid "Home Currency:"
  msgstr ""
  
-#: admin/company_preferences.php:172 gl/gl_budget.php:63
+#: admin/company_preferences.php:171 gl/gl_budget.php:63
  msgid "Fiscal Year:"
  msgstr ""
  
  msgid "Fiscal Year:"
  msgstr ""
  
-#: admin/company_preferences.php:173
+#: admin/company_preferences.php:172
  msgid "Tax Periods:"
  msgstr ""
  
  msgid "Tax Periods:"
  msgstr ""
  
-#: admin/company_preferences.php:173
+#: admin/company_preferences.php:172
  msgid "Months."
  msgstr ""
  
  msgid "Months."
  msgstr ""
  
-#: admin/company_preferences.php:174
+#: admin/company_preferences.php:173
  msgid "Tax Last Period:"
  msgstr ""
  
  msgid "Tax Last Period:"
  msgstr ""
  
-#: admin/company_preferences.php:174
+#: admin/company_preferences.php:173
  msgid "Months back."
  msgstr ""
  
  msgid "Months back."
  msgstr ""
  
-#: admin/company_preferences.php:178
+#: admin/company_preferences.php:177
  msgid "Company Logo:"
  msgstr ""
  
  msgid "Company Logo:"
  msgstr ""
  
-#: admin/company_preferences.php:179
+#: admin/company_preferences.php:178
  msgid "New Company Logo (.jpg)"
  msgstr ""
  
  msgid "New Company Logo (.jpg)"
  msgstr ""
  
-#: admin/company_preferences.php:180
+#: admin/company_preferences.php:179
  msgid "Delete Company Logo:"
  msgstr ""
  
  msgid "Delete Company Logo:"
  msgstr ""
  
-#: admin/company_preferences.php:182
+#: admin/company_preferences.php:181
  msgid "Use Dimensions:"
  msgstr ""
  
  msgid "Use Dimensions:"
  msgstr ""
  
-#: admin/company_preferences.php:183
+#: admin/company_preferences.php:182
  msgid "Base for auto price calculations:"
  msgstr ""
  
  msgid "Base for auto price calculations:"
  msgstr ""
  
-#: admin/company_preferences.php:184
+#: admin/company_preferences.php:183
  msgid "No base price list"
  msgstr ""
  
  msgid "No base price list"
  msgstr ""
  
-#: admin/company_preferences.php:185
+#: admin/company_preferences.php:184
  msgid "Add Price from Std Cost:"
  msgstr ""
  
  msgid "Add Price from Std Cost:"
  msgstr ""
  
-#: admin/company_preferences.php:187
+#: admin/company_preferences.php:186
  msgid "Round to nearest:"
  msgstr ""
  
  msgid "Round to nearest:"
  msgstr ""
  
-#: admin/company_preferences.php:190
+#: admin/company_preferences.php:189
  msgid "Search Item List"
  msgstr ""
  
  msgid "Search Item List"
  msgstr ""
  
-#: admin/company_preferences.php:191
+#: admin/company_preferences.php:190
  msgid "Search Customer List"
  msgstr ""
  
  msgid "Search Customer List"
  msgstr ""
  
-#: admin/company_preferences.php:192
+#: admin/company_preferences.php:191
  msgid "Search Supplier List"
  msgstr ""
  
  msgid "Search Supplier List"
  msgstr ""
  
-#: admin/company_preferences.php:194
+#: admin/company_preferences.php:193
  msgid "Automatic Revaluation Currency Accounts"
  msgstr ""
  
  msgid "Automatic Revaluation Currency Accounts"
  msgstr ""
  
-#: admin/company_preferences.php:195
+#: admin/company_preferences.php:194
  msgid "Time Zone on Reports"
  msgstr ""
  
  msgid "Time Zone on Reports"
  msgstr ""
  
-#: admin/company_preferences.php:196
+#: admin/company_preferences.php:195
  msgid "Login Timeout:"
  msgstr ""
  
  msgid "Login Timeout:"
  msgstr ""
  
-#: admin/company_preferences.php:196
+#: admin/company_preferences.php:195
  msgid "seconds"
  msgstr ""
  
  msgid "seconds"
  msgstr ""
  
-#: admin/company_preferences.php:197
+#: admin/company_preferences.php:196
  msgid "Version Id"
  msgstr ""
  
  msgid "Version Id"
  msgstr ""
  
-#: admin/company_preferences.php:202 admin/display_prefs.php:142
+#: admin/company_preferences.php:201 admin/display_prefs.php:142
  #: admin/forms_setup.php:61 admin/gl_setup.php:221 admin/inst_chart.php:74
  #: admin/inst_lang.php:103 admin/inst_module.php:138 admin/inst_module.php:156
  #: admin/inst_module.php:199 admin/inst_theme.php:96
  #: admin/forms_setup.php:61 admin/gl_setup.php:221 admin/inst_chart.php:74
  #: admin/inst_lang.php:103 admin/inst_module.php:138 admin/inst_module.php:156
  #: admin/inst_module.php:199 admin/inst_theme.php:96
-#: dimensions/dimension_entry.php:293 gl/gl_bank.php:400 gl/gl_budget.php:135
+#: dimensions/dimension_entry.php:293 gl/gl_bank.php:401 gl/gl_budget.php:135
  #: gl/manage/gl_quick_entries.php:60 gl/includes/ui/gl_bank_ui.inc:257
  #: gl/includes/ui/gl_bank_ui.inc.orig:257 gl/includes/ui/gl_journal_ui.inc:221
  #: includes/ui/db_pager_view.inc:174 includes/ui/simple_crud_class.inc:56
  #: includes/ui/simple_crud_class.inc:227 includes/ui/ui_input.inc:203
  #: includes/ui/ui_input.inc:894 inventory/adjustments.php:235
  #: gl/manage/gl_quick_entries.php:60 gl/includes/ui/gl_bank_ui.inc:257
  #: gl/includes/ui/gl_bank_ui.inc.orig:257 gl/includes/ui/gl_journal_ui.inc:221
  #: includes/ui/db_pager_view.inc:174 includes/ui/simple_crud_class.inc:56
  #: includes/ui/simple_crud_class.inc:227 includes/ui/ui_input.inc:203
  #: includes/ui/ui_input.inc:894 inventory/adjustments.php:235
-#: inventory/cost_update.php:119 inventory/reorder_level.php:97
+#: inventory/cost_update.php:116 inventory/reorder_level.php:97
  #: inventory/transfers.php:236 inventory/includes/item_adjustments_ui.inc:157
  #: inventory/includes/stock_transfers_ui.inc:137
  #: inventory/manage/sales_kits.php:208 manufacturing/work_order_entry.php:459
  #: manufacturing/includes/work_order_issue_ui.inc:131
  #: purchasing/includes/ui/po_ui.inc:299 purchasing/includes/ui/po_ui.inc:442
  #: purchasing/po_receive_items.php:333 sales/credit_note_entry.php:282
  #: inventory/transfers.php:236 inventory/includes/item_adjustments_ui.inc:157
  #: inventory/includes/stock_transfers_ui.inc:137
  #: inventory/manage/sales_kits.php:208 manufacturing/work_order_entry.php:459
  #: manufacturing/includes/work_order_issue_ui.inc:131
  #: purchasing/includes/ui/po_ui.inc:299 purchasing/includes/ui/po_ui.inc:442
  #: purchasing/po_receive_items.php:333 sales/credit_note_entry.php:282
-#: sales/customer_credit_invoice.php:382 sales/customer_delivery.php:520
-#: sales/customer_invoice.php:561 sales/inquiry/sales_orders_view.php:314
+#: sales/customer_credit_invoice.php:382 sales/customer_delivery.php:523
+#: sales/customer_invoice.php:580 sales/inquiry/sales_orders_view.php:321
+#: sales/inquiry/sales_orders_view.php.orig:321
  #: sales/includes/ui/sales_credit_ui.inc:293
  #: sales/includes/ui/sales_order_ui.inc:237
  #: sales/includes/ui/sales_order_ui.inc:555
  #: sales/includes/ui/sales_credit_ui.inc:293
  #: sales/includes/ui/sales_order_ui.inc:237
  #: sales/includes/ui/sales_order_ui.inc:555
@@ -728,18 +740,19 @@ msgstr ""
  
  #: admin/create_coy.php:259 admin/fiscalyears.php:159 admin/inst_lang.php:85
  #: admin/inst_lang.php:97 dimensions/inquiry/search_dimensions.php:107
  
  #: admin/create_coy.php:259 admin/fiscalyears.php:159 admin/inst_lang.php:85
  #: admin/inst_lang.php:97 dimensions/inquiry/search_dimensions.php:107
-#: gl/manage/bank_accounts.php:121 gl/manage/currencies.php:164
-#: 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:1639
-#: purchasing/manage/suppliers.php:123 reporting/rep101.php:125
-#: reporting/rep102.php:113 reporting/rep102.php:115 reporting/rep104.php:105
-#: reporting/rep106.php:75 reporting/rep114.php:75 reporting/rep201.php:113
-#: reporting/rep202.php:115 reporting/rep202.php:117 reporting/rep203.php:86
-#: reporting/rep303.php:96 reporting/rep303.php:104 reporting/rep501.php:107
-#: sales/manage/sales_points.php:94 sales/manage/sales_points.php:95
-#: sales/manage/sales_types.php:119 taxes/item_tax_types.php:133
-#: taxes/tax_groups.php:137
+#: 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:1639
+#: includes/ui/ui_lists.inc.orig:1650 purchasing/manage/suppliers.php:117
+#: reporting/rep101.php:125 reporting/rep102.php:111 reporting/rep102.php:113
+#: reporting/rep104.php:105 reporting/rep106.php:75 reporting/rep114.php:75
+#: reporting/rep201.php:113 reporting/rep202.php:115 reporting/rep202.php:117
+#: reporting/rep203.php:86 reporting/rep303.php:96 reporting/rep303.php:104
+#: reporting/rep501.php:107 sales/manage/sales_points.php:94
+#: sales/manage/sales_points.php:95 sales/manage/sales_types.php:119
+#: taxes/item_tax_types.php:133 taxes/tax_groups.php:137
  msgid "Yes"
  msgstr ""
  
  msgid "Yes"
  msgstr ""
  
@@ -758,7 +771,7 @@ msgstr ""
  #: admin/create_coy.php:339 admin/inst_chart.php:68 admin/inst_chart.php:70
  #: admin/inst_lang.php:87 admin/inst_lang.php:90 admin/inst_module.php:127
  #: admin/inst_theme.php:91 admin/inst_theme.php:93 admin/inst_upgrade.php:149
  #: admin/create_coy.php:339 admin/inst_chart.php:68 admin/inst_chart.php:70
  #: admin/inst_lang.php:87 admin/inst_lang.php:90 admin/inst_module.php:127
  #: admin/inst_theme.php:91 admin/inst_theme.php:93 admin/inst_upgrade.php:149
-#: gl/manage/gl_account_types.php:191 includes/ui/allocation_cart.inc:286
+#: gl/manage/gl_account_types.php:190 includes/ui/allocation_cart.inc:286
  msgid "None"
  msgstr ""
  
  msgid "None"
  msgstr ""
  
@@ -1019,9 +1032,11 @@ 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/ui_lists.inc:648
-#: manufacturing/search_work_orders.php:108 reporting/rep501.php:85
-#: reporting/rep710.php:109 reporting/includes/excel_report.inc:234
+#: dimensions/inquiry/search_dimensions.php:139
+#: includes/ui/sav.ui_lists.inc:659 includes/ui/ui_lists.inc:648
+#: includes/ui/ui_lists.inc.orig:659 manufacturing/search_work_orders.php:108
+#: reporting/rep501.php:85 reporting/rep710.php:109
+#: reporting/includes/excel_report.inc:234
  #: reporting/includes/pdf_report.inc:266
  msgid "Closed"
  msgstr ""
  #: reporting/includes/pdf_report.inc:266
  msgid "Closed"
  msgstr ""
@@ -1148,7 +1163,7 @@ msgid "Receivable Account:"
  msgstr ""
  
  #: admin/gl_setup.php:162 admin/gl_setup.php:200
  msgstr ""
  
  #: admin/gl_setup.php:162 admin/gl_setup.php:200
-#: inventory/manage/item_categories.php:192 inventory/manage/items.php:364
+#: inventory/manage/item_categories.php:192 inventory/manage/items.php:352
  #: sales/manage/customer_branches.php:250
  msgid "Sales Account:"
  msgstr ""
  #: sales/manage/customer_branches.php:250
  msgid "Sales Account:"
  msgstr ""
@@ -1193,7 +1208,7 @@ msgstr ""
  msgid "Payable Account:"
  msgstr ""
  
  msgid "Payable Account:"
  msgstr ""
  
-#: admin/gl_setup.php:190 purchasing/manage/suppliers.php:129
+#: admin/gl_setup.php:190 purchasing/manage/suppliers.php:123
  msgid "Purchase Discount Account:"
  msgstr ""
  
  msgid "Purchase Discount Account:"
  msgstr ""
  
@@ -1222,23 +1237,23 @@ msgid "Items Defaults"
  msgstr ""
  
  #: admin/gl_setup.php:202 inventory/manage/item_categories.php:202
  msgstr ""
  
  #: admin/gl_setup.php:202 inventory/manage/item_categories.php:202
-#: inventory/manage/items.php:368
+#: inventory/manage/items.php:356
  msgid "Inventory Account:"
  msgstr ""
  
  #: admin/gl_setup.php:204 inventory/manage/item_categories.php:196
  msgid "Inventory Account:"
  msgstr ""
  
  #: admin/gl_setup.php:204 inventory/manage/item_categories.php:196
-#: inventory/manage/item_categories.php:204 inventory/manage/items.php:369
-#: inventory/manage/items.php:374
+#: inventory/manage/item_categories.php:204 inventory/manage/items.php:357
+#: inventory/manage/items.php:362
  msgid "C.O.G.S. Account:"
  msgstr ""
  
  #: admin/gl_setup.php:206 inventory/manage/item_categories.php:205
  msgid "C.O.G.S. Account:"
  msgstr ""
  
  #: admin/gl_setup.php:206 inventory/manage/item_categories.php:205
-#: inventory/manage/items.php:370
+#: inventory/manage/items.php:358
  msgid "Inventory Adjustments Account:"
  msgstr ""
  
  #: admin/gl_setup.php:208 inventory/manage/item_categories.php:209
  msgid "Inventory Adjustments Account:"
  msgstr ""
  
  #: admin/gl_setup.php:208 inventory/manage/item_categories.php:209
-#: inventory/manage/items.php:381
+#: inventory/manage/items.php:369
  msgid "Item Assembly Costs Account:"
  msgstr ""
  
  msgid "Item Assembly Costs Account:"
  msgstr ""
  
@@ -1268,7 +1283,7 @@ msgid "Installed"
  msgstr ""
  
  #: admin/inst_chart.php:50 admin/inst_lang.php:36 admin/inst_module.php:105
  msgstr ""
  
  #: admin/inst_chart.php:50 admin/inst_lang.php:36 admin/inst_module.php:105
-#: admin/inst_theme.php:74 inventory/inquiry/stock_status.php:70
+#: admin/inst_theme.php:74 inventory/inquiry/stock_status.php:77
  #: reporting/rep303.php:102
  msgid "Available"
  msgstr ""
  #: reporting/rep303.php:102
  msgid "Available"
  msgstr ""
@@ -1411,8 +1426,10 @@ msgstr ""
  msgid "Install third-party extension."
  msgstr ""
  
  msgid "Install third-party extension."
  msgstr ""
  
-#: admin/inst_module.php:169 includes/ui/ui_lists.inc:648
-#: includes/ui/ui_lists.inc:2120 reporting/includes/excel_report.inc:232
+#: admin/inst_module.php:169 includes/ui/sav.ui_lists.inc:659
+#: includes/ui/sav.ui_lists.inc:2131 includes/ui/ui_lists.inc:648
+#: includes/ui/ui_lists.inc:2120 includes/ui/ui_lists.inc.orig:659
+#: includes/ui/ui_lists.inc.orig:2131 reporting/includes/excel_report.inc:232
  #: reporting/includes/pdf_report.inc:264
  msgid "Active"
  msgstr ""
  #: reporting/includes/pdf_report.inc:264
  msgid "Active"
  msgstr ""
@@ -1506,7 +1523,7 @@ msgstr ""
  msgid "Save database and perform upgrade"
  msgstr ""
  
  msgid "Save database and perform upgrade"
  msgstr ""
  
-#: admin/payment_terms.php:16 reporting/includes/doctext.inc:58
+#: admin/payment_terms.php:16 reporting/includes/doctext.inc:242
  #: sales/view/view_invoice.php:74 sales/view/view_sales_order.php:78
  msgid "Payment Terms"
  msgstr ""
  #: sales/view/view_invoice.php:74 sales/view/view_sales_order.php:78
  msgid "Payment Terms"
  msgstr ""
@@ -1547,29 +1564,30 @@ msgstr ""
  #: dimensions/inquiry/search_dimensions.php:75
  #: dimensions/inquiry/search_dimensions.php:130
  #: dimensions/view/view_dimension.php:54 gl/bank_account_reconcile.php:233
  #: dimensions/inquiry/search_dimensions.php:75
  #: dimensions/inquiry/search_dimensions.php:130
  #: dimensions/view/view_dimension.php:54 gl/bank_account_reconcile.php:233
-#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:125
+#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126
  #: gl/inquiry/journal_inquiry.php:122 gl/inquiry/tax_inquiry.php:82
  #: gl/inquiry/journal_inquiry.php:122 gl/inquiry/tax_inquiry.php:82
-#: gl/manage/bank_accounts.php:102 gl/manage/gl_quick_entries.php:186
-#: gl/view/accrual_trans.php:52 gl/includes/ui/gl_bank_ui.inc:80
-#: gl/includes/ui/gl_bank_ui.inc.orig:80 includes/ui/ui_view.inc:488
-#: inventory/inquiry/stock_movements.php:76
+#: 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:80 gl/includes/ui/gl_bank_ui.inc.orig:80
+#: includes/ui/ui_view.inc:488 inventory/inquiry/stock_movements.php:81
  #: inventory/manage/item_categories.php:98
  #: manufacturing/search_work_orders.php:161
  #: manufacturing/includes/manufacturing_ui.inc:236
  #: manufacturing/includes/manufacturing_ui.inc:276
  #: manufacturing/includes/manufacturing_ui.inc:280
  #: manufacturing/includes/manufacturing_ui.inc:331
  #: inventory/manage/item_categories.php:98
  #: manufacturing/search_work_orders.php:161
  #: manufacturing/includes/manufacturing_ui.inc:236
  #: manufacturing/includes/manufacturing_ui.inc:276
  #: manufacturing/includes/manufacturing_ui.inc:280
  #: manufacturing/includes/manufacturing_ui.inc:331
-#: purchasing/inquiry/supplier_allocation_inquiry.php:125
-#: purchasing/inquiry/supplier_inquiry.php:162
-#: purchasing/inquiry/supplier_inquiry.php.orig:162 reporting/rep102.php:134
+#: purchasing/inquiry/supplier_allocation_inquiry.php:126
+#: purchasing/inquiry/supplier_inquiry.php:168
+#: purchasing/inquiry/supplier_inquiry.php.orig:162 reporting/rep102.php:132
  #: reporting/rep202.php:137 reporting/rep501.php:85 reporting/rep601.php:76
  #: reporting/rep202.php:137 reporting/rep501.php:85 reporting/rep601.php:76
-#: reporting/rep702.php:58 reporting/rep704.php:78 reporting/rep704.php:81
-#: reporting/rep704.php:84 reporting/rep709.php:105 reporting/rep710.php:76
-#: reporting/rep710.php:84 reporting/reports_main.php:251
-#: reporting/reports_main.php:398 reporting/includes/doctext.inc:44
-#: reporting/includes/doctext.inc:54
-#: sales/inquiry/customer_allocation_inquiry.php:141
-#: sales/inquiry/customer_inquiry.php:212
+#: reporting/rep702.php:58 reporting/rep704.php:79 reporting/rep704.php:82
+#: reporting/rep704.php:85 reporting/rep709.php:105 reporting/rep710.php:76
+#: reporting/rep710.php:84 reporting/reports_main.php:252
+#: reporting/reports_main.php:399 reporting/includes/doctext.inc:140
+#: reporting/includes/doctext.inc:181 reporting/includes/doctext.inc:200
+#: sales/inquiry/customer_allocation_inquiry.php:144
+#: sales/inquiry/customer_inquiry.php:224
+#: sales/inquiry/customer_inquiry.php.orig:224
  msgid "Type"
  msgstr ""
  
  msgid "Type"
  msgstr ""
  
@@ -1761,9 +1779,10 @@ msgstr ""
  msgid "Role:"
  msgstr ""
  
  msgid "Role:"
  msgstr ""
  
-#: admin/security_roles.php:180 gl/manage/gl_accounts.php:199
-#: inventory/manage/items.php:253 purchasing/manage/suppliers.php:281
-#: sales/manage/customers.php:282
+#: admin/security_roles.php:180 gl/manage/gl_accounts.php:198
+#: gl/manage/gl_accounts.php.orig:198 inventory/manage/items.php:431
+#: purchasing/manage/suppliers.php:286 sales/manage/customers.php:320
+#: sales/manage/customers.php.orig:321
  msgid "Show inactive:"
  msgstr ""
  
  msgid "Show inactive:"
  msgstr ""
  
@@ -1803,14 +1822,14 @@ msgstr ""
  msgid "Delete This Role"
  msgstr ""
  
  msgid "Delete This Role"
  msgstr ""
  
-#: admin/security_roles.php:249 admin/void_transaction.php:223
+#: admin/security_roles.php:249 admin/void_transaction.php:227
  #: gl/manage/gl_quick_entries.php:61 gl/includes/ui/gl_bank_ui.inc:259
  #: gl/includes/ui/gl_bank_ui.inc.orig:259 gl/includes/ui/gl_journal_ui.inc:223
  #: includes/ui/simple_crud_class.inc:58 includes/ui/simple_crud_class.inc:231
  #: includes/ui/ui_controls.inc:587 includes/ui/ui_input.inc:206
  #: inventory/includes/item_adjustments_ui.inc:159
  #: inventory/includes/stock_transfers_ui.inc:139
  #: gl/manage/gl_quick_entries.php:61 gl/includes/ui/gl_bank_ui.inc:259
  #: gl/includes/ui/gl_bank_ui.inc.orig:259 gl/includes/ui/gl_journal_ui.inc:223
  #: includes/ui/simple_crud_class.inc:58 includes/ui/simple_crud_class.inc:231
  #: includes/ui/ui_controls.inc:587 includes/ui/ui_input.inc:206
  #: inventory/includes/item_adjustments_ui.inc:159
  #: inventory/includes/stock_transfers_ui.inc:139
-#: inventory/manage/items.php:426
+#: inventory/manage/items.php:414
  #: manufacturing/includes/work_order_issue_ui.inc:133
  #: purchasing/includes/ui/po_ui.inc:444
  #: sales/includes/ui/sales_credit_ui.inc:295
  #: manufacturing/includes/work_order_issue_ui.inc:133
  #: purchasing/includes/ui/po_ui.inc:444
  #: sales/includes/ui/sales_credit_ui.inc:295
@@ -1818,14 +1837,14 @@ msgstr ""
  msgid "Cancel"
  msgstr ""
  
  msgid "Cancel"
  msgstr ""
  
-#: admin/security_roles.php:249 inventory/manage/items.php:426
+#: admin/security_roles.php:249 inventory/manage/items.php:414
  msgid "Cancel Edition"
  msgstr ""
  
  msgid "Cancel Edition"
  msgstr ""
  
-#: admin/shipping_companies.php:15 reporting/includes/doctext.inc:32
-#: sales/customer_credit_invoice.php:256 sales/customer_delivery.php:365
-#: sales/customer_invoice.php:409 sales/view/view_credit.php:74
-#: sales/view/view_dispatch.php:92 sales/view/view_invoice.php:91
+#: admin/shipping_companies.php:15 sales/customer_credit_invoice.php:256
+#: sales/customer_delivery.php:368 sales/customer_invoice.php:420
+#: sales/view/view_credit.php:74 sales/view/view_dispatch.php:92
+#: sales/view/view_invoice.php:91
  msgid "Shipping Company"
  msgstr ""
  
  msgid "Shipping Company"
  msgstr ""
  
@@ -1870,24 +1889,24 @@ msgid "Secondary Phone"
  msgstr ""
  
  #: admin/shipping_companies.php:91 inventory/manage/locations.php:146
  msgstr ""
  
  #: admin/shipping_companies.php:91 inventory/manage/locations.php:146
-#: reporting/includes/doctext.inc:77
  msgid "Address"
  msgstr ""
  
  msgid "Address"
  msgstr ""
  
-#: admin/shipping_companies.php:134 gl/manage/gl_account_types.php:189
+#: admin/shipping_companies.php:134 gl/manage/gl_account_types.php:188
  #: gl/includes/ui/gl_bank_ui.inc:55 gl/includes/ui/gl_bank_ui.inc.orig:55
  #: gl/includes/ui/gl_bank_ui.inc:55 gl/includes/ui/gl_bank_ui.inc.orig:55
-#: inventory/manage/items.php:309 manufacturing/manage/work_centres.php:137
+#: inventory/manage/items.php:297 manufacturing/manage/work_centres.php:137
  msgid "Name:"
  msgstr ""
  
  msgid "Name:"
  msgstr ""
  
-#: admin/shipping_companies.php:136 purchasing/manage/suppliers.php:104
+#: admin/shipping_companies.php:136 purchasing/manage/suppliers.php:155
  #: sales/manage/customer_branches.php:259
  msgid "Contact Person:"
  msgstr ""
  
  #: admin/shipping_companies.php:140 includes/ui/contacts_view.inc:103
  #: sales/manage/customer_branches.php:259
  msgid "Contact Person:"
  msgstr ""
  
  #: admin/shipping_companies.php:140 includes/ui/contacts_view.inc:103
-#: inventory/manage/locations.php:205 purchasing/manage/suppliers.php:106
-#: sales/manage/customer_branches.php:261
+#: inventory/manage/locations.php:205 purchasing/manage/suppliers.php:127
+#: sales/manage/customer_branches.php:261 sales/manage/customers.php:249
+#: sales/manage/customers.php.orig:250
  msgid "Secondary Phone Number:"
  msgstr ""
  
  msgid "Secondary Phone Number:"
  msgstr ""
  
@@ -1899,11 +1918,11 @@ msgstr ""
  msgid "Unspecified tag type"
  msgstr ""
  
  msgid "Unspecified tag type"
  msgstr ""
  
-#: admin/tags.php:40 reporting/reports_main.php:272
-#: reporting/reports_main.php:280 reporting/reports_main.php:291
-#: reporting/reports_main.php:319 reporting/reports_main.php:326
-#: reporting/reports_main.php:336 reporting/reports_main.php:361
-#: reporting/reports_main.php:367 reporting/reports_main.php:376
+#: admin/tags.php:40 reporting/reports_main.php:273
+#: reporting/reports_main.php:281 reporting/reports_main.php:292
+#: reporting/reports_main.php:320 reporting/reports_main.php:327
+#: reporting/reports_main.php:337 reporting/reports_main.php:362
+#: reporting/reports_main.php:368 reporting/reports_main.php:377
  msgid "Account Tags"
  msgstr ""
  
  msgid "Account Tags"
  msgstr ""
  
@@ -1978,7 +1997,7 @@ msgstr ""
  
  #: admin/users.php:114 includes/ui/contacts_view.inc:41
  #: inventory/manage/locations.php:146 reporting/rep106.php:86
  
  #: admin/users.php:114 includes/ui/contacts_view.inc:41
  #: inventory/manage/locations.php:146 reporting/rep106.php:86
-#: reporting/includes/header2.inc:86 sales/manage/sales_people.php:99
+#: reporting/includes/header2.inc:98 sales/manage/sales_people.php:99
  msgid "Phone"
  msgstr ""
  
  msgid "Phone"
  msgstr ""
  
@@ -2025,10 +2044,12 @@ msgstr ""
  
  #: admin/view_print_transaction.php:43 admin/view_print_transaction.php:45
  #: admin/view_print_transaction.php:129 includes/ui/ui_controls.inc:188
  
  #: admin/view_print_transaction.php:43 admin/view_print_transaction.php:45
  #: admin/view_print_transaction.php:129 includes/ui/ui_controls.inc:188
-#: purchasing/inquiry/po_search_completed.php:108
-#: purchasing/inquiry/po_search.php:93 sales/inquiry/customer_inquiry.php:197
+#: purchasing/inquiry/po_search_completed.php:113
+#: purchasing/inquiry/po_search.php:93 sales/inquiry/customer_inquiry.php:209
+#: sales/inquiry/customer_inquiry.php.orig:209
  #: sales/inquiry/sales_deliveries_view.php:160
  #: sales/inquiry/sales_deliveries_view.php:160
-#: sales/inquiry/sales_orders_view.php:116
+#: sales/inquiry/sales_orders_view.php:117
+#: sales/inquiry/sales_orders_view.php.orig:117
  msgid "Print"
  msgstr ""
  
  msgid "Print"
  msgstr ""
  
@@ -2036,27 +2057,29 @@ msgstr ""
  msgid "Only documents can be printed."
  msgstr ""
  
  msgid "Only documents can be printed."
  msgstr ""
  
-#: admin/view_print_transaction.php:79 admin/void_transaction.php:160
+#: admin/view_print_transaction.php:79 admin/void_transaction.php:164
  msgid "from #:"
  msgstr ""
  
  msgid "from #:"
  msgstr ""
  
-#: admin/view_print_transaction.php:81 admin/void_transaction.php:162
+#: admin/view_print_transaction.php:81 admin/void_transaction.php:166
  msgid "to #:"
  msgstr ""
  
  msgid "to #:"
  msgstr ""
  
-#: admin/view_print_transaction.php:83 admin/void_transaction.php:164
+#: admin/view_print_transaction.php:83 admin/void_transaction.php:168
  #: dimensions/inquiry/search_dimensions.php:88
  #: gl/inquiry/journal_inquiry.php:53 manufacturing/search_work_orders.php:78
  #: dimensions/inquiry/search_dimensions.php:88
  #: gl/inquiry/journal_inquiry.php:53 manufacturing/search_work_orders.php:78
-#: purchasing/includes/ui/invoice_ui.inc:452
-#: purchasing/inquiry/po_search_completed.php:74
+#: purchasing/includes/ui/invoice_ui.inc:453
+#: purchasing/inquiry/po_search_completed.php:77
  #: purchasing/inquiry/po_search.php:76
  #: purchasing/inquiry/supplier_allocation_inquiry.php:57
  #: purchasing/inquiry/po_search.php:76
  #: purchasing/inquiry/supplier_allocation_inquiry.php:57
-#: purchasing/inquiry/supplier_inquiry.php:54
+#: purchasing/inquiry/supplier_inquiry.php:58
  #: purchasing/inquiry/supplier_inquiry.php.orig:54
  #: sales/inquiry/customer_allocation_inquiry.php:51
  #: purchasing/inquiry/supplier_inquiry.php.orig:54
  #: sales/inquiry/customer_allocation_inquiry.php:51
-#: sales/inquiry/customer_inquiry.php:54
+#: sales/inquiry/customer_inquiry.php:58
+#: sales/inquiry/customer_inquiry.php.orig:58
  #: sales/inquiry/sales_deliveries_view.php:116
  #: sales/inquiry/sales_deliveries_view.php:116
-#: sales/inquiry/sales_orders_view.php:238
+#: sales/inquiry/sales_orders_view.php:245
+#: sales/inquiry/sales_orders_view.php.orig:245
  msgid "Search"
  msgstr ""
  
  msgid "Search"
  msgstr ""
  
@@ -2072,13 +2095,13 @@ msgid ""
  "zero."
  msgstr ""
  
  "zero."
  msgstr ""
  
-#: admin/view_print_transaction.php:127 admin/void_transaction.php:176
+#: admin/view_print_transaction.php:127 admin/void_transaction.php:180
  #: dimensions/inquiry/search_dimensions.php:128
  #: dimensions/view/view_dimension.php:54 gl/bank_account_reconcile.php:235
  #: gl/inquiry/bank_inquiry.php:70 gl/inquiry/journal_inquiry.php:124
  #: gl/view/bank_transfer_view.php:86 gl/view/gl_deposit_view.php:75
  #: gl/view/gl_payment_view.php:73 gl/view/gl_trans_view.php:35
  #: dimensions/inquiry/search_dimensions.php:128
  #: dimensions/view/view_dimension.php:54 gl/bank_account_reconcile.php:235
  #: gl/inquiry/bank_inquiry.php:70 gl/inquiry/journal_inquiry.php:124
  #: gl/view/bank_transfer_view.php:86 gl/view/gl_deposit_view.php:75
  #: gl/view/gl_payment_view.php:73 gl/view/gl_trans_view.php:35
-#: includes/ui/contacts_view.inc:41 inventory/inquiry/stock_movements.php:76
+#: includes/ui/contacts_view.inc:41 inventory/inquiry/stock_movements.php:81
  #: inventory/view/view_adjustment.php:44 inventory/view/view_transfer.php:44
  #: manufacturing/search_work_orders.php:160
  #: manufacturing/view/wo_issue_view.php:43
  #: inventory/view/view_adjustment.php:44 inventory/view/view_transfer.php:44
  #: manufacturing/search_work_orders.php:160
  #: manufacturing/view/wo_issue_view.php:43
@@ -2092,23 +2115,24 @@ msgstr ""
  #: purchasing/includes/ui/po_ui.inc:314 purchasing/view/view_po.php:115
  #: purchasing/view/view_supp_credit.php:43
  #: purchasing/view/view_supp_invoice.php:46
  #: purchasing/includes/ui/po_ui.inc:314 purchasing/view/view_po.php:115
  #: purchasing/view/view_supp_credit.php:43
  #: purchasing/view/view_supp_invoice.php:46
-#: purchasing/view/view_supp_payment.php:70
-#: purchasing/inquiry/po_search_completed.php:117
+#: purchasing/view/view_supp_payment.php:73
+#: purchasing/inquiry/po_search_completed.php:122
  #: purchasing/inquiry/po_search.php:131
  #: purchasing/inquiry/po_search.php:131
-#: purchasing/inquiry/supplier_allocation_inquiry.php:127
-#: purchasing/inquiry/supplier_inquiry.php:164
+#: purchasing/inquiry/supplier_allocation_inquiry.php:128
+#: purchasing/inquiry/supplier_inquiry.php:170
  #: purchasing/inquiry/supplier_inquiry.php.orig:164
  #: purchasing/allocations/supplier_allocation_main.php:96
  #: reporting/rep501.php:85 reporting/rep601.php:76 reporting/rep702.php:51
  #: purchasing/inquiry/supplier_inquiry.php.orig:164
  #: purchasing/allocations/supplier_allocation_main.php:96
  #: reporting/rep501.php:85 reporting/rep601.php:76 reporting/rep702.php:51
-#: reporting/includes/doctext.inc:47 sales/customer_credit_invoice.php:247
-#: sales/customer_credit_invoice.php:249 sales/customer_delivery.php:345
-#: sales/customer_delivery.php:347 sales/customer_invoice.php:388
-#: sales/customer_invoice.php:390
+#: reporting/includes/doctext.inc:199 sales/customer_credit_invoice.php:247
+#: sales/customer_credit_invoice.php:249 sales/customer_delivery.php:348
+#: sales/customer_delivery.php:350 sales/customer_invoice.php:392
+#: sales/customer_invoice.php:394
  #: sales/allocations/customer_allocation_main.php:95
  #: sales/view/view_dispatch.php:85 sales/view/view_invoice.php:84
  #: sales/view/view_receipt.php:50 sales/view/view_sales_order.php:81
  #: sales/allocations/customer_allocation_main.php:95
  #: sales/view/view_dispatch.php:85 sales/view/view_invoice.php:84
  #: sales/view/view_receipt.php:50 sales/view/view_sales_order.php:81
-#: sales/inquiry/customer_allocation_inquiry.php:143
-#: sales/inquiry/customer_inquiry.php:215
+#: sales/inquiry/customer_allocation_inquiry.php:146
+#: sales/inquiry/customer_inquiry.php:227
+#: sales/inquiry/customer_inquiry.php.orig:227
  #: sales/inquiry/sales_deliveries_view.php:184
  #: sales/includes/ui/sales_credit_ui.inc:85
  #: sales/includes/ui/sales_credit_ui.inc:87
  #: sales/inquiry/sales_deliveries_view.php:184
  #: sales/includes/ui/sales_credit_ui.inc:85
  #: sales/includes/ui/sales_credit_ui.inc:87
@@ -2116,16 +2140,16 @@ msgstr ""
  msgid "Reference"
  msgstr ""
  
  msgid "Reference"
  msgstr ""
  
-#: admin/view_print_transaction.php:128 admin/void_transaction.php:177
+#: admin/view_print_transaction.php:128 admin/void_transaction.php:181
  #: dimensions/inquiry/search_dimensions.php:131
  #: dimensions/view/view_dimension.php:54 gl/accruals.php:90
  #: gl/accruals.php:195 gl/bank_account_reconcile.php:236
  #: dimensions/inquiry/search_dimensions.php:131
  #: dimensions/view/view_dimension.php:54 gl/accruals.php:90
  #: gl/accruals.php:195 gl/bank_account_reconcile.php:236
-#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:125
+#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126
  #: gl/inquiry/journal_inquiry.php:121 gl/view/accrual_trans.php:52
  #: gl/view/bank_transfer_view.php:83 gl/view/gl_deposit_view.php:68
  #: gl/view/gl_payment_view.php:66 gl/view/gl_trans_view.php:36
  #: includes/ui/allocation_cart.inc:263 includes/ui/ui_view.inc:488
  #: gl/inquiry/journal_inquiry.php:121 gl/view/accrual_trans.php:52
  #: gl/view/bank_transfer_view.php:83 gl/view/gl_deposit_view.php:68
  #: gl/view/gl_payment_view.php:66 gl/view/gl_trans_view.php:36
  #: includes/ui/allocation_cart.inc:263 includes/ui/ui_view.inc:488
-#: inventory/inquiry/stock_movements.php:76
+#: inventory/inquiry/stock_movements.php:81
  #: inventory/view/view_adjustment.php:45 inventory/view/view_transfer.php:47
  #: manufacturing/search_work_orders.php:166
  #: manufacturing/work_order_entry.php:419
  #: inventory/view/view_adjustment.php:45 inventory/view/view_transfer.php:47
  #: manufacturing/search_work_orders.php:166
  #: manufacturing/work_order_entry.php:419
@@ -2139,25 +2163,26 @@ msgstr ""
  #: manufacturing/includes/manufacturing_ui.inc:332
  #: purchasing/includes/ui/invoice_ui.inc:103
  #: purchasing/includes/ui/po_ui.inc:328 purchasing/view/view_po.php:140
  #: manufacturing/includes/manufacturing_ui.inc:332
  #: purchasing/includes/ui/invoice_ui.inc:103
  #: purchasing/includes/ui/po_ui.inc:328 purchasing/view/view_po.php:140
-#: purchasing/inquiry/supplier_allocation_inquiry.php:130
-#: purchasing/inquiry/supplier_inquiry.php:167
+#: purchasing/inquiry/supplier_allocation_inquiry.php:131
+#: purchasing/inquiry/supplier_inquiry.php:173
  #: purchasing/inquiry/supplier_inquiry.php.orig:167
  #: purchasing/allocations/supplier_allocation_main.php:97
  #: reporting/rep101.php:130 reporting/rep201.php:118 reporting/rep501.php:85
  #: purchasing/inquiry/supplier_inquiry.php.orig:167
  #: purchasing/allocations/supplier_allocation_main.php:97
  #: reporting/rep101.php:130 reporting/rep201.php:118 reporting/rep501.php:85
-#: reporting/rep601.php:76 reporting/rep704.php:78 reporting/rep704.php:81
-#: reporting/rep704.php:84 reporting/rep709.php:109 reporting/rep710.php:75
-#: reporting/includes/doctext.inc:15 reporting/includes/doctext.inc:110
-#: reporting/includes/doctext.inc:118 sales/customer_delivery.php:375
-#: sales/customer_invoice.php:419
+#: reporting/rep601.php:76 reporting/rep704.php:79 reporting/rep704.php:82
+#: reporting/rep704.php:85 reporting/rep709.php:109 reporting/rep710.php:75
+#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186
+#: reporting/includes/doctext.inc:224 reporting/includes/header2.inc:135
+#: sales/customer_delivery.php:378 sales/customer_invoice.php:430
  #: sales/allocations/customer_allocation_main.php:96
  #: sales/view/view_credit.php:69 sales/view/view_sales_order.php:96
  #: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161
  #: sales/allocations/customer_allocation_main.php:96
  #: sales/view/view_credit.php:69 sales/view/view_sales_order.php:96
  #: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161
-#: sales/inquiry/customer_allocation_inquiry.php:145
-#: sales/inquiry/customer_inquiry.php:216
+#: sales/inquiry/customer_allocation_inquiry.php:148
+#: sales/inquiry/customer_inquiry.php:228
+#: sales/inquiry/customer_inquiry.php.orig:228
  msgid "Date"
  msgstr ""
  
  msgid "Date"
  msgstr ""
  
-#: admin/view_print_transaction.php:130 admin/void_transaction.php:178
+#: admin/view_print_transaction.php:130 admin/void_transaction.php:182
  #: includes/ui/ui_view.inc:51
  msgid "GL"
  msgstr ""
  #: includes/ui/ui_view.inc:51
  msgid "GL"
  msgstr ""
@@ -2166,114 +2191,109 @@ msgstr ""
  msgid "Void a Transaction"
  msgstr ""
  
  msgid "Void a Transaction"
  msgstr ""
  
-#: admin/void_transaction.php:119 admin/void_transaction.php:179
-#: includes/ui/ui_input.inc:136 includes/ui/ui_input.inc:277
-#: includes/ui/ui_lists.inc:20
+#: admin/void_transaction.php:124 admin/void_transaction.php:183
+#: includes/ui/sav.ui_lists.inc:20 includes/ui/ui_input.inc:136
+#: includes/ui/ui_input.inc:277 includes/ui/ui_lists.inc:20
+#: includes/ui/ui_lists.inc.orig:20
  msgid "Select"
  msgstr ""
  
  msgid "Select"
  msgstr ""
  
-#: admin/void_transaction.php:198
+#: admin/void_transaction.php:202
  msgid "Transaction #:"
  msgstr ""
  
  msgid "Transaction #:"
  msgstr ""
  
-#: admin/void_transaction.php:200
+#: admin/void_transaction.php:204
  msgid "Voiding Date:"
  msgstr ""
  
  msgid "Voiding Date:"
  msgstr ""
  
-#: admin/void_transaction.php:202 dimensions/dimension_entry.php:283
+#: admin/void_transaction.php:206 dimensions/dimension_entry.php:283
  #: gl/bank_transfer.php:93 gl/inquiry/journal_inquiry.php:56
  #: gl/manage/revaluate_currencies.php:106 includes/ui/ui_view.inc:308
  #: manufacturing/work_order_add_finished.php:210
  #: manufacturing/work_order_entry.php:451
  #: manufacturing/work_order_release.php:100
  #: gl/bank_transfer.php:93 gl/inquiry/journal_inquiry.php:56
  #: gl/manage/revaluate_currencies.php:106 includes/ui/ui_view.inc:308
  #: manufacturing/work_order_add_finished.php:210
  #: manufacturing/work_order_entry.php:451
  #: manufacturing/work_order_release.php:100
-#: purchasing/includes/ui/invoice_ui.inc:161 purchasing/po_entry_items.php:511
-#: purchasing/supplier_payment.php:313
-#: purchasing/supplier_payment.php.orig:314 sales/customer_payments.php:292
-#: sales/customer_payments.php.orig:293
+#: purchasing/includes/ui/invoice_ui.inc:161 purchasing/po_entry_items.php:518
+#: purchasing/supplier_payment.php:313 sales/customer_payments.php:413
  msgid "Memo:"
  msgstr ""
  
  msgid "Memo:"
  msgstr ""
  
-#: admin/void_transaction.php:207 admin/void_transaction.php:216
+#: admin/void_transaction.php:211 admin/void_transaction.php:220
  msgid "Void Transaction"
  msgstr ""
  
  msgid "Void Transaction"
  msgstr ""
  
-#: admin/void_transaction.php:212 admin/void_transaction.php:291
+#: admin/void_transaction.php:216 admin/void_transaction.php:295
  msgid "The entered transaction does not exist or cannot be voided."
  msgstr ""
  
  msgid "The entered transaction does not exist or cannot be voided."
  msgstr ""
  
-#: admin/void_transaction.php:220
+#: admin/void_transaction.php:224
  msgid ""
  "Are you sure you want to void this transaction ? This action cannot be "
  "undone."
  msgstr ""
  
  msgid ""
  "Are you sure you want to void this transaction ? This action cannot be "
  "undone."
  msgstr ""
  
-#: admin/void_transaction.php:222 includes/ui/ui_controls.inc:586
+#: admin/void_transaction.php:226 includes/ui/ui_controls.inc:586
  msgid "Proceed"
  msgstr ""
  
  msgid "Proceed"
  msgstr ""
  
-#: admin/void_transaction.php:236
+#: admin/void_transaction.php:240
  msgid "The selected transaction was closed for edition and cannot be voided."
  msgstr ""
  
  msgid "The selected transaction was closed for edition and cannot be voided."
  msgstr ""
  
-#: admin/void_transaction.php:242 gl/accruals.php:32 gl/bank_transfer.php:110
+#: admin/void_transaction.php:246 gl/accruals.php:32 gl/bank_transfer.php:110
  #: gl/gl_journal.php:156 gl/manage/exchange_rates.php:33
  #: gl/manage/revaluate_currencies.php:53
  #: manufacturing/work_order_add_finished.php:98
  #: manufacturing/work_order_costs.php:83 purchasing/po_receive_items.php:174
  #: gl/gl_journal.php:156 gl/manage/exchange_rates.php:33
  #: gl/manage/revaluate_currencies.php:53
  #: manufacturing/work_order_add_finished.php:98
  #: manufacturing/work_order_costs.php:83 purchasing/po_receive_items.php:174
-#: purchasing/supplier_payment.php:178
-#: purchasing/supplier_payment.php.orig:175
-#: sales/customer_credit_invoice.php:91 sales/sales_order_entry.php:342
-#: sales/manage/recurrent_invoices.php:41
+#: purchasing/supplier_payment.php:179 sales/customer_credit_invoice.php:91
+#: sales/sales_order_entry.php:340 sales/manage/recurrent_invoices.php:41
  #: sales/manage/recurrent_invoices.php:46
  #: sales/manage/recurrent_invoices.php:51
  msgid "The entered date is invalid."
  msgstr ""
  
  #: sales/manage/recurrent_invoices.php:46
  #: sales/manage/recurrent_invoices.php:51
  msgid "The entered date is invalid."
  msgstr ""
  
-#: admin/void_transaction.php:248 gl/accruals.php:38 gl/bank_transfer.php:116
-#: gl/gl_bank.php:266 gl/gl_journal.php:162
+#: admin/void_transaction.php:252 gl/accruals.php:38 gl/bank_transfer.php:116
+#: gl/gl_bank.php:267 gl/gl_journal.php:162
  #: gl/manage/revaluate_currencies.php:59 inventory/adjustments.php:116
  #: inventory/transfers.php:111 manufacturing/work_order_add_finished.php:104
  #: manufacturing/work_order_costs.php:89
  #: manufacturing/work_order_entry.php:160
  #: manufacturing/work_order_issue.php:85 purchasing/supplier_credit.php:176
  #: gl/manage/revaluate_currencies.php:59 inventory/adjustments.php:116
  #: inventory/transfers.php:111 manufacturing/work_order_add_finished.php:104
  #: manufacturing/work_order_costs.php:89
  #: manufacturing/work_order_entry.php:160
  #: manufacturing/work_order_issue.php:85 purchasing/supplier_credit.php:176
-#: purchasing/supplier_invoice.php:174 purchasing/supplier_payment.php:184
-#: purchasing/supplier_payment.php.orig:181
+#: purchasing/supplier_invoice.php:174 purchasing/supplier_payment.php:185
  #: sales/create_recurrent_invoices.php:108 sales/credit_note_entry.php:161
  #: sales/create_recurrent_invoices.php:108 sales/credit_note_entry.php:161
-#: sales/customer_credit_invoice.php:95 sales/customer_payments.php:100
-#: sales/customer_payments.php.orig:100
+#: sales/customer_credit_invoice.php:95 sales/customer_payments.php:145
  msgid "The entered date is not in fiscal year."
  msgstr ""
  
  msgid "The entered date is not in fiscal year."
  msgstr ""
  
-#: admin/void_transaction.php:255
+#: admin/void_transaction.php:259
  msgid "The transaction number is expected to be numeric and greater than zero."
  msgstr ""
  
  msgid "The transaction number is expected to be numeric and greater than zero."
  msgstr ""
  
-#: admin/void_transaction.php:272
+#: admin/void_transaction.php:276
  msgid "The selected transaction has already been voided."
  msgstr ""
  
  msgid "The selected transaction has already been voided."
  msgstr ""
  
-#: admin/void_transaction.php:285
+#: admin/void_transaction.php:289
  msgid "Selected transaction has been voided."
  msgstr ""
  
  msgid "Selected transaction has been voided."
  msgstr ""
  
-#: admin/db/fiscalyears_db.inc:124
+#: admin/db/fiscalyears_db.inc:136
  msgid ""
  "The Retained Earnings Account or the Profit and Loss Year Account has not "
  "been set in System and General GL Setup"
  msgstr ""
  
  msgid ""
  "The Retained Earnings Account or the Profit and Loss Year Account has not "
  "been set in System and General GL Setup"
  msgstr ""
  
-#: admin/db/fiscalyears_db.inc:129
+#: admin/db/fiscalyears_db.inc:141
  msgid ""
  "The Retained Earnings Account should be a Balance Account or the Profit and "
  "Loss Year Account should be an Expense Account (preferred the last one in "
  "the Expense Class)"
  msgstr ""
  
  msgid ""
  "The Retained Earnings Account should be a Balance Account or the Profit and "
  "Loss Year Account should be an Expense Account (preferred the last one in "
  "the Expense Class)"
  msgstr ""
  
-#: admin/db/fiscalyears_db.inc:154 admin/db/fiscalyears_db.inc:156
+#: admin/db/fiscalyears_db.inc:166 admin/db/fiscalyears_db.inc:168
  msgid "Closing Year"
  msgstr ""
  
  msgid "Closing Year"
  msgstr ""
  
-#: admin/db/fiscalyears_db.inc:202 reporting/rep101.php:175
+#: admin/db/fiscalyears_db.inc:214 reporting/rep101.php:175
  #: reporting/rep201.php:167 reporting/rep706.php:181
  msgid "Open Balance"
  msgstr ""
  #: reporting/rep201.php:167 reporting/rep706.php:181
  msgid "Open Balance"
  msgstr ""
@@ -2314,18 +2334,19 @@ msgstr ""
  msgid "SQL script execution failed in line %d: %s"
  msgstr ""
  
  msgid "SQL script execution failed in line %d: %s"
  msgstr ""
  
-#: admin/db/users_db.inc:197
+#: admin/db/users_db.inc:210
  msgid "user online"
  msgstr ""
  
  msgid "user online"
  msgstr ""
  
-#: admin/db/users_db.inc:197
+#: admin/db/users_db.inc:210
  msgid "users online"
  msgstr ""
  
  msgid "users online"
  msgstr ""
  
-#: admin/db/voiding_db.inc:111
+#: admin/db/voiding_db.inc:114
  #: manufacturing/includes/db/work_orders_db.inc:446
  #: manufacturing/includes/db/work_orders_db.inc:462
  #: sales/includes/db/sales_invoice_db.inc:205
  #: manufacturing/includes/db/work_orders_db.inc:446
  #: manufacturing/includes/db/work_orders_db.inc:462
  #: sales/includes/db/sales_invoice_db.inc:205
+#: sales/includes/db/sales_invoice_db.inc.orig:208
  msgid "Voided."
  msgstr ""
  
  msgid "Voided."
  msgstr ""
  
@@ -2524,8 +2545,8 @@ msgstr ""
  msgid "Ta&x Inquiry"
  msgstr ""
  
  msgid "Ta&x Inquiry"
  msgstr ""
  
-#: applications/generalledger.php:44 reporting/reports_main.php:296
-#: reporting/reports_main.php:341 reporting/reports_main.php:381
+#: applications/generalledger.php:44 reporting/reports_main.php:297
+#: reporting/reports_main.php:342 reporting/reports_main.php:382
  msgid "Trial &Balance"
  msgstr ""
  
  msgid "Trial &Balance"
  msgstr ""
  
@@ -2891,17 +2912,17 @@ msgid "The dimension reference must be entered."
  msgstr ""
  
  #: dimensions/dimension_entry.php:123 gl/bank_transfer.php:171
  msgstr ""
  
  #: dimensions/dimension_entry.php:123 gl/bank_transfer.php:171
-#: gl/gl_bank.php:254 gl/gl_journal.php:176
+#: gl/gl_bank.php:255 gl/gl_journal.php:176
  #: gl/manage/revaluate_currencies.php:72 inventory/adjustments.php:103
  #: inventory/transfers.php:99 manufacturing/work_order_add_finished.php:84
  #: manufacturing/work_order_entry.php:139
  #: manufacturing/work_order_issue.php:98 purchasing/po_entry_items.php:363
  #: purchasing/po_receive_items.php:195 purchasing/supplier_credit.php:156
  #: gl/manage/revaluate_currencies.php:72 inventory/adjustments.php:103
  #: inventory/transfers.php:99 manufacturing/work_order_add_finished.php:84
  #: manufacturing/work_order_entry.php:139
  #: manufacturing/work_order_issue.php:98 purchasing/po_entry_items.php:363
  #: purchasing/po_receive_items.php:195 purchasing/supplier_credit.php:156
-#: purchasing/supplier_invoice.php:154 purchasing/supplier_payment.php:207
-#: purchasing/supplier_payment.php.orig:204 sales/credit_note_entry.php:151
-#: sales/customer_credit_invoice.php:108 sales/customer_delivery.php:169
-#: sales/customer_invoice.php:282 sales/customer_payments.php:112
-#: sales/customer_payments.php.orig:112 sales/sales_order_entry.php:411
+#: purchasing/supplier_invoice.php:154 purchasing/supplier_payment.php:208
+#: sales/credit_note_entry.php:151 sales/customer_credit_invoice.php:108
+#: sales/customer_delivery.php:172 sales/customer_invoice.php:286
+#: sales/customer_payments.php:158 sales/customer_payments.php:165
+#: sales/customer_payments.php:246 sales/sales_order_entry.php:409
  msgid "The entered reference is already in use."
  msgstr ""
  
  msgid "The entered reference is already in use."
  msgstr ""
  
@@ -2933,15 +2954,15 @@ msgstr ""
  #: dimensions/dimension_entry.php:277 reporting/reports_main.php:34
  #: reporting/reports_main.php:60 reporting/reports_main.php:74
  #: reporting/reports_main.php:82 reporting/reports_main.php:134
  #: dimensions/dimension_entry.php:277 reporting/reports_main.php:34
  #: reporting/reports_main.php:60 reporting/reports_main.php:74
  #: reporting/reports_main.php:82 reporting/reports_main.php:134
-#: reporting/reports_main.php:198 reporting/reports_main.php:206
-#: reporting/reports_main.php:238 reporting/reports_main.php:249
-#: reporting/reports_main.php:260 reporting/reports_main.php:276
-#: reporting/reports_main.php:286 reporting/reports_main.php:297
-#: reporting/reports_main.php:309 reporting/reports_main.php:323
-#: reporting/reports_main.php:332 reporting/reports_main.php:342
-#: reporting/reports_main.php:353 reporting/reports_main.php:365
-#: reporting/reports_main.php:373 reporting/reports_main.php:382
-#: reporting/reports_main.php:390 reporting/reports_main.php:396
+#: reporting/reports_main.php:199 reporting/reports_main.php:207
+#: reporting/reports_main.php:239 reporting/reports_main.php:250
+#: reporting/reports_main.php:261 reporting/reports_main.php:277
+#: reporting/reports_main.php:287 reporting/reports_main.php:298
+#: reporting/reports_main.php:310 reporting/reports_main.php:324
+#: reporting/reports_main.php:333 reporting/reports_main.php:343
+#: reporting/reports_main.php:354 reporting/reports_main.php:366
+#: reporting/reports_main.php:374 reporting/reports_main.php:383
+#: reporting/reports_main.php:391 reporting/reports_main.php:397
  msgid "Start Date"
  msgstr ""
  
  msgid "Start Date"
  msgstr ""
  
@@ -2987,8 +3008,8 @@ msgstr ""
  
  #: dimensions/dimension_entry.php:302 includes/ui/simple_crud_class.inc:225
  #: purchasing/includes/ui/invoice_ui.inc:186
  
  #: 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:391
-#: purchasing/includes/ui/invoice_ui.inc:393
+#: purchasing/includes/ui/invoice_ui.inc:392
+#: purchasing/includes/ui/invoice_ui.inc:394
  msgid "Add"
  msgstr ""
  
  msgid "Add"
  msgstr ""
  
@@ -3001,61 +3022,63 @@ msgid "Balance for this Dimension"
  msgstr ""
  
  #: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:90
  msgstr ""
  
  #: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:90
-#: gl/inquiry/gl_account_inquiry.php:128 gl/inquiry/gl_trial_balance.php:170
+#: gl/inquiry/gl_account_inquiry.php:129 gl/inquiry/gl_trial_balance.php:171
  #: gl/manage/gl_quick_entries.php:241 gl/manage/gl_quick_entries.php:333
  #: includes/sysnames.inc:164 purchasing/includes/ui/invoice_ui.inc:245
  #: purchasing/includes/ui/invoice_ui.inc:247
  #: purchasing/includes/ui/invoice_ui.inc:249 reporting/rep701.php:109
  #: reporting/rep705.php:234 reporting/rep706.php:181 reporting/rep707.php:206
  #: gl/manage/gl_quick_entries.php:241 gl/manage/gl_quick_entries.php:333
  #: includes/sysnames.inc:164 purchasing/includes/ui/invoice_ui.inc:245
  #: purchasing/includes/ui/invoice_ui.inc:247
  #: purchasing/includes/ui/invoice_ui.inc:249 reporting/rep701.php:109
  #: reporting/rep705.php:234 reporting/rep706.php:181 reporting/rep707.php:206
-#: reporting/rep708.php:178
+#: reporting/rep708.php:179
  msgid "Account"
  msgstr ""
  
  #: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:98
  #: gl/bank_account_reconcile.php:237 gl/inquiry/bank_inquiry.php:71
  msgid "Account"
  msgstr ""
  
  #: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:98
  #: gl/bank_account_reconcile.php:237 gl/inquiry/bank_inquiry.php:71
-#: gl/inquiry/gl_account_inquiry.php:140 gl/inquiry/gl_account_inquiry.php:142
-#: gl/inquiry/gl_trial_balance.php:176 gl/inquiry/gl_trial_balance.php:178
-#: gl/inquiry/gl_trial_balance.php:180 gl/view/accrual_trans.php:60
+#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
+#: gl/inquiry/gl_trial_balance.php:177 gl/inquiry/gl_trial_balance.php:179
+#: gl/inquiry/gl_trial_balance.php:181 gl/view/accrual_trans.php:60
  #: gl/view/gl_trans_view.php:64 gl/view/gl_trans_view.php:67
  #: gl/view/gl_trans_view.php:70 gl/includes/ui/gl_journal_ui.inc:84
  #: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90
  #: gl/view/gl_trans_view.php:64 gl/view/gl_trans_view.php:67
  #: gl/view/gl_trans_view.php:70 gl/includes/ui/gl_journal_ui.inc:84
  #: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90
-#: purchasing/inquiry/supplier_allocation_inquiry.php:133
-#: purchasing/inquiry/supplier_inquiry.php:170
+#: purchasing/inquiry/supplier_allocation_inquiry.php:134
+#: purchasing/inquiry/supplier_inquiry.php:176
  #: purchasing/inquiry/supplier_inquiry.php.orig:170 reporting/rep601.php:77
  #: purchasing/inquiry/supplier_inquiry.php.orig:170 reporting/rep601.php:77
-#: reporting/rep702.php:52 reporting/rep704.php:79 reporting/rep704.php:82
-#: reporting/rep704.php:85 reporting/rep708.php:178 reporting/rep708.php:179
-#: sales/inquiry/customer_allocation_inquiry.php:149
-#: sales/inquiry/customer_inquiry.php:221
+#: reporting/rep702.php:52 reporting/rep704.php:80 reporting/rep704.php:83
+#: reporting/rep704.php:86 reporting/rep708.php:179 reporting/rep708.php:180
+#: sales/inquiry/customer_allocation_inquiry.php:152
+#: sales/inquiry/customer_inquiry.php:233
+#: sales/inquiry/customer_inquiry.php.orig:233
  msgid "Debit"
  msgstr ""
  
  #: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:98
  #: gl/bank_account_reconcile.php:238 gl/inquiry/bank_inquiry.php:71
  msgid "Debit"
  msgstr ""
  
  #: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:98
  #: gl/bank_account_reconcile.php:238 gl/inquiry/bank_inquiry.php:71
-#: gl/inquiry/gl_account_inquiry.php:140 gl/inquiry/gl_account_inquiry.php:142
-#: gl/inquiry/gl_trial_balance.php:177 gl/inquiry/gl_trial_balance.php:179
-#: gl/inquiry/gl_trial_balance.php:181 gl/view/accrual_trans.php:60
+#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
+#: gl/inquiry/gl_trial_balance.php:178 gl/inquiry/gl_trial_balance.php:180
+#: gl/inquiry/gl_trial_balance.php:182 gl/view/accrual_trans.php:60
  #: gl/view/gl_trans_view.php:64 gl/view/gl_trans_view.php:67
  #: gl/view/gl_trans_view.php:70 gl/includes/ui/gl_journal_ui.inc:84
  #: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90
  #: includes/sysnames.inc:85
  #: gl/view/gl_trans_view.php:64 gl/view/gl_trans_view.php:67
  #: gl/view/gl_trans_view.php:70 gl/includes/ui/gl_journal_ui.inc:84
  #: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90
  #: includes/sysnames.inc:85
-#: purchasing/inquiry/supplier_allocation_inquiry.php:134
-#: purchasing/inquiry/supplier_inquiry.php:171
+#: purchasing/inquiry/supplier_allocation_inquiry.php:135
+#: purchasing/inquiry/supplier_inquiry.php:177
  #: purchasing/inquiry/supplier_inquiry.php.orig:171 reporting/rep601.php:77
  #: purchasing/inquiry/supplier_inquiry.php.orig:171 reporting/rep601.php:77
-#: reporting/rep702.php:52 reporting/rep704.php:79 reporting/rep704.php:82
-#: reporting/rep704.php:85 reporting/rep708.php:178 reporting/rep708.php:179
-#: sales/inquiry/customer_allocation_inquiry.php:150
-#: sales/inquiry/customer_inquiry.php:222
+#: reporting/rep702.php:52 reporting/rep704.php:80 reporting/rep704.php:83
+#: reporting/rep704.php:86 reporting/rep708.php:179 reporting/rep708.php:180
+#: sales/inquiry/customer_allocation_inquiry.php:153
+#: sales/inquiry/customer_inquiry.php:234
+#: sales/inquiry/customer_inquiry.php.orig:234
  msgid "Credit"
  msgstr ""
  
  #: dimensions/includes/dimensions_ui.inc:45
  #: dimensions/inquiry/search_dimensions.php:134 gl/inquiry/bank_inquiry.php:71
  msgid "Credit"
  msgstr ""
  
  #: dimensions/includes/dimensions_ui.inc:45
  #: dimensions/inquiry/search_dimensions.php:134 gl/inquiry/bank_inquiry.php:71
-#: gl/inquiry/gl_account_inquiry.php:140 gl/inquiry/gl_trial_balance.php:174
-#: purchasing/inquiry/supplier_allocation_inquiry.php:136
+#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_trial_balance.php:175
+#: purchasing/inquiry/supplier_allocation_inquiry.php:137
  #: reporting/rep203.php:92 reporting/rep204.php:82 reporting/rep601.php:77
  #: reporting/rep203.php:92 reporting/rep204.php:82 reporting/rep601.php:77
-#: reporting/rep701.php:109 reporting/rep704.php:79 reporting/rep704.php:82
-#: reporting/rep704.php:85 reporting/rep708.php:171
-#: sales/inquiry/customer_allocation_inquiry.php:152
+#: reporting/rep701.php:109 reporting/rep704.php:80 reporting/rep704.php:83
+#: reporting/rep704.php:86 reporting/rep708.php:172
+#: sales/inquiry/customer_allocation_inquiry.php:155
  msgid "Balance"
  msgstr ""
  
  msgid "Balance"
  msgstr ""
  
@@ -3080,21 +3103,20 @@ msgstr ""
  #: manufacturing/includes/work_order_issue_ui.inc:156
  #: purchasing/includes/ui/invoice_ui.inc:92
  #: purchasing/includes/ui/po_ui.inc:159 purchasing/includes/ui/po_ui.inc:164
  #: manufacturing/includes/work_order_issue_ui.inc:156
  #: purchasing/includes/ui/invoice_ui.inc:92
  #: purchasing/includes/ui/po_ui.inc:159 purchasing/includes/ui/po_ui.inc:164
-#: purchasing/supplier_payment.php:285
-#: purchasing/supplier_payment.php.orig:287 sales/customer_payments.php:258
-#: sales/customer_payments.php.orig:260
+#: purchasing/supplier_payment.php:286 sales/customer_payments.php:382
  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/ui_lists.inc:1887
-#: reporting/rep101.php:112 reporting/rep102.php:96 reporting/rep104.php:95
+#: includes/ui/allocation_cart.inc:284 includes/ui/sav.ui_lists.inc:1898
+#: includes/ui/ui_lists.inc:1887 includes/ui/ui_lists.inc.orig:1898
+#: reporting/rep101.php:112 reporting/rep102.php:94 reporting/rep104.php:95
  #: reporting/rep104.php:99 reporting/rep105.php:93 reporting/rep105.php:97
  #: reporting/rep201.php:100 reporting/rep202.php:98 reporting/rep203.php:72
  #: reporting/rep104.php:99 reporting/rep105.php:93 reporting/rep105.php:97
  #: reporting/rep201.php:100 reporting/rep202.php:98 reporting/rep203.php:72
-#: reporting/rep204.php:75 reporting/rep301.php:87 reporting/rep301.php:94
+#: reporting/rep204.php:75 reporting/rep301.php:90 reporting/rep301.php:97
  #: reporting/rep302.php:103 reporting/rep302.php:110 reporting/rep303.php:84
  #: reporting/rep302.php:103 reporting/rep302.php:110 reporting/rep303.php:84
-#: reporting/rep303.php:91 reporting/rep304.php:96 reporting/rep304.php:103
-#: reporting/rep304.php:108 reporting/rep702.php:59 reporting/rep710.php:84
+#: reporting/rep303.php:91 reporting/rep304.php:96 reporting/rep304.php:101
+#: reporting/rep304.php:106 reporting/rep702.php:59 reporting/rep710.php:84
  #: reporting/rep710.php:85
  msgid "All"
  msgstr ""
  #: reporting/rep710.php:85
  msgid "All"
  msgstr ""
@@ -3104,11 +3126,12 @@ msgstr ""
  #: gl/inquiry/profit_loss.php:163 gl/includes/ui/gl_bank_ui.inc:50
  #: gl/includes/ui/gl_bank_ui.inc:105 gl/includes/ui/gl_bank_ui.inc.orig:50
  #: gl/includes/ui/gl_bank_ui.inc.orig:105
  #: gl/inquiry/profit_loss.php:163 gl/includes/ui/gl_bank_ui.inc:50
  #: gl/includes/ui/gl_bank_ui.inc:105 gl/includes/ui/gl_bank_ui.inc.orig:50
  #: gl/includes/ui/gl_bank_ui.inc.orig:105
-#: inventory/inquiry/stock_movements.php:58
+#: inventory/inquiry/stock_movements.php:62
  #: purchasing/inquiry/supplier_allocation_inquiry.php:50
  #: purchasing/inquiry/supplier_allocation_inquiry.php:50
-#: purchasing/inquiry/supplier_inquiry.php:49
+#: purchasing/inquiry/supplier_inquiry.php:53
  #: purchasing/inquiry/supplier_inquiry.php.orig:49
  #: purchasing/inquiry/supplier_inquiry.php.orig:49
-#: sales/inquiry/customer_inquiry.php:46
+#: sales/inquiry/customer_inquiry.php:50
+#: sales/inquiry/customer_inquiry.php.orig:50
  msgid "From:"
  msgstr ""
  
  msgid "From:"
  msgstr ""
  
@@ -3116,11 +3139,12 @@ msgstr ""
  #: gl/inquiry/gl_trial_balance.php:50 gl/inquiry/journal_inquiry.php:49
  #: gl/inquiry/profit_loss.php:164 gl/includes/ui/gl_bank_ui.inc:105
  #: gl/includes/ui/gl_bank_ui.inc.orig:105
  #: gl/inquiry/gl_trial_balance.php:50 gl/inquiry/journal_inquiry.php:49
  #: gl/inquiry/profit_loss.php:164 gl/includes/ui/gl_bank_ui.inc:105
  #: gl/includes/ui/gl_bank_ui.inc.orig:105
-#: inventory/inquiry/stock_movements.php:59
+#: inventory/inquiry/stock_movements.php:63
  #: purchasing/inquiry/supplier_allocation_inquiry.php:51
  #: purchasing/inquiry/supplier_allocation_inquiry.php:51
-#: purchasing/inquiry/supplier_inquiry.php:50
+#: purchasing/inquiry/supplier_inquiry.php:54
  #: purchasing/inquiry/supplier_inquiry.php.orig:50
  #: purchasing/inquiry/supplier_inquiry.php.orig:50
-#: sales/inquiry/customer_inquiry.php:47
+#: sales/inquiry/customer_inquiry.php:51
+#: sales/inquiry/customer_inquiry.php.orig:51
  msgid "To:"
  msgstr ""
  
  msgid "To:"
  msgstr ""
  
@@ -3139,15 +3163,18 @@ msgstr ""
  #: purchasing/includes/ui/invoice_ui.inc:112
  #: purchasing/view/view_supp_credit.php:48
  #: purchasing/view/view_supp_invoice.php:51
  #: purchasing/includes/ui/invoice_ui.inc:112
  #: purchasing/view/view_supp_credit.php:48
  #: purchasing/view/view_supp_invoice.php:51
-#: purchasing/inquiry/supplier_allocation_inquiry.php:131
-#: purchasing/inquiry/supplier_inquiry.php:168
+#: purchasing/inquiry/supplier_allocation_inquiry.php:132
+#: purchasing/inquiry/supplier_inquiry.php:174
  #: purchasing/inquiry/supplier_inquiry.php.orig:168 reporting/rep101.php:130
  #: reporting/rep201.php:118 reporting/rep203.php:91 reporting/rep501.php:85
  #: purchasing/inquiry/supplier_inquiry.php.orig:168 reporting/rep101.php:130
  #: reporting/rep201.php:118 reporting/rep203.php:91 reporting/rep501.php:85
-#: reporting/includes/doctext.inc:40 reporting/includes/doctext.inc:110
-#: sales/customer_invoice.php:426 sales/view/view_dispatch.php:97
-#: sales/view/view_invoice.php:96
-#: sales/inquiry/customer_allocation_inquiry.php:146
-#: sales/inquiry/customer_inquiry.php:217
+#: reporting/includes/doctext.inc:100 reporting/includes/doctext.inc:122
+#: reporting/includes/doctext.inc:143 reporting/includes/doctext.inc:145
+#: reporting/includes/doctext.inc:166 reporting/includes/doctext.inc:184
+#: reporting/includes/doctext.inc:186 sales/customer_invoice.php:437
+#: sales/view/view_dispatch.php:97 sales/view/view_invoice.php:96
+#: sales/inquiry/customer_allocation_inquiry.php:149
+#: sales/inquiry/customer_inquiry.php:229
+#: sales/inquiry/customer_inquiry.php.orig:229
  #: sales/includes/ui/sales_order_ui.inc:595
  msgid "Due Date"
  msgstr ""
  #: sales/includes/ui/sales_order_ui.inc:595
  msgid "Due Date"
  msgstr ""
@@ -3168,26 +3195,28 @@ msgstr ""
  msgid "This dimension is closed."
  msgstr ""
  
  msgid "This dimension is closed."
  msgstr ""
  
-#: dimensions/view/view_dimension.php:84 gl/inquiry/gl_account_inquiry.php:70
-#: gl/inquiry/tax_inquiry.php:61 purchasing/inquiry/po_search_completed.php:62
+#: dimensions/view/view_dimension.php:84 gl/inquiry/gl_account_inquiry.php:71
+#: gl/inquiry/tax_inquiry.php:61 purchasing/inquiry/po_search_completed.php:65
  #: purchasing/inquiry/po_search.php:64
  #: sales/inquiry/customer_allocation_inquiry.php:44
  #: sales/inquiry/sales_deliveries_view.php:104
  #: purchasing/inquiry/po_search.php:64
  #: sales/inquiry/customer_allocation_inquiry.php:44
  #: sales/inquiry/sales_deliveries_view.php:104
-#: sales/inquiry/sales_orders_view.php:221
+#: sales/inquiry/sales_orders_view.php:227
+#: sales/inquiry/sales_orders_view.php.orig:227
  msgid "from:"
  msgstr ""
  
  msgid "from:"
  msgstr ""
  
-#: dimensions/view/view_dimension.php:85 gl/inquiry/gl_account_inquiry.php:71
-#: gl/inquiry/tax_inquiry.php:62 purchasing/inquiry/po_search_completed.php:63
+#: dimensions/view/view_dimension.php:85 gl/inquiry/gl_account_inquiry.php:72
+#: gl/inquiry/tax_inquiry.php:62 purchasing/inquiry/po_search_completed.php:66
  #: purchasing/inquiry/po_search.php:65
  #: sales/inquiry/customer_allocation_inquiry.php:45
  #: sales/inquiry/sales_deliveries_view.php:105
  #: purchasing/inquiry/po_search.php:65
  #: sales/inquiry/customer_allocation_inquiry.php:45
  #: sales/inquiry/sales_deliveries_view.php:105
-#: sales/inquiry/sales_orders_view.php:222
+#: sales/inquiry/sales_orders_view.php:228
+#: sales/inquiry/sales_orders_view.php.orig:228
  msgid "to:"
  msgstr ""
  
  #: dimensions/view/view_dimension.php:86 gl/inquiry/balance_sheet.php:131
  msgid "to:"
  msgstr ""
  
  #: dimensions/view/view_dimension.php:86 gl/inquiry/balance_sheet.php:131
-#: gl/inquiry/bank_inquiry.php:52 gl/inquiry/gl_account_inquiry.php:84
+#: gl/inquiry/bank_inquiry.php:52 gl/inquiry/gl_account_inquiry.php:85
  #: gl/inquiry/gl_trial_balance.php:58 gl/inquiry/profit_loss.php:178
  #: gl/inquiry/tax_inquiry.php:63
  msgid "Show"
  #: gl/inquiry/gl_trial_balance.php:58 gl/inquiry/profit_loss.php:178
  #: gl/inquiry/tax_inquiry.php:63
  msgid "Show"
@@ -3219,9 +3248,9 @@ msgstr ""
  #: gl/accruals.php:92 gl/accruals.php:94 gl/accruals.php:203
  #: gl/accruals.php:205 gl/gl_budget.php:71 gl/gl_budget.php:72
  #: gl/gl_budget.php:76 gl/inquiry/balance_sheet.php:128
  #: gl/accruals.php:92 gl/accruals.php:94 gl/accruals.php:203
  #: gl/accruals.php:205 gl/gl_budget.php:71 gl/gl_budget.php:72
  #: gl/gl_budget.php:76 gl/inquiry/balance_sheet.php:128
-#: gl/inquiry/balance_sheet.php:130 gl/inquiry/gl_account_inquiry.php:78
-#: gl/inquiry/gl_account_inquiry.php:80 gl/inquiry/gl_account_inquiry.php:133
-#: gl/inquiry/gl_account_inquiry.php:135 gl/inquiry/gl_trial_balance.php:52
+#: gl/inquiry/balance_sheet.php:130 gl/inquiry/gl_account_inquiry.php:79
+#: gl/inquiry/gl_account_inquiry.php:81 gl/inquiry/gl_account_inquiry.php:134
+#: gl/inquiry/gl_account_inquiry.php:136 gl/inquiry/gl_trial_balance.php:52
  #: gl/inquiry/gl_trial_balance.php:54 gl/inquiry/profit_loss.php:174
  #: gl/inquiry/profit_loss.php:176 gl/manage/gl_quick_entries.php:261
  #: gl/manage/gl_quick_entries.php:263 gl/manage/gl_quick_entries.php:343
  #: gl/inquiry/gl_trial_balance.php:54 gl/inquiry/profit_loss.php:174
  #: gl/inquiry/profit_loss.php:176 gl/manage/gl_quick_entries.php:261
  #: gl/manage/gl_quick_entries.php:263 gl/manage/gl_quick_entries.php:343
@@ -3237,28 +3266,30 @@ msgstr ""
  #: 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/includes/ui/gl_journal_ui.inc:84 gl/includes/ui/gl_journal_ui.inc:86
  #: includes/sysnames.inc:43 includes/sysnames.inc:165
  #: inventory/manage/item_categories.php:216
-#: inventory/manage/item_categories.php:218 inventory/manage/items.php:353
-#: inventory/manage/items.php:355 purchasing/includes/ui/invoice_ui.inc:245
+#: inventory/manage/item_categories.php:218 inventory/manage/items.php:341
+#: inventory/manage/items.php:343 purchasing/includes/ui/invoice_ui.inc:245
  #: purchasing/includes/ui/invoice_ui.inc:247
  #: purchasing/includes/ui/invoice_ui.inc:247
-#: purchasing/manage/suppliers.php:135 purchasing/manage/suppliers.php:136
-#: purchasing/manage/suppliers.php:138 reporting/rep501.php:90
-#: reporting/rep704.php:78 reporting/rep704.php:81 reporting/rep704.php:92
-#: reporting/rep704.php:94 reporting/rep704.php:102 reporting/rep705.php:245
+#: purchasing/manage/suppliers.php:134 purchasing/manage/suppliers.php:135
+#: purchasing/manage/suppliers.php:137 reporting/rep501.php:90
+#: reporting/rep704.php:79 reporting/rep704.php:82 reporting/rep704.php:93
+#: reporting/rep704.php:95 reporting/rep704.php:103 reporting/rep705.php:245
  #: reporting/rep705.php:247 reporting/rep705.php:258 reporting/rep706.php:190
  #: reporting/rep706.php:192 reporting/rep706.php:200 reporting/rep707.php:214
  #: reporting/rep705.php:247 reporting/rep705.php:258 reporting/rep706.php:190
  #: reporting/rep706.php:192 reporting/rep706.php:200 reporting/rep707.php:214
-#: reporting/rep707.php:216 reporting/rep707.php:224 reporting/rep708.php:187
-#: reporting/rep708.php:189 reporting/rep708.php:196
-#: reporting/reports_main.php:264 reporting/reports_main.php:265
-#: reporting/reports_main.php:270 reporting/reports_main.php:271
-#: reporting/reports_main.php:278 reporting/reports_main.php:279
-#: reporting/reports_main.php:289 reporting/reports_main.php:290
-#: reporting/reports_main.php:301 reporting/reports_main.php:302
-#: reporting/reports_main.php:313 reporting/reports_main.php:318
-#: reporting/reports_main.php:325 reporting/reports_main.php:335
-#: reporting/reports_main.php:346 sales/customer_delivery.php:392
-#: sales/customer_delivery.php:400 sales/customer_invoice.php:401
-#: sales/customer_invoice.php:428 sales/manage/customers.php:234
-#: sales/manage/customers.php:236 sales/includes/ui/sales_credit_ui.inc:132
+#: reporting/rep707.php:216 reporting/rep707.php:224 reporting/rep708.php:188
+#: reporting/rep708.php:190 reporting/rep708.php:197
+#: reporting/reports_main.php:265 reporting/reports_main.php:266
+#: reporting/reports_main.php:271 reporting/reports_main.php:272
+#: reporting/reports_main.php:279 reporting/reports_main.php:280
+#: reporting/reports_main.php:290 reporting/reports_main.php:291
+#: reporting/reports_main.php:302 reporting/reports_main.php:303
+#: reporting/reports_main.php:314 reporting/reports_main.php:319
+#: reporting/reports_main.php:326 reporting/reports_main.php:336
+#: reporting/reports_main.php:347 sales/customer_delivery.php:395
+#: sales/customer_delivery.php:403 sales/customer_invoice.php:407
+#: sales/customer_invoice.php:445 sales/manage/customers.php:265
+#: sales/manage/customers.php:267 sales/manage/customers.php.orig:266
+#: sales/manage/customers.php.orig:268
+#: sales/includes/ui/sales_credit_ui.inc:132
  #: sales/includes/ui/sales_credit_ui.inc:137
  #: sales/includes/ui/sales_order_ui.inc:451
  #: sales/includes/ui/sales_order_ui.inc:456
  #: sales/includes/ui/sales_credit_ui.inc:137
  #: sales/includes/ui/sales_order_ui.inc:451
  #: sales/includes/ui/sales_order_ui.inc:456
@@ -3266,7 +3297,7 @@ msgid "Dimension"
  msgstr ""
  
  #: gl/accruals.php:98 gl/accruals.php:213
  msgstr ""
  
  #: gl/accruals.php:98 gl/accruals.php:213
-#: gl/inquiry/gl_account_inquiry.php:140 gl/inquiry/gl_account_inquiry.php:142
+#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
  #: gl/inquiry/journal_inquiry.php:126 gl/view/accrual_trans.php:60
  #: gl/view/gl_deposit_view.php:100 gl/view/gl_deposit_view.php:103
  #: gl/view/gl_deposit_view.php:106 gl/view/gl_payment_view.php:99
  #: gl/inquiry/journal_inquiry.php:126 gl/view/accrual_trans.php:60
  #: gl/view/gl_deposit_view.php:100 gl/view/gl_deposit_view.php:103
  #: gl/view/gl_deposit_view.php:106 gl/view/gl_payment_view.php:99
@@ -3286,8 +3317,8 @@ msgstr ""
  #: purchasing/includes/ui/invoice_ui.inc:245
  #: purchasing/includes/ui/invoice_ui.inc:247
  #: purchasing/includes/ui/invoice_ui.inc:249
  #: purchasing/includes/ui/invoice_ui.inc:245
  #: purchasing/includes/ui/invoice_ui.inc:247
  #: purchasing/includes/ui/invoice_ui.inc:249
-#: sales/customer_credit_invoice.php:366 sales/customer_delivery.php:516
-#: sales/customer_invoice.php:557 sales/includes/ui/sales_credit_ui.inc:339
+#: sales/customer_credit_invoice.php:366 sales/customer_delivery.php:519
+#: sales/customer_invoice.php:576 sales/includes/ui/sales_credit_ui.inc:339
  msgid "Memo"
  msgstr ""
  
  msgid "Memo"
  msgstr ""
  
@@ -3342,16 +3373,18 @@ msgstr ""
  #: gl/includes/ui/gl_bank_ui.inc:139 gl/includes/ui/gl_bank_ui.inc.orig:133
  #: gl/includes/ui/gl_bank_ui.inc.orig:136
  #: gl/includes/ui/gl_bank_ui.inc.orig:139 includes/sysnames.inc:132
  #: gl/includes/ui/gl_bank_ui.inc:139 gl/includes/ui/gl_bank_ui.inc.orig:133
  #: gl/includes/ui/gl_bank_ui.inc.orig:136
  #: gl/includes/ui/gl_bank_ui.inc.orig:139 includes/sysnames.inc:132
-#: includes/ui/allocation_cart.inc:263 includes/ui/ui_lists.inc:1152
+#: includes/ui/allocation_cart.inc:263 includes/ui/sav.ui_lists.inc:1163
+#: includes/ui/ui_lists.inc:1152 includes/ui/ui_lists.inc.orig:1163
  #: manufacturing/includes/manufacturing_ui.inc:236
  #: purchasing/includes/ui/invoice_ui.inc:245
  #: purchasing/includes/ui/invoice_ui.inc:247
  #: purchasing/includes/ui/invoice_ui.inc:249
  #: purchasing/view/view_supp_payment.php:60
  #: manufacturing/includes/manufacturing_ui.inc:236
  #: purchasing/includes/ui/invoice_ui.inc:245
  #: purchasing/includes/ui/invoice_ui.inc:247
  #: purchasing/includes/ui/invoice_ui.inc:249
  #: purchasing/view/view_supp_payment.php:60
-#: purchasing/view/view_supp_payment.php:69 reporting/rep102.php:243
-#: reporting/rep202.php:249 reporting/rep706.php:303 reporting/rep707.php:321
-#: reporting/rep710.php:76 reporting/includes/doctext.inc:152
-#: sales/view/view_receipt.php:44
+#: purchasing/view/view_supp_payment.php:72 reporting/rep102.php:241
+#: reporting/rep107.php:180 reporting/rep109.php:188 reporting/rep110.php:193
+#: reporting/rep111.php:175 reporting/rep113.php:182 reporting/rep202.php:249
+#: reporting/rep209.php:197 reporting/rep706.php:303 reporting/rep707.php:321
+#: reporting/rep710.php:76 sales/view/view_receipt.php:44
  msgid "Amount"
  msgstr ""
  
  msgid "Amount"
  msgstr ""
  
@@ -3383,10 +3416,9 @@ msgstr ""
  msgid "Reconcile Bank Account"
  msgstr ""
  
  msgid "Reconcile Bank Account"
  msgstr ""
  
-#: gl/bank_account_reconcile.php:35 gl/bank_transfer.php:30 gl/gl_bank.php:48
+#: gl/bank_account_reconcile.php:35 gl/bank_transfer.php:30 gl/gl_bank.php:49
  #: gl/inquiry/bank_inquiry.php:30 purchasing/supplier_payment.php:42
  #: gl/inquiry/bank_inquiry.php:30 purchasing/supplier_payment.php:42
-#: purchasing/supplier_payment.php.orig:42 sales/customer_payments.php:39
-#: sales/customer_payments.php.orig:39
+#: sales/customer_payments.php:39
  msgid "There are no bank accounts defined in the system."
  msgstr ""
  
  msgid "There are no bank accounts defined in the system."
  msgstr ""
  
@@ -3399,7 +3431,7 @@ msgid "Reconcile this transaction"
  msgstr ""
  
  #: gl/bank_account_reconcile.php:166 gl/inquiry/bank_inquiry.php:47
  msgstr ""
  
  #: gl/bank_account_reconcile.php:166 gl/inquiry/bank_inquiry.php:47
-#: gl/inquiry/gl_account_inquiry.php:69
+#: gl/inquiry/gl_account_inquiry.php:70
  msgid "Account:"
  msgstr ""
  
  msgid "Account:"
  msgstr ""
  
@@ -3440,10 +3472,10 @@ msgid "Date of bank statement to reconcile"
  msgstr ""
  
  #: gl/bank_account_reconcile.php:239 gl/inquiry/bank_inquiry.php:71
  msgstr ""
  
  #: gl/bank_account_reconcile.php:239 gl/inquiry/bank_inquiry.php:71
-#: gl/inquiry/gl_account_inquiry.php:140 gl/inquiry/gl_account_inquiry.php:142
+#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
  #: gl/view/accrual_trans.php:60 gl/view/gl_trans_view.php:36
  #: gl/view/accrual_trans.php:60 gl/view/gl_trans_view.php:36
-#: reporting/rep601.php:76 reporting/rep704.php:79 reporting/rep704.php:81
-#: reporting/rep704.php:84
+#: reporting/rep601.php:76 reporting/rep704.php:80 reporting/rep704.php:82
+#: reporting/rep704.php:85
  msgid "Person/Item"
  msgstr ""
  
  msgid "Person/Item"
  msgstr ""
  
@@ -3480,14 +3512,12 @@ msgid "Transfer Date:"
  msgstr ""
  
  #: gl/bank_transfer.php:78 gl/bank_transfer.php:85
  msgstr ""
  
  #: gl/bank_transfer.php:78 gl/bank_transfer.php:85
-#: sales/customer_payments.php:290 sales/customer_payments.php.orig:291
+#: sales/customer_payments.php:411
  msgid "Amount:"
  msgstr ""
  
  #: gl/bank_transfer.php:79 gl/bank_transfer.php:86
  msgid "Amount:"
  msgstr ""
  
  #: gl/bank_transfer.php:79 gl/bank_transfer.php:86
-#: purchasing/supplier_payment.php:298
-#: purchasing/supplier_payment.php.orig:300 sales/customer_payments.php:274
-#: sales/customer_payments.php.orig:276
+#: purchasing/supplier_payment.php:299 sales/customer_payments.php:396
  msgid "Bank Charge:"
  msgstr ""
  
  msgid "Bank Charge:"
  msgstr ""
  
@@ -3496,13 +3526,11 @@ msgid "Enter Transfer"
  msgstr ""
  
  #: gl/bank_transfer.php:123 gl/bank_transfer.php:153
  msgstr ""
  
  #: gl/bank_transfer.php:123 gl/bank_transfer.php:153
-#: purchasing/supplier_payment.php:129 purchasing/supplier_payment.php:135
-#: purchasing/supplier_payment.php.orig:126
-#: purchasing/supplier_payment.php.orig:132
+#: purchasing/supplier_payment.php:130 purchasing/supplier_payment.php:136
  msgid "The entered amount is invalid or less than zero."
  msgstr ""
  
  msgid "The entered amount is invalid or less than zero."
  msgstr ""
  
-#: gl/bank_transfer.php:128 gl/gl_bank.php:224
+#: gl/bank_transfer.php:128 gl/gl_bank.php:225
  msgid "The total bank amount cannot be 0."
  msgstr ""
  
  msgid "The total bank amount cannot be 0."
  msgstr ""
  
@@ -3511,30 +3539,28 @@ 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:145 gl/gl_bank.php:241
+#: gl/bank_transfer.php:145 gl/gl_bank.php:242
  #, php-format
  msgid ""
  "The bank transaction would result in exceed of authorized overdraft limit "
  "for transaction: %s #%s on %s."
  msgstr ""
  
  #, php-format
  msgid ""
  "The bank transaction would result in exceed of authorized overdraft limit "
  "for transaction: %s #%s on %s."
  msgstr ""
  
-#: gl/bank_transfer.php:158 purchasing/supplier_payment.php:143
-#: purchasing/supplier_payment.php.orig:140 sales/customer_payments.php:131
-#: sales/customer_payments.php.orig:131
+#: gl/bank_transfer.php:158 purchasing/supplier_payment.php:144
+#: sales/customer_payments.php:184
  msgid ""
  "The Bank Charge Account has not been set in System and General GL Setup."
  msgstr ""
  
  msgid ""
  "The Bank Charge Account has not been set in System and General GL Setup."
  msgstr ""
  
-#: gl/bank_transfer.php:164 gl/gl_bank.php:248 gl/gl_journal.php:168
+#: gl/bank_transfer.php:164 gl/gl_bank.php:249 gl/gl_journal.php:168
  #: gl/manage/revaluate_currencies.php:65 inventory/adjustments.php:96
  #: inventory/transfers.php:93 manufacturing/work_order_add_finished.php:77
  #: manufacturing/work_order_entry.php:132
  #: manufacturing/work_order_issue.php:91 purchasing/po_receive_items.php:188
  #: gl/manage/revaluate_currencies.php:65 inventory/adjustments.php:96
  #: inventory/transfers.php:93 manufacturing/work_order_add_finished.php:77
  #: manufacturing/work_order_entry.php:132
  #: manufacturing/work_order_issue.php:91 purchasing/po_receive_items.php:188
-#: purchasing/supplier_payment.php:200
-#: purchasing/supplier_payment.php.orig:197 sales/credit_note_entry.php:147
-#: sales/customer_credit_invoice.php:102 sales/customer_delivery.php:163
-#: sales/customer_invoice.php:276 sales/customer_payments.php:106
-#: sales/customer_payments.php.orig:106 sales/sales_order_entry.php:405
+#: purchasing/supplier_payment.php:201 sales/credit_note_entry.php:147
+#: sales/customer_credit_invoice.php:102 sales/customer_delivery.php:166
+#: sales/customer_invoice.php:280 sales/customer_payments.php:151
+#: sales/sales_order_entry.php:403
  msgid "You must enter a reference."
  msgstr ""
  
  msgid "You must enter a reference."
  msgstr ""
  
@@ -3542,40 +3568,40 @@ 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/gl_bank.php:33
+#: gl/gl_bank.php:34
  msgid "Bank Account Payment Entry"
  msgstr ""
  
  msgid "Bank Account Payment Entry"
  msgstr ""
  
-#: gl/gl_bank.php:36
+#: gl/gl_bank.php:37
  msgid "Bank Account Deposit Entry"
  msgstr ""
  
  msgid "Bank Account Deposit Entry"
  msgstr ""
  
-#: gl/gl_bank.php:39
+#: gl/gl_bank.php:40
  msgid "Modify Bank Account Entry"
  msgstr ""
  
  msgid "Modify Bank Account Entry"
  msgstr ""
  
-#: gl/gl_bank.php:42
+#: gl/gl_bank.php:43
  msgid "Modify Bank Deposit Entry"
  msgstr ""
  
  msgid "Modify Bank Deposit Entry"
  msgstr ""
  
-#: gl/gl_bank.php:72
+#: gl/gl_bank.php:73
  #, php-format
  msgid "Payment %d has been entered"
  msgstr ""
  
  #, php-format
  msgid "Payment %d has been entered"
  msgstr ""
  
-#: gl/gl_bank.php:74 gl/gl_bank.php:92
+#: gl/gl_bank.php:75 gl/gl_bank.php:93
  msgid "&View the GL Postings for this Payment"
  msgstr ""
  
  msgid "&View the GL Postings for this Payment"
  msgstr ""
  
-#: gl/gl_bank.php:76 gl/gl_bank.php:94
+#: gl/gl_bank.php:77 gl/gl_bank.php:95
  msgid "Enter Another &Payment"
  msgstr ""
  
  msgid "Enter Another &Payment"
  msgstr ""
  
-#: gl/gl_bank.php:78 gl/gl_bank.php:96
+#: gl/gl_bank.php:79 gl/gl_bank.php:97
  msgid "Enter A &Deposit"
  msgstr ""
  
  msgid "Enter A &Deposit"
  msgstr ""
  
-#: gl/gl_bank.php:80 gl/gl_journal.php:61 inventory/adjustments.php:50
+#: gl/gl_bank.php:81 gl/gl_journal.php:61 inventory/adjustments.php:50
  #: manufacturing/work_order_entry.php:68 purchasing/po_entry_items.php:109
  #: purchasing/po_entry_items.php:133 purchasing/supplier_credit.php:49
  #: purchasing/supplier_invoice.php:52 sales/credit_note_entry.php:77
  #: manufacturing/work_order_entry.php:68 purchasing/po_entry_items.php:109
  #: purchasing/po_entry_items.php:133 purchasing/supplier_credit.php:49
  #: purchasing/supplier_invoice.php:52 sales/credit_note_entry.php:77
@@ -3584,74 +3610,73 @@ msgstr ""
  msgid "Add an Attachment"
  msgstr ""
  
  msgid "Add an Attachment"
  msgstr ""
  
-#: gl/gl_bank.php:106
+#: gl/gl_bank.php:107
  #, php-format
  msgid "Deposit %d has been entered"
  msgstr ""
  
  #, php-format
  msgid "Deposit %d has been entered"
  msgstr ""
  
-#: gl/gl_bank.php:108
+#: gl/gl_bank.php:109
  msgid "View the GL Postings for this Deposit"
  msgstr ""
  
  msgid "View the GL Postings for this Deposit"
  msgstr ""
  
-#: gl/gl_bank.php:110
+#: gl/gl_bank.php:111
  msgid "Enter Another Deposit"
  msgstr ""
  
  msgid "Enter Another Deposit"
  msgstr ""
  
-#: gl/gl_bank.php:112
+#: gl/gl_bank.php:113
  msgid "Enter A Payment"
  msgstr ""
  
  msgid "Enter A Payment"
  msgstr ""
  
-#: gl/gl_bank.php:123
+#: gl/gl_bank.php:124
  msgid "&View the GL Postings for this Deposit"
  msgstr ""
  
  msgid "&View the GL Postings for this Deposit"
  msgstr ""
  
-#: gl/gl_bank.php:125
+#: gl/gl_bank.php:126
  msgid "Enter Another &Deposit"
  msgstr ""
  
  msgid "Enter Another &Deposit"
  msgstr ""
  
-#: gl/gl_bank.php:127
+#: gl/gl_bank.php:128
  msgid "Enter A &Payment"
  msgstr ""
  
  msgid "Enter A &Payment"
  msgstr ""
  
-#: gl/gl_bank.php:218
+#: gl/gl_bank.php:219
  msgid "You must enter at least one payment line."
  msgstr ""
  
  msgid "You must enter at least one payment line."
  msgstr ""
  
-#: gl/gl_bank.php:235 purchasing/supplier_payment.php:193
-#: purchasing/supplier_payment.php.orig:190
+#: gl/gl_bank.php:236 purchasing/supplier_payment.php:194
  #, 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:260
+#: gl/gl_bank.php:261
  msgid "The entered date for the payment is invalid."
  msgstr ""
  
  msgid "The entered date for the payment is invalid."
  msgstr ""
  
-#: gl/gl_bank.php:272
+#: gl/gl_bank.php:273
  msgid "You have to select customer and customer branch."
  msgstr ""
  
  msgid "You have to select customer and customer branch."
  msgstr ""
  
-#: gl/gl_bank.php:276
+#: gl/gl_bank.php:277
  msgid "You have to select supplier."
  msgstr ""
  
  msgid "You have to select supplier."
  msgstr ""
  
-#: gl/gl_bank.php:322
+#: gl/gl_bank.php:323
  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:394
+#: gl/gl_bank.php:395
  msgid "Payment Items"
  msgstr ""
  
  msgid "Payment Items"
  msgstr ""
  
-#: gl/gl_bank.php:394
+#: gl/gl_bank.php:395
  msgid "Deposit Items"
  msgstr ""
  
  msgid "Deposit Items"
  msgstr ""
  
-#: gl/gl_bank.php:402
+#: gl/gl_bank.php:403
  msgid "Process Payment"
  msgstr ""
  
  msgid "Process Payment"
  msgstr ""
  
-#: gl/gl_bank.php:402
+#: gl/gl_bank.php:403
  msgid "Process Deposit"
  msgstr ""
  
  msgid "Process Deposit"
  msgstr ""
  
@@ -3660,6 +3685,7 @@ 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."
@@ -3673,8 +3699,9 @@ msgstr ""
  msgid "The Budget has been deleted."
  msgstr ""
  
  msgid "The Budget has been deleted."
  msgstr ""
  
-#: gl/gl_budget.php:64 gl/manage/gl_accounts.php:231
-#: gl/manage/gl_accounts.php:241
+#: gl/gl_budget.php:64 gl/manage/gl_accounts.php:230
+#: gl/manage/gl_accounts.php:240 gl/manage/gl_accounts.php.orig:230
+#: gl/manage/gl_accounts.php.orig:240
  msgid "Account Code:"
  msgstr ""
  
  msgid "Account Code:"
  msgstr ""
  
@@ -3685,13 +3712,13 @@ msgstr ""
  #: gl/gl_budget.php:91 gl/gl_budget.php:93 gl/inquiry/profit_loss.php:231
  #: gl/manage/gl_quick_entries.php:240 reporting/rep101.php:136
  #: reporting/rep105.php:116 reporting/rep106.php:90 reporting/rep114.php:88
  #: gl/gl_budget.php:91 gl/gl_budget.php:93 gl/inquiry/profit_loss.php:231
  #: gl/manage/gl_quick_entries.php:240 reporting/rep101.php:136
  #: reporting/rep105.php:116 reporting/rep106.php:90 reporting/rep114.php:88
-#: reporting/rep201.php:124 reporting/rep304.php:121 reporting/rep305.php:100
-#: reporting/rep601.php:82 reporting/rep702.php:57 reporting/rep704.php:90
-#: reporting/rep704.php:100 reporting/rep704.php:108 reporting/rep706.php:181
+#: reporting/rep201.php:124 reporting/rep304.php:119 reporting/rep305.php:100
+#: reporting/rep601.php:82 reporting/rep702.php:57 reporting/rep704.php:91
+#: reporting/rep704.php:101 reporting/rep704.php:109 reporting/rep706.php:181
  #: reporting/rep706.php:189 reporting/rep706.php:199 reporting/rep706.php:207
  #: reporting/rep707.php:206 reporting/rep707.php:213 reporting/rep707.php:223
  #: reporting/rep706.php:189 reporting/rep706.php:199 reporting/rep706.php:207
  #: reporting/rep707.php:206 reporting/rep707.php:213 reporting/rep707.php:223
-#: reporting/rep707.php:231 reporting/rep708.php:186 reporting/rep708.php:195
-#: reporting/rep708.php:202 reporting/rep709.php:104 reporting/rep710.php:83
+#: reporting/rep707.php:231 reporting/rep708.php:187 reporting/rep708.php:196
+#: reporting/rep708.php:203 reporting/rep709.php:104 reporting/rep710.php:83
  msgid "Period"
  msgstr ""
  
  msgid "Period"
  msgstr ""
  
@@ -3705,7 +3732,7 @@ msgstr ""
  
  #: gl/gl_budget.php:127 gl/inquiry/balance_sheet.php:98
  #: gl/inquiry/balance_sheet.php:205 gl/inquiry/balance_sheet.php:236
  
  #: gl/gl_budget.php:127 gl/inquiry/balance_sheet.php:98
  #: gl/inquiry/balance_sheet.php:205 gl/inquiry/balance_sheet.php:236
-#: gl/inquiry/gl_trial_balance.php:209 gl/inquiry/profit_loss.php:115
+#: gl/inquiry/gl_trial_balance.php:210 gl/inquiry/profit_loss.php:115
  #: gl/inquiry/profit_loss.php:283 gl/view/gl_deposit_view.php:132
  #: gl/view/gl_payment_view.php:131 gl/view/gl_trans_view.php:106
  #: gl/includes/ui/gl_bank_ui.inc:182 gl/includes/ui/gl_bank_ui.inc.orig:182
  #: gl/inquiry/profit_loss.php:283 gl/view/gl_deposit_view.php:132
  #: gl/view/gl_payment_view.php:131 gl/view/gl_trans_view.php:106
  #: gl/includes/ui/gl_bank_ui.inc:182 gl/includes/ui/gl_bank_ui.inc.orig:182
@@ -3714,22 +3741,22 @@ msgstr ""
  #: inventory/includes/item_adjustments_ui.inc:102
  #: manufacturing/includes/manufacturing_ui.inc:178
  #: purchasing/includes/ui/invoice_ui.inc:309
  #: 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:473
-#: purchasing/includes/ui/invoice_ui.inc:543
+#: purchasing/includes/ui/invoice_ui.inc:474
+#: purchasing/includes/ui/invoice_ui.inc:544
  #: purchasing/po_receive_items.php:63 purchasing/view/view_po.php:140
  #: purchasing/allocations/supplier_allocation_main.php:100
  #: reporting/rep101.php:237 reporting/rep106.php:82 reporting/rep106.php:120
  #: reporting/rep106.php:168 reporting/rep114.php:156 reporting/rep201.php:221
  #: reporting/rep203.php:92 reporting/rep203.php:167 reporting/rep204.php:109
  #: purchasing/po_receive_items.php:63 purchasing/view/view_po.php:140
  #: purchasing/allocations/supplier_allocation_main.php:100
  #: reporting/rep101.php:237 reporting/rep106.php:82 reporting/rep106.php:120
  #: reporting/rep106.php:168 reporting/rep114.php:156 reporting/rep201.php:221
  #: reporting/rep203.php:92 reporting/rep203.php:167 reporting/rep204.php:109
-#: reporting/rep204.php:137 reporting/rep301.php:126 reporting/rep301.php:163
-#: reporting/rep304.php:144 reporting/rep304.php:186 reporting/rep305.php:95
+#: reporting/rep204.php:137 reporting/rep301.php:130 reporting/rep301.php:167
+#: reporting/rep304.php:142 reporting/rep304.php:184 reporting/rep305.php:95
  #: reporting/rep305.php:119 reporting/rep305.php:176 reporting/rep702.php:138
  #: reporting/rep705.php:152 reporting/rep705.php:309 reporting/rep706.php:106
  #: reporting/rep706.php:249 reporting/rep706.php:284 reporting/rep707.php:115
  #: reporting/rep305.php:119 reporting/rep305.php:176 reporting/rep702.php:138
  #: reporting/rep705.php:152 reporting/rep705.php:309 reporting/rep706.php:106
  #: reporting/rep706.php:249 reporting/rep706.php:284 reporting/rep707.php:115
-#: reporting/rep707.php:291 reporting/rep708.php:234
-#: reporting/includes/doctext.inc:105 reporting/includes/doctext.inc:113
-#: sales/customer_credit_invoice.php:283 sales/customer_delivery.php:430
-#: sales/customer_invoice.php:449
+#: reporting/rep707.php:291 reporting/rep708.php:235
+#: reporting/includes/doctext.inc:30 reporting/includes/doctext.inc:170
+#: sales/customer_credit_invoice.php:283 sales/customer_delivery.php:433
+#: sales/customer_invoice.php:468
  #: sales/allocations/customer_allocation_main.php:99
  #: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113
  #: sales/view/view_invoice.php:114 sales/view/view_sales_order.php:96
  #: sales/allocations/customer_allocation_main.php:99
  #: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113
  #: sales/view/view_invoice.php:114 sales/view/view_sales_order.php:96
@@ -3804,7 +3831,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:655
+#: gl/gl_journal.php:243 includes/ui/ui_view.inc:672
  #: 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 ""
@@ -3858,39 +3885,39 @@ msgstr ""
  msgid "Bank Statement"
  msgstr ""
  
  msgid "Bank Statement"
  msgstr ""
  
-#: gl/inquiry/bank_inquiry.php:78 gl/inquiry/gl_account_inquiry.php:161
-#: reporting/rep601.php:99 reporting/rep704.php:137
+#: gl/inquiry/bank_inquiry.php:78 gl/inquiry/gl_account_inquiry.php:162
+#: reporting/rep601.php:99 reporting/rep704.php:138
  msgid "Opening Balance"
  msgstr ""
  
  msgid "Opening Balance"
  msgstr ""
  
-#: gl/inquiry/bank_inquiry.php:123 gl/inquiry/gl_account_inquiry.php:210
-#: gl/inquiry/gl_trial_balance.php:219 reporting/rep601.php:150
-#: reporting/rep704.php:185 reporting/rep708.php:243
+#: gl/inquiry/bank_inquiry.php:123 gl/inquiry/gl_account_inquiry.php:211
+#: gl/inquiry/gl_trial_balance.php:220 reporting/rep601.php:150
+#: reporting/rep704.php:186 reporting/rep708.php:244
  msgid "Ending Balance"
  msgstr ""
  
  msgid "Ending Balance"
  msgstr ""
  
-#: gl/inquiry/gl_account_inquiry.php:30
+#: gl/inquiry/gl_account_inquiry.php:31
  msgid "General Ledger Inquiry"
  msgstr ""
  
  msgid "General Ledger Inquiry"
  msgstr ""
  
-#: gl/inquiry/gl_account_inquiry.php:69
+#: gl/inquiry/gl_account_inquiry.php:70
  msgid "All Accounts"
  msgstr ""
  
  msgid "All Accounts"
  msgstr ""
  
-#: gl/inquiry/gl_account_inquiry.php:82
+#: gl/inquiry/gl_account_inquiry.php:83
  msgid "Amount min:"
  msgstr ""
  
  msgid "Amount min:"
  msgstr ""
  
-#: gl/inquiry/gl_account_inquiry.php:83
+#: gl/inquiry/gl_account_inquiry.php:84
  msgid "Amount max:"
  msgstr ""
  
  msgid "Amount max:"
  msgstr ""
  
-#: gl/inquiry/gl_account_inquiry.php:219
+#: gl/inquiry/gl_account_inquiry.php:220
  msgid ""
  "No general ledger transactions have been created for the specified criteria."
  msgstr ""
  
  msgid ""
  "No general ledger transactions have been created for the specified criteria."
  msgstr ""
  
-#: gl/inquiry/gl_trial_balance.php:28 reporting/rep708.php:205
+#: gl/inquiry/gl_trial_balance.php:28 reporting/rep708.php:206
  msgid "Trial Balance"
  msgstr ""
  
  msgid "Trial Balance"
  msgstr ""
  
@@ -3898,43 +3925,43 @@ msgstr ""
  msgid "No zero values"
  msgstr ""
  
  msgid "No zero values"
  msgstr ""
  
-#: gl/inquiry/gl_trial_balance.php:56 reporting/reports_main.php:300
-#: reporting/reports_main.php:345 reporting/reports_main.php:385
+#: gl/inquiry/gl_trial_balance.php:56 reporting/reports_main.php:301
+#: reporting/reports_main.php:346 reporting/reports_main.php:386
  msgid "Only balances"
  msgstr ""
  
  msgid "Only balances"
  msgstr ""
  
-#: gl/inquiry/gl_trial_balance.php:89 gl/inquiry/gl_trial_balance.php:141
-#: reporting/rep706.php:302 reporting/rep707.php:320 reporting/rep708.php:50
-#: reporting/rep708.php:116 sales/create_recurrent_invoices.php:115
+#: gl/inquiry/gl_trial_balance.php:90 gl/inquiry/gl_trial_balance.php:142
+#: reporting/rep706.php:302 reporting/rep707.php:320 reporting/rep708.php:51
+#: reporting/rep708.php:117 sales/create_recurrent_invoices.php:115
  #: sales/manage/recurrent_invoices.php:102
  msgid "Group"
  msgstr ""
  
  #: sales/manage/recurrent_invoices.php:102
  msgid "Group"
  msgstr ""
  
-#: gl/inquiry/gl_trial_balance.php:158
+#: gl/inquiry/gl_trial_balance.php:159
  msgid "The from date cannot be bigger than the fiscal year end."
  msgstr ""
  
  msgid "The from date cannot be bigger than the fiscal year end."
  msgstr ""
  
-#: gl/inquiry/gl_trial_balance.php:171 gl/manage/bank_accounts.php:102
-#: gl/view/gl_trans_view.php:63 gl/view/gl_trans_view.php:66
-#: gl/view/gl_trans_view.php:69 reporting/rep701.php:109
-#: reporting/rep702.php:51 reporting/rep705.php:234 reporting/rep706.php:181
-#: reporting/rep707.php:206 reporting/rep708.php:178
+#: gl/inquiry/gl_trial_balance.php:172 gl/manage/bank_accounts.php:106
+#: gl/manage/bank_accounts.php.orig:106 gl/view/gl_trans_view.php:63
+#: gl/view/gl_trans_view.php:66 gl/view/gl_trans_view.php:69
+#: reporting/rep701.php:109 reporting/rep702.php:51 reporting/rep705.php:234
+#: reporting/rep706.php:181 reporting/rep707.php:206 reporting/rep708.php:179
  msgid "Account Name"
  msgstr ""
  
  msgid "Account Name"
  msgstr ""
  
-#: gl/inquiry/gl_trial_balance.php:172 reporting/rep708.php:171
+#: gl/inquiry/gl_trial_balance.php:173 reporting/rep708.php:172
  msgid "Brought Forward"
  msgstr ""
  
  msgid "Brought Forward"
  msgstr ""
  
-#: gl/inquiry/gl_trial_balance.php:173 reporting/rep708.php:171
+#: gl/inquiry/gl_trial_balance.php:174 reporting/rep708.php:172
  msgid "This Period"
  msgstr ""
  
  msgid "This Period"
  msgstr ""
  
-#: gl/inquiry/gl_trial_balance.php:192
+#: gl/inquiry/gl_trial_balance.php:193
  msgid "Class"
  msgstr ""
  
  msgid "Class"
  msgstr ""
  
-#: gl/inquiry/gl_trial_balance.php:227 reporting/rep708.php:264
+#: gl/inquiry/gl_trial_balance.php:228 reporting/rep708.php:265
  msgid ""
  "The Opening Balance is not in balance, probably due to a non closed Previous "
  "Fiscalyear."
  msgid ""
  "The Opening Balance is not in balance, probably due to a non closed Previous "
  "Fiscalyear."
@@ -3961,7 +3988,7 @@ msgid "Trans #"
  msgstr ""
  
  #: gl/inquiry/journal_inquiry.php:127 reporting/rep710.php:75
  msgstr ""
  
  #: gl/inquiry/journal_inquiry.php:127 reporting/rep710.php:75
-#: reporting/rep710.php:85 reporting/reports_main.php:399
+#: reporting/rep710.php:85 reporting/reports_main.php:400
  msgid "User"
  msgstr ""
  
  msgid "User"
  msgstr ""
  
@@ -3970,22 +3997,22 @@ msgid "Profit & Loss Drilldown"
  msgstr ""
  
  #: gl/inquiry/profit_loss.php:168 reporting/rep707.php:206
  msgstr ""
  
  #: gl/inquiry/profit_loss.php:168 reporting/rep707.php:206
-#: reporting/includes/reports_classes.inc:235
+#: reporting/includes/reports_classes.inc:234
  msgid "Accumulated"
  msgstr ""
  
  #: gl/inquiry/profit_loss.php:168 reporting/rep707.php:251
  msgid "Accumulated"
  msgstr ""
  
  #: gl/inquiry/profit_loss.php:168 reporting/rep707.php:251
-#: reporting/includes/reports_classes.inc:235
+#: reporting/includes/reports_classes.inc:234
  msgid "Period Y-1"
  msgstr ""
  
  #: gl/inquiry/profit_loss.php:168 reporting/rep707.php:242
  msgid "Period Y-1"
  msgstr ""
  
  #: gl/inquiry/profit_loss.php:168 reporting/rep707.php:242
-#: reporting/includes/reports_classes.inc:235
+#: reporting/includes/reports_classes.inc:234
  msgid "Budget"
  msgstr ""
  
  msgid "Budget"
  msgstr ""
  
-#: gl/inquiry/profit_loss.php:169 reporting/reports_main.php:288
-#: reporting/reports_main.php:334 reporting/reports_main.php:375
+#: gl/inquiry/profit_loss.php:169 reporting/reports_main.php:289
+#: reporting/reports_main.php:335 reporting/reports_main.php:376
  msgid "Compare to"
  msgstr ""
  
  msgid "Compare to"
  msgstr ""
  
@@ -4033,123 +4060,139 @@ msgstr ""
  msgid "Total payable or refund"
  msgstr ""
  
  msgid "Total payable or refund"
  msgstr ""
  
-#: gl/manage/bank_accounts.php:16 reporting/reports_main.php:237
+#: gl/manage/bank_accounts.php:16 gl/manage/bank_accounts.php.orig:16
+#: reporting/reports_main.php:238
  msgid "Bank Accounts"
  msgstr ""
  
  msgid "Bank Accounts"
  msgstr ""
  
-#: gl/manage/bank_accounts.php:33
+#: gl/manage/bank_accounts.php:33 gl/manage/bank_accounts.php.orig:33
  msgid "The bank account name cannot be empty."
  msgstr ""
  
  msgid "The bank account name cannot be empty."
  msgstr ""
  
-#: gl/manage/bank_accounts.php:47
+#: gl/manage/bank_accounts.php:39 gl/manage/bank_accounts.php.orig:39
+msgid "The GL account selected is already in use. Select another GL account."
+msgstr ""
+
+#: gl/manage/bank_accounts.php:52 gl/manage/bank_accounts.php.orig:52
  msgid "Bank account has been updated"
  msgstr ""
  
  msgid "Bank account has been updated"
  msgstr ""
  
-#: gl/manage/bank_accounts.php:56
+#: gl/manage/bank_accounts.php:61 gl/manage/bank_accounts.php.orig:61
  msgid "New bank account has been added"
  msgstr ""
  
  msgid "New bank account has been added"
  msgstr ""
  
-#: gl/manage/bank_accounts.php:72
+#: gl/manage/bank_accounts.php:76 gl/manage/bank_accounts.php.orig: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:78
+#: gl/manage/bank_accounts.php:82 gl/manage/bank_accounts.php.orig: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:83
+#: gl/manage/bank_accounts.php:87 gl/manage/bank_accounts.php.orig:87
  msgid "Selected bank account has been deleted"
  msgstr ""
  
  msgid "Selected bank account has been deleted"
  msgstr ""
  
-#: gl/manage/bank_accounts.php:102 gl/view/bank_transfer_view.php:69
-#: gl/view/bank_transfer_view.php:78 gl/view/gl_deposit_view.php:66
-#: gl/view/gl_payment_view.php:64 inventory/prices.php:133
-#: inventory/purchasing_data.php:129 purchasing/view/view_supp_credit.php:49
+#: gl/manage/bank_accounts.php:106 gl/manage/bank_accounts.php.orig:106
+#: gl/view/bank_transfer_view.php:69 gl/view/bank_transfer_view.php:78
+#: gl/view/gl_deposit_view.php:66 gl/view/gl_payment_view.php:64
+#: inventory/prices.php:133 inventory/purchasing_data.php:129
+#: purchasing/view/view_supp_credit.php:49
  #: purchasing/view/view_supp_invoice.php:53
  #: purchasing/view/view_supp_invoice.php:53
-#: purchasing/inquiry/po_search_completed.php:122
+#: purchasing/inquiry/po_search_completed.php:127
  #: purchasing/inquiry/po_search.php:136
  #: purchasing/inquiry/po_search.php:136
-#: purchasing/inquiry/supplier_allocation_inquiry.php:132
-#: purchasing/inquiry/supplier_allocation_inquiry.php:142
-#: purchasing/inquiry/supplier_inquiry.php:72
-#: purchasing/inquiry/supplier_inquiry.php:169
-#: purchasing/inquiry/supplier_inquiry.php:180
+#: purchasing/inquiry/supplier_allocation_inquiry.php:133
+#: purchasing/inquiry/supplier_allocation_inquiry.php:143
+#: purchasing/inquiry/supplier_inquiry.php:76
+#: purchasing/inquiry/supplier_inquiry.php:175
+#: purchasing/inquiry/supplier_inquiry.php:186
  #: purchasing/inquiry/supplier_inquiry.php.orig:72
  #: purchasing/inquiry/supplier_inquiry.php.orig:169
  #: purchasing/inquiry/supplier_inquiry.php.orig:180
  #: purchasing/allocations/supplier_allocation_main.php:99
  #: purchasing/allocations/supplier_allocation_main.php:107
  #: purchasing/inquiry/supplier_inquiry.php.orig:72
  #: purchasing/inquiry/supplier_inquiry.php.orig:169
  #: purchasing/inquiry/supplier_inquiry.php.orig:180
  #: purchasing/allocations/supplier_allocation_main.php:99
  #: purchasing/allocations/supplier_allocation_main.php:107
-#: reporting/rep101.php:138 reporting/rep102.php:133 reporting/rep102.php:139
+#: reporting/rep101.php:138 reporting/rep102.php:131 reporting/rep102.php:137
  #: reporting/rep104.php:114 reporting/rep201.php:126 reporting/rep202.php:136
  #: reporting/rep203.php:99 sales/customer_credit_invoice.php:239
  #: reporting/rep104.php:114 reporting/rep201.php:126 reporting/rep202.php:136
  #: reporting/rep203.php:99 sales/customer_credit_invoice.php:239
-#: sales/customer_delivery.php:337 sales/customer_invoice.php:398
+#: sales/customer_delivery.php:340 sales/customer_invoice.php:402
  #: sales/allocations/customer_allocation_main.php:98
  #: sales/allocations/customer_allocation_main.php:106
  #: sales/view/view_credit.php:70 sales/view/view_dispatch.php:86
  #: sales/view/view_invoice.php:85
  #: sales/allocations/customer_allocation_main.php:98
  #: sales/allocations/customer_allocation_main.php:106
  #: sales/view/view_credit.php:70 sales/view/view_dispatch.php:86
  #: sales/view/view_invoice.php:85
-#: sales/inquiry/customer_allocation_inquiry.php:148
-#: sales/inquiry/customer_allocation_inquiry.php:158
-#: sales/inquiry/customer_inquiry.php:76
-#: sales/inquiry/customer_inquiry.php:220
-#: sales/inquiry/customer_inquiry.php:233
+#: sales/inquiry/customer_allocation_inquiry.php:151
+#: sales/inquiry/customer_allocation_inquiry.php:161
+#: sales/inquiry/customer_inquiry.php:80
+#: sales/inquiry/customer_inquiry.php:232
+#: sales/inquiry/customer_inquiry.php:245
+#: sales/inquiry/customer_inquiry.php.orig:80
+#: sales/inquiry/customer_inquiry.php.orig:232
+#: sales/inquiry/customer_inquiry.php.orig:245
  #: sales/inquiry/sales_deliveries_view.php:189
  #: sales/inquiry/sales_deliveries_view.php:189
-#: sales/inquiry/sales_orders_view.php:263
-#: sales/inquiry/sales_orders_view.php:277
+#: sales/inquiry/sales_orders_view.php:270
+#: sales/inquiry/sales_orders_view.php:284
+#: sales/inquiry/sales_orders_view.php.orig:270
+#: sales/inquiry/sales_orders_view.php.orig:284
  msgid "Currency"
  msgstr ""
  
  msgid "Currency"
  msgstr ""
  
-#: gl/manage/bank_accounts.php:102
+#: gl/manage/bank_accounts.php:106 gl/manage/bank_accounts.php.orig:106
  msgid "GL Account"
  msgstr ""
  
  msgid "GL Account"
  msgstr ""
  
-#: gl/manage/bank_accounts.php:103 reporting/includes/doctext.inc:79
+#: gl/manage/bank_accounts.php:107 gl/manage/bank_accounts.php.orig:107
+#: reporting/includes/doctext.inc:247
  msgid "Bank"
  msgstr ""
  
  msgid "Bank"
  msgstr ""
  
-#: gl/manage/bank_accounts.php:103 includes/ui/ui_view.inc:488
+#: gl/manage/bank_accounts.php:107 gl/manage/bank_accounts.php.orig:107
+#: includes/ui/ui_view.inc:488
  msgid "Number"
  msgstr ""
  
  msgid "Number"
  msgstr ""
  
-#: gl/manage/bank_accounts.php:103
+#: gl/manage/bank_accounts.php:107 gl/manage/bank_accounts.php.orig:107
  msgid "Bank Address"
  msgstr ""
  
  msgid "Bank Address"
  msgstr ""
  
-#: gl/manage/bank_accounts.php:103
+#: gl/manage/bank_accounts.php:107 gl/manage/bank_accounts.php.orig:107
  msgid "Dflt"
  msgstr ""
  
  msgid "Dflt"
  msgstr ""
  
-#: gl/manage/bank_accounts.php:159
+#: gl/manage/bank_accounts.php:163 gl/manage/bank_accounts.php.orig:163
  msgid "Bank Account Name:"
  msgstr ""
  
  msgid "Bank Account Name:"
  msgstr ""
  
-#: gl/manage/bank_accounts.php:163 gl/manage/bank_accounts.php:167
+#: 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 ""
  
  msgid "Account Type:"
  msgstr ""
  
-#: gl/manage/bank_accounts.php:171 gl/manage/bank_accounts.php:175
+#: 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:178
+#: gl/manage/bank_accounts.php:182 gl/manage/bank_accounts.php.orig:182
  msgid "Default currency account:"
  msgstr ""
  
  msgid "Default currency account:"
  msgstr ""
  
-#: gl/manage/bank_accounts.php:181 gl/manage/bank_accounts.php:183
+#: 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:185
+#: gl/manage/bank_accounts.php:189 gl/manage/bank_accounts.php.orig:189
  msgid "Bank Name:"
  msgstr ""
  
  msgid "Bank Name:"
  msgstr ""
  
-#: gl/manage/bank_accounts.php:186
+#: gl/manage/bank_accounts.php:190 gl/manage/bank_accounts.php.orig:190
  msgid "Bank Account Number:"
  msgstr ""
  
  msgid "Bank Account Number:"
  msgstr ""
  
-#: gl/manage/bank_accounts.php:187
+#: gl/manage/bank_accounts.php:191 gl/manage/bank_accounts.php.orig:191
  msgid "Bank Address:"
  msgstr ""
  
  msgid "Bank Address:"
  msgstr ""
  
@@ -4181,83 +4224,83 @@ msgstr ""
  msgid "New currency has been added"
  msgstr ""
  
  msgid "New currency has been added"
  msgstr ""
  
-#: gl/manage/currencies.php:94
+#: gl/manage/currencies.php:92
  msgid ""
  "Cannot delete this currency, because customer accounts have been created "
  "referring to this currency."
  msgstr ""
  
  msgid ""
  "Cannot delete this currency, because customer accounts have been created "
  "referring to this currency."
  msgstr ""
  
-#: gl/manage/currencies.php:100
+#: gl/manage/currencies.php:98
  msgid ""
  "Cannot delete this currency, because supplier accounts have been created "
  "referring to this currency."
  msgstr ""
  
  msgid ""
  "Cannot delete this currency, because supplier accounts have been created "
  "referring to this currency."
  msgstr ""
  
-#: gl/manage/currencies.php:106
+#: gl/manage/currencies.php:104
  msgid ""
  "Cannot delete this currency, because the company preferences uses this "
  "currency."
  msgstr ""
  
  msgid ""
  "Cannot delete this currency, because the company preferences uses this "
  "currency."
  msgstr ""
  
-#: gl/manage/currencies.php:113
+#: gl/manage/currencies.php:111
  msgid ""
  "Cannot delete this currency, because thre are bank accounts that use this "
  "currency."
  msgstr ""
  
  msgid ""
  "Cannot delete this currency, because thre are bank accounts that use this "
  "currency."
  msgstr ""
  
-#: gl/manage/currencies.php:128
+#: gl/manage/currencies.php:126
  msgid "Selected currency has been deleted"
  msgstr ""
  
  msgid "Selected currency has been deleted"
  msgstr ""
  
-#: gl/manage/currencies.php:141
+#: gl/manage/currencies.php:139
  msgid "Abbreviation"
  msgstr ""
  
  msgid "Abbreviation"
  msgstr ""
  
-#: gl/manage/currencies.php:141
+#: gl/manage/currencies.php:139
  msgid "Symbol"
  msgstr ""
  
  msgid "Symbol"
  msgstr ""
  
-#: gl/manage/currencies.php:141
+#: gl/manage/currencies.php:139
  msgid "Currency Name"
  msgstr ""
  
  msgid "Currency Name"
  msgstr ""
  
-#: gl/manage/currencies.php:142
+#: gl/manage/currencies.php:140
  msgid "Hundredths name"
  msgstr ""
  
  msgid "Hundredths name"
  msgstr ""
  
-#: gl/manage/currencies.php:142
+#: gl/manage/currencies.php:140
  msgid "Country"
  msgstr ""
  
  msgid "Country"
  msgstr ""
  
-#: gl/manage/currencies.php:142
+#: gl/manage/currencies.php:140
  msgid "Auto update"
  msgstr ""
  
  msgid "Auto update"
  msgstr ""
  
-#: gl/manage/currencies.php:177
+#: gl/manage/currencies.php:175
  msgid "The marked currency is the home currency which cannot be deleted."
  msgstr ""
  
  msgid "The marked currency is the home currency which cannot be deleted."
  msgstr ""
  
-#: gl/manage/currencies.php:203 gl/manage/currencies.php:208
+#: gl/manage/currencies.php:201 gl/manage/currencies.php:206
  msgid "Currency Abbreviation:"
  msgstr ""
  
  msgid "Currency Abbreviation:"
  msgstr ""
  
-#: gl/manage/currencies.php:211
+#: gl/manage/currencies.php:209
  msgid "Currency Symbol:"
  msgstr ""
  
  msgid "Currency Symbol:"
  msgstr ""
  
-#: gl/manage/currencies.php:212
+#: gl/manage/currencies.php:210
  msgid "Currency Name:"
  msgstr ""
  
  msgid "Currency Name:"
  msgstr ""
  
-#: gl/manage/currencies.php:213
+#: gl/manage/currencies.php:211
  msgid "Hundredths Name:"
  msgstr ""
  
  msgid "Hundredths Name:"
  msgstr ""
  
-#: gl/manage/currencies.php:214
+#: gl/manage/currencies.php:212
  msgid "Country:"
  msgstr ""
  
  msgid "Country:"
  msgstr ""
  
-#: gl/manage/currencies.php:215
+#: gl/manage/currencies.php:213
  msgid "Automatic exchange rate update:"
  msgstr ""
  
  msgid "Automatic exchange rate update:"
  msgstr ""
  
@@ -4350,7 +4393,7 @@ msgstr ""
  msgid "Class Name"
  msgstr ""
  
  msgid "Class Name"
  msgstr ""
  
-#: gl/manage/gl_account_classes.php:110 gl/manage/gl_account_types.php:129
+#: gl/manage/gl_account_classes.php:110 gl/manage/gl_account_types.php:128
  msgid "Class Type"
  msgstr ""
  
  msgid "Class Type"
  msgstr ""
  
@@ -4367,120 +4410,121 @@ msgstr ""
  msgid "Class Name:"
  msgstr ""
  
  msgid "Class Name:"
  msgstr ""
  
-#: gl/manage/gl_account_classes.php:171 gl/manage/gl_account_types.php:193
+#: gl/manage/gl_account_classes.php:171 gl/manage/gl_account_types.php:192
  msgid "Class Type:"
  msgstr ""
  
  msgid "Class Type:"
  msgstr ""
  
-#: gl/manage/gl_accounts.php:16 reporting/rep701.php:115
+#: gl/manage/gl_accounts.php:16 gl/manage/gl_accounts.php.orig:16
+#: reporting/rep701.php:115
  msgid "Chart of Accounts"
  msgstr ""
  
  msgid "Chart of Accounts"
  msgstr ""
  
-#: gl/manage/gl_accounts.php:53
+#: gl/manage/gl_accounts.php:53 gl/manage/gl_accounts.php.orig: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:59 gl/manage/gl_accounts.php.orig: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:65 gl/manage/gl_accounts.php.orig:65
  msgid "The account code must be numeric."
  msgstr ""
  
  msgid "The account code must be numeric."
  msgstr ""
  
-#: gl/manage/gl_accounts.php:81
+#: gl/manage/gl_accounts.php:81 gl/manage/gl_accounts.php.orig:81
  msgid "The account belongs to a bank account and cannot be inactivated."
  msgstr ""
  
  msgid "The account belongs to a bank account and cannot be inactivated."
  msgstr ""
  
-#: gl/manage/gl_accounts.php:90
+#: gl/manage/gl_accounts.php:90 gl/manage/gl_accounts.php.orig:90
  msgid "Account data has been updated."
  msgstr ""
  
  msgid "Account data has been updated."
  msgstr ""
  
-#: gl/manage/gl_accounts.php:99
+#: gl/manage/gl_accounts.php:99 gl/manage/gl_accounts.php.orig:99
  msgid "New account has been added."
  msgstr ""
  
  msgid "New account has been added."
  msgstr ""
  
-#: gl/manage/gl_accounts.php:117
+#: gl/manage/gl_accounts.php:116 gl/manage/gl_accounts.php.orig:116
  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:122 gl/manage/gl_accounts.php.orig:122
  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:128 gl/manage/gl_accounts.php.orig:128
  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:134 gl/manage/gl_accounts.php.orig:134
  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:140 gl/manage/gl_accounts.php.orig:140
  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:146 gl/manage/gl_accounts.php.orig:146
  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:152 gl/manage/gl_accounts.php.orig:152
  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:158 gl/manage/gl_accounts.php.orig:158
  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:164 gl/manage/gl_accounts.php.orig:164
  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:182 gl/manage/gl_accounts.php.orig:182
  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:197 gl/manage/gl_accounts.php.orig:197
  msgid "New account"
  msgstr ""
  
  msgid "New account"
  msgstr ""
  
-#: gl/manage/gl_accounts.php:244
+#: gl/manage/gl_accounts.php:243 gl/manage/gl_accounts.php.orig:243
  msgid "Account Code 2:"
  msgstr ""
  
  msgid "Account Code 2:"
  msgstr ""
  
-#: gl/manage/gl_accounts.php:246
+#: gl/manage/gl_accounts.php:245 gl/manage/gl_accounts.php.orig:245
  msgid "Account Name:"
  msgstr ""
  
  msgid "Account Name:"
  msgstr ""
  
-#: gl/manage/gl_accounts.php:248
+#: gl/manage/gl_accounts.php:247 gl/manage/gl_accounts.php.orig:247
  msgid "Account Group:"
  msgstr ""
  
  msgid "Account Group:"
  msgstr ""
  
-#: gl/manage/gl_accounts.php:250
+#: gl/manage/gl_accounts.php:249 gl/manage/gl_accounts.php.orig:249
  msgid "Account Tags:"
  msgstr ""
  
  msgid "Account Tags:"
  msgstr ""
  
-#: gl/manage/gl_accounts.php:252
+#: gl/manage/gl_accounts.php:251 gl/manage/gl_accounts.php.orig:251
  msgid "Account status:"
  msgstr ""
  
  msgid "Account status:"
  msgstr ""
  
-#: gl/manage/gl_accounts.php:257
+#: gl/manage/gl_accounts.php:256 gl/manage/gl_accounts.php.orig:256
  msgid "Add Account"
  msgstr ""
  
  msgid "Add Account"
  msgstr ""
  
-#: gl/manage/gl_accounts.php:261
+#: gl/manage/gl_accounts.php:260 gl/manage/gl_accounts.php.orig:260
  msgid "Update Account"
  msgstr ""
  
  msgid "Update Account"
  msgstr ""
  
-#: gl/manage/gl_accounts.php:262
+#: gl/manage/gl_accounts.php:261 gl/manage/gl_accounts.php.orig:261
  msgid "Delete account"
  msgstr ""
  
  msgid "Delete account"
  msgstr ""
  
@@ -4512,39 +4556,39 @@ msgstr ""
  msgid "New account type has been added"
  msgstr ""
  
  msgid "New account type has been added"
  msgstr ""
  
-#: gl/manage/gl_account_types.php:90
+#: gl/manage/gl_account_types.php:89
  msgid ""
  "Cannot delete this account group because GL accounts have been created "
  "referring to it."
  msgstr ""
  
  msgid ""
  "Cannot delete this account group because GL accounts have been created "
  "referring to it."
  msgstr ""
  
-#: gl/manage/gl_account_types.php:96
+#: gl/manage/gl_account_types.php:95
  msgid ""
  "Cannot delete this account group because GL account groups have been created "
  "referring to it."
  msgstr ""
  
  msgid ""
  "Cannot delete this account group because GL account groups have been created "
  "referring to it."
  msgstr ""
  
-#: gl/manage/gl_account_types.php:112
+#: gl/manage/gl_account_types.php:111
  msgid "Selected account group has been deleted"
  msgstr ""
  
  msgid "Selected account group has been deleted"
  msgstr ""
  
-#: gl/manage/gl_account_types.php:129
+#: gl/manage/gl_account_types.php:128
  msgid "Group ID"
  msgstr ""
  
  msgid "Group ID"
  msgstr ""
  
-#: gl/manage/gl_account_types.php:129 sales/manage/sales_groups.php:85
+#: gl/manage/gl_account_types.php:128 sales/manage/sales_groups.php:85
  msgid "Group Name"
  msgstr ""
  
  msgid "Group Name"
  msgstr ""
  
-#: gl/manage/gl_account_types.php:129
+#: gl/manage/gl_account_types.php:128
  msgid "Subgroup Of"
  msgstr ""
  
  msgid "Subgroup Of"
  msgstr ""
  
-#: gl/manage/gl_account_types.php:188
+#: gl/manage/gl_account_types.php:187
  msgid "ID:"
  msgstr ""
  
  msgid "ID:"
  msgstr ""
  
-#: gl/manage/gl_account_types.php:191
+#: gl/manage/gl_account_types.php:190
  msgid "Subgroup Of:"
  msgstr ""
  
  msgid "Subgroup Of:"
  msgstr ""
  
@@ -4639,8 +4683,8 @@ msgstr ""
  msgid "Posted"
  msgstr ""
  
  msgid "Posted"
  msgstr ""
  
-#: gl/manage/gl_quick_entries.php:329 sales/customer_delivery.php:430
-#: sales/customer_invoice.php:449
+#: gl/manage/gl_quick_entries.php:329 sales/customer_delivery.php:433
+#: sales/customer_invoice.php:468
  msgid "Tax Type"
  msgstr ""
  
  msgid "Tax Type"
  msgstr ""
  
@@ -4713,7 +4757,7 @@ msgstr ""
  #: reporting/reports_main.php:102 reporting/reports_main.php:114
  #: reporting/reports_main.php:121 reporting/reports_main.php:127
  #: reporting/reports_main.php:163 reporting/reports_main.php:169
  #: reporting/reports_main.php:102 reporting/reports_main.php:114
  #: reporting/reports_main.php:121 reporting/reports_main.php:127
  #: reporting/reports_main.php:163 reporting/reports_main.php:169
-#: reporting/reports_main.php:218
+#: reporting/reports_main.php:219
  msgid "From"
  msgstr ""
  
  msgid "From"
  msgstr ""
  
@@ -4774,12 +4818,12 @@ msgstr ""
  msgid "Pay To"
  msgstr ""
  
  msgid "Pay To"
  msgstr ""
  
-#: gl/view/gl_payment_view.php:70 purchasing/view/view_supp_payment.php:61
-#: sales/view/view_receipt.php:48
+#: gl/view/gl_payment_view.php:70 purchasing/view/view_supp_payment.php:64
+#: purchasing/view/view_supp_payment.php:78 sales/view/view_receipt.php:48
  msgid "Payment Type"
  msgstr ""
  
  msgid "Payment Type"
  msgstr ""
  
-#: gl/view/gl_payment_view.php:79 purchasing/view/view_supp_payment.php:76
+#: gl/view/gl_payment_view.php:79 purchasing/view/view_supp_payment.php:85
  msgid "This payment has been voided."
  msgstr ""
  
  msgid "This payment has been voided."
  msgstr ""
  
@@ -4816,15 +4860,15 @@ msgstr ""
  #: reporting/reports_main.php:96 reporting/reports_main.php:103
  #: reporting/reports_main.php:115 reporting/reports_main.php:122
  #: reporting/reports_main.php:128 reporting/reports_main.php:164
  #: reporting/reports_main.php:96 reporting/reports_main.php:103
  #: reporting/reports_main.php:115 reporting/reports_main.php:122
  #: reporting/reports_main.php:128 reporting/reports_main.php:164
-#: reporting/reports_main.php:170 reporting/reports_main.php:219
+#: reporting/reports_main.php:170 reporting/reports_main.php:220
  msgid "To"
  msgstr ""
  
  msgid "To"
  msgstr ""
  
-#: gl/includes/db/gl_db_banking.inc:311
+#: gl/includes/db/gl_db_banking.inc:428
  msgid "Document reentered."
  msgstr ""
  
  msgid "Document reentered."
  msgstr ""
  
-#: gl/includes/db/gl_db_rates.inc:129
+#: gl/includes/db/gl_db_rates.inc:130
  #, php-format
  msgid ""
  "Cannot retrieve currency rate from %s page. Please set the rate manually."
  #, php-format
  msgid ""
  "Cannot retrieve currency rate from %s page. Please set the rate manually."
@@ -4866,8 +4910,7 @@ msgid "Customer:"
  msgstr ""
  
  #: gl/includes/ui/gl_bank_ui.inc:69 gl/includes/ui/gl_bank_ui.inc.orig:69
  msgstr ""
  
  #: gl/includes/ui/gl_bank_ui.inc:69 gl/includes/ui/gl_bank_ui.inc.orig:69
-#: sales/customer_payments.php:238 sales/customer_payments.php.orig:240
-#: sales/manage/recurrent_invoices.php:172
+#: sales/customer_payments.php:360 sales/manage/recurrent_invoices.php:172
  #: sales/includes/ui/sales_credit_ui.inc:37
  #: sales/includes/ui/sales_order_ui.inc:285
  msgid "Branch:"
  #: sales/includes/ui/sales_credit_ui.inc:37
  #: sales/includes/ui/sales_order_ui.inc:285
  msgid "Branch:"
@@ -4884,7 +4927,7 @@ msgstr ""
  #: 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:519
+#: purchasing/includes/ui/invoice_ui.inc:520
  #: purchasing/includes/ui/po_ui.inc:267
  #: sales/includes/ui/sales_credit_ui.inc:198
  #: sales/includes/ui/sales_order_ui.inc:203
  #: purchasing/includes/ui/po_ui.inc:267
  #: sales/includes/ui/sales_credit_ui.inc:198
  #: sales/includes/ui/sales_order_ui.inc:203
@@ -5034,8 +5077,8 @@ msgstr ""
  msgid "Dimensions configuration"
  msgstr ""
  
  msgid "Dimensions configuration"
  msgstr ""
  
-#: includes/access_levels.inc:72 inventory/manage/items.php:351
-#: reporting/reports_main.php:222
+#: includes/access_levels.inc:72 inventory/manage/items.php:339
+#: reporting/reports_main.php:223
  msgid "Dimensions"
  msgstr ""
  
  msgid "Dimensions"
  msgstr ""
  
@@ -5514,22 +5557,22 @@ msgid ""
  "rate manually on Exchange Rates page."
  msgstr ""
  
  "rate manually on Exchange Rates page."
  msgstr ""
  
-#: includes/current_user.inc:79
+#: includes/current_user.inc:87 includes/ldap.current_user.inc:96
  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:80 includes/ui/ui_controls.inc:190
-#: includes/ui/ui_view.inc:826
+#: includes/current_user.inc:88 includes/ldap.current_user.inc:97
+#: includes/ui/ui_controls.inc:190 includes/ui/ui_view.inc:843
  msgid "Back"
  msgstr ""
  
  msgid "Back"
  msgstr ""
  
-#: includes/current_user.inc:90
+#: includes/current_user.inc:98 includes/ldap.current_user.inc:107
  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:428
+#: includes/current_user.inc:436 includes/ldap.current_user.inc:544
  msgid "Requesting data..."
  msgstr ""
  
  msgid "Requesting data..."
  msgstr ""
  
@@ -5541,15 +5584,15 @@ msgstr ""
  msgid "at line "
  msgstr ""
  
  msgid "at line "
  msgstr ""
  
-#: includes/errors.inc:173
+#: includes/errors.inc:177
  msgid "Debug mode database warning:"
  msgstr ""
  
  msgid "Debug mode database warning:"
  msgstr ""
  
-#: includes/errors.inc:175
+#: includes/errors.inc:179
  msgid "DATABASE ERROR :"
  msgstr ""
  
  msgid "DATABASE ERROR :"
  msgstr ""
  
-#: includes/errors.inc:206
+#: includes/errors.inc:210
  msgid ""
  "The entered information is a duplicate. Please go back and enter different "
  "values."
  msgid ""
  "The entered information is a duplicate. Please go back and enter different "
  "values."
@@ -5564,78 +5607,83 @@ msgstr ""
  msgid "No key field '%s' in file '%s'"
  msgstr ""
  
  msgid "No key field '%s' in file '%s'"
  msgstr ""
  
-#: includes/packages.inc:295
+#: includes/packages.inc:295 includes/packages.inc:329
+#, php-format
+msgid "Cannot delete outdated '%s' file."
+msgstr ""
+
+#: includes/packages.inc:299
  msgid "Release file in repository is invalid, or public key is outdated."
  msgstr ""
  
  msgid "Release file in repository is invalid, or public key is outdated."
  msgstr ""
  
-#: includes/packages.inc:311
+#: includes/packages.inc:316
  msgid "Repository version does not match application version."
  msgstr ""
  
  msgid "Repository version does not match application version."
  msgstr ""
  
-#: includes/packages.inc:325
+#: includes/packages.inc:333
  #, php-format
  msgid ""
  "Security alert: broken index file in repository '%s'. Please inform "
  "repository administrator about this issue."
  msgstr ""
  
  #, php-format
  msgid ""
  "Security alert: broken index file in repository '%s'. Please inform "
  "repository administrator about this issue."
  msgstr ""
  
-#: includes/packages.inc:358
+#: includes/packages.inc:366
  #, php-format
  msgid ""
  "Security alert: broken package '%s' in repository. Please inform repository "
  "administrator about this issue."
  msgstr ""
  
  #, php-format
  msgid ""
  "Security alert: broken package '%s' in repository. Please inform repository "
  "administrator about this issue."
  msgstr ""
  
-#: includes/packages.inc:613 includes/packages.inc:664
+#: includes/packages.inc:621 includes/packages.inc:672
  #, php-format
  msgid "Package '%s' not found."
  msgstr ""
  
  #, php-format
  msgid "Package '%s' not found."
  msgstr ""
  
-#: includes/session.inc:39
+#: includes/session.inc:133 includes/session.inc.ldap.inc:39
  msgid "Incorrect Password"
  msgstr ""
  
  msgid "Incorrect Password"
  msgstr ""
  
-#: includes/session.inc:40
+#: includes/session.inc:134 includes/session.inc.ldap.inc:40
  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:42
+#: includes/session.inc:136 includes/session.inc.ldap.inc:42
  msgid ""
  "If you are not an authorized user, please contact your system administrator "
  "to obtain an account to enable you to use the system."
  msgstr ""
  
  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:43
+#: includes/session.inc:137 includes/session.inc.ldap.inc:43
  msgid "Try again"
  msgstr ""
  
  msgid "Try again"
  msgstr ""
  
-#: includes/session.inc:62
+#: includes/session.inc:156 includes/session.inc.ldap.inc:62
  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:63
+#: includes/session.inc:157 includes/session.inc.ldap.inc:63
  msgid "Please contact your system administrator."
  msgstr ""
  
  msgid "Please contact your system administrator."
  msgstr ""
  
-#: includes/session.inc:64
+#: includes/session.inc:158 includes/session.inc.ldap.inc:64
  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:66
+#: includes/session.inc:160 includes/session.inc.ldap.inc:66
  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:80
+#: includes/session.inc:174 includes/session.inc.ldap.inc:80
  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:89
+#: includes/session.inc:183 includes/session.inc.ldap.inc:89
  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"
@@ -5710,12 +5758,14 @@ msgstr ""
  msgid "Work Order Production"
  msgstr ""
  
  msgid "Work Order Production"
  msgstr ""
  
-#: includes/sysnames.inc:40 sales/inquiry/sales_orders_view.php:134
-#: sales/inquiry/sales_orders_view.php:156
+#: includes/sysnames.inc:40 sales/inquiry/sales_orders_view.php:137
+#: sales/inquiry/sales_orders_view.php:159
+#: sales/inquiry/sales_orders_view.php.orig:137
+#: sales/inquiry/sales_orders_view.php.orig:159
  msgid "Sales Order"
  msgstr ""
  
  msgid "Sales Order"
  msgstr ""
  
-#: includes/sysnames.inc:41 sales/sales_order_entry.php:615
+#: includes/sysnames.inc:41 sales/sales_order_entry.php:614
  msgid "Sales Quotation"
  msgstr ""
  
  msgid "Sales Quotation"
  msgstr ""
  
@@ -5751,7 +5801,7 @@ msgstr ""
  msgid "CP"
  msgstr ""
  
  msgid "CP"
  msgstr ""
  
-#: includes/sysnames.inc:54 sales/customer_invoice.php:452
+#: includes/sysnames.inc:54 sales/customer_invoice.php:471
  msgid "DN"
  msgstr ""
  
  msgid "DN"
  msgstr ""
  
@@ -5839,24 +5889,28 @@ msgstr ""
  msgid "Cash"
  msgstr ""
  
  msgid "Cash"
  msgstr ""
  
-#: includes/sysnames.inc:96 reporting/rep101.php:137 reporting/rep102.php:125
-#: reporting/rep102.php:132 reporting/rep105.php:107 reporting/rep106.php:81
-#: reporting/rep114.php:93 reporting/rep304.php:114 reporting/rep304.php:124
+#: includes/sysnames.inc:96 reporting/rep101.php:137 reporting/rep102.php:123
+#: reporting/rep102.php:130 reporting/rep105.php:107 reporting/rep106.php:81
+#: reporting/rep114.php:93 reporting/rep304.php:112 reporting/rep304.php:122
  #: reporting/reports_main.php:32 reporting/reports_main.php:36
  #: reporting/reports_main.php:43 reporting/reports_main.php:108
  #: reporting/reports_main.php:32 reporting/reports_main.php:36
  #: reporting/reports_main.php:43 reporting/reports_main.php:108
-#: reporting/reports_main.php:202 sales/create_recurrent_invoices.php:115
-#: sales/customer_credit_invoice.php:237 sales/customer_delivery.php:335
-#: sales/customer_invoice.php:374
+#: reporting/reports_main.php:203 sales/create_recurrent_invoices.php:115
+#: sales/customer_credit_invoice.php:237 sales/customer_delivery.php:338
+#: sales/customer_invoice.php:378
  #: sales/allocations/customer_allocation_main.php:97
  #: sales/allocations/customer_allocation_main.php:105
  #: sales/manage/recurrent_invoices.php:102 sales/view/view_credit.php:47
  #: sales/allocations/customer_allocation_main.php:97
  #: sales/allocations/customer_allocation_main.php:105
  #: sales/manage/recurrent_invoices.php:102 sales/view/view_credit.php:47
-#: sales/inquiry/customer_allocation_inquiry.php:147
-#: sales/inquiry/customer_allocation_inquiry.php:157
-#: sales/inquiry/customer_inquiry.php:218
-#: sales/inquiry/customer_inquiry.php:232
+#: sales/inquiry/customer_allocation_inquiry.php:150
+#: sales/inquiry/customer_allocation_inquiry.php:160
+#: sales/inquiry/customer_inquiry.php:230
+#: sales/inquiry/customer_inquiry.php:244
+#: sales/inquiry/customer_inquiry.php.orig:230
+#: sales/inquiry/customer_inquiry.php.orig:244
  #: sales/inquiry/sales_deliveries_view.php:180
  #: sales/inquiry/sales_deliveries_view.php:180
-#: sales/inquiry/sales_orders_view.php:255
-#: sales/inquiry/sales_orders_view.php:269
+#: sales/inquiry/sales_orders_view.php:262
+#: sales/inquiry/sales_orders_view.php:276
+#: sales/inquiry/sales_orders_view.php.orig:262
+#: sales/inquiry/sales_orders_view.php.orig:276
  msgid "Customer"
  msgstr ""
  
  msgid "Customer"
  msgstr ""
  
@@ -5865,12 +5919,12 @@ msgstr ""
  #: purchasing/includes/ui/po_ui.inc:316
  #: purchasing/view/view_supp_credit.php:42
  #: purchasing/view/view_supp_invoice.php:45
  #: purchasing/includes/ui/po_ui.inc:316
  #: purchasing/view/view_supp_credit.php:42
  #: purchasing/view/view_supp_invoice.php:45
-#: purchasing/inquiry/po_search_completed.php:118
+#: purchasing/inquiry/po_search_completed.php:123
  #: purchasing/inquiry/po_search.php:132
  #: purchasing/inquiry/po_search.php:132
-#: purchasing/inquiry/supplier_allocation_inquiry.php:128
-#: purchasing/inquiry/supplier_allocation_inquiry.php:141
-#: purchasing/inquiry/supplier_inquiry.php:165
-#: purchasing/inquiry/supplier_inquiry.php:179
+#: purchasing/inquiry/supplier_allocation_inquiry.php:129
+#: purchasing/inquiry/supplier_allocation_inquiry.php:142
+#: purchasing/inquiry/supplier_inquiry.php:171
+#: purchasing/inquiry/supplier_inquiry.php:185
  #: purchasing/inquiry/supplier_inquiry.php.orig:165
  #: purchasing/inquiry/supplier_inquiry.php.orig:179
  #: purchasing/allocations/supplier_allocation_main.php:98
  #: purchasing/inquiry/supplier_inquiry.php.orig:165
  #: purchasing/inquiry/supplier_inquiry.php.orig:179
  #: purchasing/allocations/supplier_allocation_main.php:98
@@ -6229,7 +6283,7 @@ msgid "Test type"
  msgstr ""
  
  #: includes/system_tests.inc:411 includes/ui/view_package.php:37
  msgstr ""
  
  #: includes/system_tests.inc:411 includes/ui/view_package.php:37
-#: reporting/rep204.php:83 reporting/rep301.php:100
+#: reporting/rep204.php:83 reporting/rep301.php:103
  msgid "Value"
  msgstr ""
  
  msgid "Value"
  msgstr ""
  
@@ -6243,23 +6297,23 @@ msgstr ""
  #: reporting/reports_main.php:130 reporting/reports_main.php:139
  #: reporting/reports_main.php:149 reporting/reports_main.php:156
  #: reporting/reports_main.php:160 reporting/reports_main.php:167
  #: reporting/reports_main.php:130 reporting/reports_main.php:139
  #: reporting/reports_main.php:149 reporting/reports_main.php:156
  #: reporting/reports_main.php:160 reporting/reports_main.php:167
-#: reporting/reports_main.php:173 reporting/reports_main.php:181
-#: reporting/reports_main.php:186 reporting/reports_main.php:195
-#: reporting/reports_main.php:203 reporting/reports_main.php:208
-#: reporting/reports_main.php:215 reporting/reports_main.php:221
-#: reporting/reports_main.php:229 reporting/reports_main.php:240
-#: reporting/reports_main.php:246 reporting/reports_main.php:252
-#: reporting/reports_main.php:266 reporting/reports_main.php:273
-#: reporting/reports_main.php:283 reporting/reports_main.php:294
-#: reporting/reports_main.php:303 reporting/reports_main.php:314
-#: reporting/reports_main.php:320 reporting/reports_main.php:329
-#: reporting/reports_main.php:339 reporting/reports_main.php:347
-#: reporting/reports_main.php:357 reporting/reports_main.php:362
-#: reporting/reports_main.php:370 reporting/reports_main.php:379
-#: reporting/reports_main.php:386 reporting/reports_main.php:393
-#: reporting/reports_main.php:400 reporting/includes/excel_report.inc:295
+#: reporting/reports_main.php:173 reporting/reports_main.php:182
+#: reporting/reports_main.php:187 reporting/reports_main.php:196
+#: reporting/reports_main.php:204 reporting/reports_main.php:209
+#: reporting/reports_main.php:216 reporting/reports_main.php:222
+#: reporting/reports_main.php:230 reporting/reports_main.php:241
+#: reporting/reports_main.php:247 reporting/reports_main.php:253
+#: reporting/reports_main.php:267 reporting/reports_main.php:274
+#: reporting/reports_main.php:284 reporting/reports_main.php:295
+#: reporting/reports_main.php:304 reporting/reports_main.php:315
+#: reporting/reports_main.php:321 reporting/reports_main.php:330
+#: reporting/reports_main.php:340 reporting/reports_main.php:348
+#: reporting/reports_main.php:358 reporting/reports_main.php:363
+#: reporting/reports_main.php:371 reporting/reports_main.php:380
+#: reporting/reports_main.php:387 reporting/reports_main.php:394
+#: reporting/reports_main.php:401 reporting/includes/excel_report.inc:295
  #: reporting/includes/excel_report.inc:428
  #: reporting/includes/excel_report.inc:428
-#: reporting/includes/pdf_report.inc:346 reporting/includes/pdf_report.inc:617
+#: reporting/includes/pdf_report.inc:346 reporting/includes/pdf_report.inc:618
  #: sales/view/view_sales_order.php:85
  msgid "Comments"
  msgstr ""
  #: sales/view/view_sales_order.php:85
  msgid "Comments"
  msgstr ""
@@ -6274,19 +6328,19 @@ msgid ""
  "trail record."
  msgstr ""
  
  "trail record."
  msgstr ""
  
-#: includes/db/inventory_db.inc:249
+#: includes/db/inventory_db.inc:252
  msgid "Cost was "
  msgstr ""
  
  msgid "Cost was "
  msgstr ""
  
-#: includes/db/inventory_db.inc:249
+#: includes/db/inventory_db.inc:252
  msgid " changed to "
  msgstr ""
  
  msgid " changed to "
  msgstr ""
  
-#: includes/db/inventory_db.inc:249
+#: includes/db/inventory_db.inc:252
  msgid " for item "
  msgstr ""
  
  msgid " for item "
  msgstr ""
  
-#: includes/db/inventory_db.inc:289
+#: includes/db/inventory_db.inc:292
  msgid "Zero/negative inventory handling"
  msgstr ""
  
  msgid "Zero/negative inventory handling"
  msgstr ""
  
@@ -6296,13 +6350,16 @@ msgstr ""
  msgid "Transaction Type"
  msgstr ""
  
  msgid "Transaction Type"
  msgstr ""
  
-#: includes/ui/allocation_cart.inc:263 reporting/rep704.php:78
-#: reporting/rep704.php:81 reporting/rep704.php:84 reporting/rep709.php:109
+#: includes/ui/allocation_cart.inc:263 reporting/rep704.php:79
+#: reporting/rep704.php:82 reporting/rep704.php:85 reporting/rep709.php:109
  #: sales/view/view_credit.php:68 sales/view/view_sales_order.php:96
  #: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161
  #: sales/view/view_credit.php:68 sales/view/view_sales_order.php:96
  #: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161
-#: sales/inquiry/sales_orders_view.php:218
-#: sales/inquiry/sales_orders_view.php:254
-#: sales/inquiry/sales_orders_view.php:268
+#: sales/inquiry/sales_orders_view.php:224
+#: sales/inquiry/sales_orders_view.php:261
+#: sales/inquiry/sales_orders_view.php:275
+#: sales/inquiry/sales_orders_view.php.orig:224
+#: sales/inquiry/sales_orders_view.php.orig:261
+#: sales/inquiry/sales_orders_view.php.orig:275
  msgid "Ref"
  msgstr ""
  
  msgid "Ref"
  msgstr ""
  
@@ -6311,19 +6368,21 @@ msgid "Other Allocations"
  msgstr ""
  
  #: includes/ui/allocation_cart.inc:264 includes/ui/ui_view.inc:489
  msgstr ""
  
  #: includes/ui/allocation_cart.inc:264 includes/ui/ui_view.inc:489
-#: reporting/includes/doctext.inc:110
+#: 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:489
  #: purchasing/allocations/supplier_allocation_main.php:101
  msgid "This Allocation"
  msgstr ""
  
  #: includes/ui/allocation_cart.inc:264 includes/ui/allocation_cart.inc:311
  #: includes/ui/ui_view.inc:489
  #: purchasing/allocations/supplier_allocation_main.php:101
-#: reporting/includes/doctext.inc:110 reporting/includes/doctext.inc:168
+#: reporting/rep112.php:145 reporting/rep210.php:159
+#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186
  #: sales/allocations/customer_allocation_main.php:100
  msgid "Left to Allocate"
  msgstr ""
  
  #: sales/allocations/customer_allocation_main.php:100
  msgid "Left to Allocate"
  msgstr ""
  
-#: includes/ui/allocation_cart.inc:294 reporting/includes/doctext.inc:167
+#: includes/ui/allocation_cart.inc:294 reporting/rep112.php:142
+#: reporting/rep210.php:156
  msgid "Total Allocated"
  msgstr ""
  
  msgid "Total Allocated"
  msgstr ""
  
@@ -6350,7 +6409,7 @@ msgid "Sec Phone"
  msgstr ""
  
  #: includes/ui/contacts_view.inc:41 reporting/rep103.php:223
  msgstr ""
  
  #: includes/ui/contacts_view.inc:41 reporting/rep103.php:223
-#: reporting/includes/header2.inc:92 sales/manage/sales_people.php:99
+#: reporting/includes/header2.inc:104 sales/manage/sales_people.php:99
  msgid "Fax"
  msgstr ""
  
  msgid "Fax"
  msgstr ""
  
@@ -6374,17 +6433,19 @@ msgstr ""
  msgid "Contact active for:"
  msgstr ""
  
  msgid "Contact active for:"
  msgstr ""
  
-#: includes/ui/contacts_view.inc:102
+#: includes/ui/contacts_view.inc:102 sales/manage/customers.php:248
+#: sales/manage/customers.php.orig:249
  msgid "Phone:"
  msgstr ""
  
  #: includes/ui/contacts_view.inc:105 inventory/manage/locations.php:207
  msgid "Phone:"
  msgstr ""
  
  #: includes/ui/contacts_view.inc:105 inventory/manage/locations.php:207
-#: purchasing/manage/suppliers.php:108 sales/manage/customer_branches.php:263
+#: purchasing/manage/suppliers.php:157 sales/manage/customer_branches.php:263
+#: sales/manage/customers.php:251 sales/manage/customers.php.orig:252
  #: sales/manage/sales_people.php:158
  msgid "E-mail:"
  msgstr ""
  
  #: sales/manage/sales_people.php:158
  msgid "E-mail:"
  msgstr ""
  
-#: includes/ui/contacts_view.inc:110 purchasing/manage/suppliers.php:109
+#: includes/ui/contacts_view.inc:110 purchasing/manage/suppliers.php:158
  #: sales/manage/customer_branches.php:264
  msgid "Document Language:"
  msgstr ""
  #: sales/manage/customer_branches.php:264
  msgid "Document Language:"
  msgstr ""
@@ -6438,368 +6499,426 @@ msgstr ""
  msgid "No records"
  msgstr ""
  
  msgid "No records"
  msgstr ""
  
-#: includes/ui/simple_crud_class.inc:227 includes/ui/ui_input.inc:203
-msgid "Submit changes"
-msgstr ""
-
-#: includes/ui/simple_crud_class.inc:229 includes/ui/ui_input.inc:204
-msgid "Clone"
-msgstr ""
-
-#: includes/ui/simple_crud_class.inc:229 includes/ui/ui_input.inc:205
-msgid "Edit new record with current data"
-msgstr ""
-
-#: includes/ui/simple_crud_class.inc:231 includes/ui/ui_input.inc:206
-msgid "Cancel edition"
-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:16
-msgid "Customers"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:452
-msgid "Branches"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:454 purchasing/manage/suppliers.php:16
-msgid "Suppliers"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:456 inventory/transfers.php:230
-#: inventory/manage/items.php:16
-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_input.inc:621 reporting/includes/reports_classes.inc:216
-msgid "Click Here to Pick up the date"
-msgstr ""
-
-#: includes/ui/ui_input.inc:904 includes/ui/ui_lists.inc:2120
-#: reporting/rep301.php:148 reporting/rep302.php:166 reporting/rep303.php:170
-#: reporting/rep304.php:168 reporting/rep304.php:172
-#: sales/manage/customer_branches.php:302
-msgid "Inactive"
-msgstr ""
-
-#: includes/ui/ui_input.inc:914 includes/ui/ui_input.inc:926
-msgid "Current Credit:"
-msgstr ""
-
-#: includes/ui/ui_input.inc:940
-msgid "Bank Balance:"
-msgstr ""
-
-#: includes/ui/ui_lists.inc:17
+#: includes/ui/sav.ui_lists.inc:17 includes/ui/ui_lists.inc:17
+#: includes/ui/ui_lists.inc.orig:17
  msgid "Set filter"
  msgstr ""
  
  msgid "Set filter"
  msgstr ""
  
-#: includes/ui/ui_lists.inc:100
+#: includes/ui/sav.ui_lists.inc:100 includes/ui/ui_lists.inc:100
+#: includes/ui/ui_lists.inc.orig:100
  msgid "Press Space tab for search pattern entry"
  msgstr ""
  
  msgid "Press Space tab for search pattern entry"
  msgstr ""
  
-#: includes/ui/ui_lists.inc:104
+#: includes/ui/sav.ui_lists.inc:104 includes/ui/ui_lists.inc:104
+#: includes/ui/ui_lists.inc.orig:104
  msgid "Enter code fragment to search or * for all"
  msgstr ""
  
  msgid "Enter code fragment to search or * for all"
  msgstr ""
  
-#: includes/ui/ui_lists.inc:105
+#: includes/ui/sav.ui_lists.inc:105 includes/ui/ui_lists.inc:105
+#: includes/ui/ui_lists.inc.orig: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:438 includes/ui/ui_lists.inc:1356
  #: includes/ui/ui_lists.inc:438 includes/ui/ui_lists.inc:1356
+#: includes/ui/ui_lists.inc.orig:449 includes/ui/ui_lists.inc.orig:1367
  msgid "All Suppliers"
  msgstr ""
  
  msgid "All Suppliers"
  msgstr ""
  
-#: includes/ui/ui_lists.inc:442
+#: includes/ui/sav.ui_lists.inc:453 includes/ui/ui_lists.inc:442
+#: includes/ui/ui_lists.inc.orig:453
  msgid "Press Space tab to filter by name fragment"
  msgstr ""
  
  msgid "Press Space tab to filter by name fragment"
  msgstr ""
  
-#: includes/ui/ui_lists.inc:443
+#: includes/ui/sav.ui_lists.inc:454 includes/ui/ui_lists.inc:443
+#: includes/ui/ui_lists.inc.orig:454
  msgid "Select supplier"
  msgstr ""
  
  msgid "Select supplier"
  msgstr ""
  
-#: includes/ui/ui_lists.inc:487
+#: includes/ui/sav.ui_lists.inc:498 includes/ui/ui_lists.inc:487
+#: includes/ui/ui_lists.inc.orig:498
  msgid "All Customers"
  msgstr ""
  
  msgid "All Customers"
  msgstr ""
  
-#: includes/ui/ui_lists.inc:491
+#: includes/ui/sav.ui_lists.inc:502 includes/ui/ui_lists.inc:491
+#: includes/ui/ui_lists.inc.orig:502
  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/ui_lists.inc:492
+#: includes/ui/sav.ui_lists.inc:503 includes/ui/ui_lists.inc:492
+#: includes/ui/ui_lists.inc.orig:503
  msgid "Select customer"
  msgstr ""
  
  msgid "Select customer"
  msgstr ""
  
-#: includes/ui/ui_lists.inc:535
+#: includes/ui/sav.ui_lists.inc:546 includes/ui/ui_lists.inc:535
+#: includes/ui/ui_lists.inc.orig:546
  msgid "All branches"
  msgstr ""
  
  msgid "All branches"
  msgstr ""
  
-#: includes/ui/ui_lists.inc:538
+#: includes/ui/sav.ui_lists.inc:549 includes/ui/ui_lists.inc:538
+#: includes/ui/ui_lists.inc.orig:549
  msgid "Select customer branch"
  msgstr ""
  
  msgid "Select customer branch"
  msgstr ""
  
-#: includes/ui/ui_lists.inc:573
+#: includes/ui/sav.ui_lists.inc:584 includes/ui/ui_lists.inc:573
+#: includes/ui/ui_lists.inc.orig:584
  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:725 includes/ui/ui_lists.inc:790
  #: includes/ui/ui_lists.inc:725 includes/ui/ui_lists.inc:790
+#: includes/ui/ui_lists.inc.orig:736 includes/ui/ui_lists.inc.orig:801
  msgid "All Items"
  msgstr ""
  
  msgid "All Items"
  msgstr ""
  
-#: includes/ui/ui_lists.inc:1263
+#: includes/ui/sav.ui_lists.inc:1274 includes/ui/ui_lists.inc:1263
+#: includes/ui/ui_lists.inc.orig:1274
  msgid "All Sales Types"
  msgstr ""
  
  msgid "All Sales Types"
  msgstr ""
  
-#: includes/ui/ui_lists.inc:1592
+#: includes/ui/sav.ui_lists.inc:1603 includes/ui/ui_lists.inc:1592
+#: includes/ui/ui_lists.inc.orig:1603
  msgid "Use Item Sales Accounts"
  msgstr ""
  
  msgid "Use Item Sales Accounts"
  msgstr ""
  
-#: includes/ui/ui_lists.inc:1904 includes/ui/ui_lists.inc:1921
-#: includes/ui/ui_lists.inc:1938
+#: 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:1904
+#: includes/ui/ui_lists.inc:1921 includes/ui/ui_lists.inc:1938
+#: includes/ui/ui_lists.inc.orig:1915 includes/ui/ui_lists.inc.orig:1932
+#: includes/ui/ui_lists.inc.orig:1949
  msgid "All Types"
  msgstr ""
  
  msgid "All Types"
  msgstr ""
  
-#: includes/ui/ui_lists.inc:1905 sales/view/view_sales_order.php:127
+#: includes/ui/sav.ui_lists.inc:1916 includes/ui/ui_lists.inc:1905
+#: includes/ui/ui_lists.inc.orig:1916 sales/view/view_sales_order.php:127
  msgid "Sales Invoices"
  msgstr ""
  
  msgid "Sales Invoices"
  msgstr ""
  
-#: includes/ui/ui_lists.inc:1906 includes/ui/ui_lists.inc:1923
-#: includes/ui/ui_lists.inc:1941
+#: 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:1906
+#: includes/ui/ui_lists.inc:1923 includes/ui/ui_lists.inc:1941
+#: includes/ui/ui_lists.inc.orig:1917 includes/ui/ui_lists.inc.orig:1934
+#: includes/ui/ui_lists.inc.orig:1952
  msgid "Overdue Invoices"
  msgstr ""
  
  msgid "Overdue Invoices"
  msgstr ""
  
-#: includes/ui/ui_lists.inc:1907 includes/ui/ui_lists.inc:1924
-#: includes/ui/ui_lists.inc:1942
+#: 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:1907
+#: includes/ui/ui_lists.inc:1924 includes/ui/ui_lists.inc:1942
+#: includes/ui/ui_lists.inc.orig:1918 includes/ui/ui_lists.inc.orig:1935
+#: includes/ui/ui_lists.inc.orig:1953 includes/ui/ui_view.inc:484
  msgid "Payments"
  msgstr ""
  
  msgid "Payments"
  msgstr ""
  
-#: includes/ui/ui_lists.inc:1908 includes/ui/ui_lists.inc:1925
-#: includes/ui/ui_lists.inc:1943 sales/view/view_sales_order.php:158
+#: 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:1908
+#: includes/ui/ui_lists.inc:1925 includes/ui/ui_lists.inc:1943
+#: includes/ui/ui_lists.inc.orig:1919 includes/ui/ui_lists.inc.orig:1936
+#: includes/ui/ui_lists.inc.orig:1954 sales/view/view_sales_order.php:158
  msgid "Credit Notes"
  msgstr ""
  
  msgid "Credit Notes"
  msgstr ""
  
-#: includes/ui/ui_lists.inc:1909 sales/view/view_sales_order.php:93
+#: includes/ui/sav.ui_lists.inc:1920 includes/ui/ui_lists.inc:1909
+#: includes/ui/ui_lists.inc.orig:1920 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:1922 includes/ui/ui_lists.inc:1940
  #: includes/ui/ui_lists.inc:1922 includes/ui/ui_lists.inc:1940
+#: includes/ui/ui_lists.inc.orig:1933 includes/ui/ui_lists.inc.orig:1951
  msgid "Invoices"
  msgstr ""
  
  msgid "Invoices"
  msgstr ""
  
+#: includes/ui/sav.ui_lists.inc:1937 includes/ui/sav.ui_lists.inc:1955
  #: includes/ui/ui_lists.inc:1926 includes/ui/ui_lists.inc:1944
  #: includes/ui/ui_lists.inc:1926 includes/ui/ui_lists.inc:1944
+#: includes/ui/ui_lists.inc.orig:1937 includes/ui/ui_lists.inc.orig:1955
  msgid "Overdue Credit Notes"
  msgstr ""
  
  msgid "Overdue Credit Notes"
  msgstr ""
  
-#: includes/ui/ui_lists.inc:1939
+#: includes/ui/sav.ui_lists.inc:1950 includes/ui/ui_lists.inc:1939
+#: includes/ui/ui_lists.inc.orig:1950
  msgid "GRNs"
  msgstr ""
  
  msgid "GRNs"
  msgstr ""
  
-#: includes/ui/ui_lists.inc:1957
+#: includes/ui/sav.ui_lists.inc:1968 includes/ui/ui_lists.inc:1957
+#: includes/ui/ui_lists.inc.orig:1968
  msgid "Automatically put balance on back order"
  msgstr ""
  
  msgid "Automatically put balance on back order"
  msgstr ""
  
-#: includes/ui/ui_lists.inc:1958
+#: includes/ui/sav.ui_lists.inc:1969 includes/ui/ui_lists.inc:1958
+#: includes/ui/ui_lists.inc.orig:1969
  msgid "Cancel any quantites not delivered"
  msgstr ""
  
  msgid "Cancel any quantites not delivered"
  msgstr ""
  
-#: includes/ui/ui_lists.inc:1975
+#: includes/ui/sav.ui_lists.inc:1986 includes/ui/ui_lists.inc:1975
+#: includes/ui/ui_lists.inc.orig:1986
  msgid "Items Returned to Inventory Location"
  msgstr ""
  
  msgid "Items Returned to Inventory Location"
  msgstr ""
  
-#: includes/ui/ui_lists.inc:1976
+#: includes/ui/sav.ui_lists.inc:1987 includes/ui/ui_lists.inc:1976
+#: includes/ui/ui_lists.inc.orig:1987
  msgid "Items Written Off"
  msgstr ""
  
  msgid "Items Written Off"
  msgstr ""
  
-#: includes/ui/ui_lists.inc:2146
+#: includes/ui/sav.ui_lists.inc:2131 includes/ui/ui_input.inc:904
+#: includes/ui/ui_lists.inc:2120 includes/ui/ui_lists.inc.orig:2131
+#: reporting/rep301.php:152 reporting/rep302.php:166 reporting/rep303.php:170
+#: reporting/rep304.php:166 reporting/rep304.php:170
+#: sales/manage/customer_branches.php:302
+msgid "Inactive"
+msgstr ""
+
+#: includes/ui/sav.ui_lists.inc:2157 includes/ui/ui_lists.inc:2146
+#: includes/ui/ui_lists.inc.orig:2157
  msgid "New role"
  msgstr ""
  
  msgid "New role"
  msgstr ""
  
-#: includes/ui/ui_lists.inc:2204
+#: includes/ui/sav.ui_lists.inc:2215 includes/ui/ui_lists.inc:2204
+#: includes/ui/ui_lists.inc.orig:2215
  msgid "No tags defined."
  msgstr ""
  
  msgid "No tags defined."
  msgstr ""
  
-#: includes/ui/ui_lists.inc:2204
+#: includes/ui/sav.ui_lists.inc:2215 includes/ui/ui_lists.inc:2204
+#: includes/ui/ui_lists.inc.orig:2215
  msgid "No active tags defined."
  msgstr ""
  
  msgid "No active tags defined."
  msgstr ""
  
-#: includes/ui/ui_lists.inc:2242
+#: includes/ui/sav.ui_lists.inc:2253 includes/ui/ui_lists.inc:2242
+#: includes/ui/ui_lists.inc.orig:2253
  #, php-format
  msgid "Activated for '%s'"
  msgstr ""
  
  #, php-format
  msgid "Activated for '%s'"
  msgstr ""
  
-#: includes/ui/ui_lists.inc:2245
+#: includes/ui/sav.ui_lists.inc:2256 includes/ui/ui_lists.inc:2245
+#: includes/ui/ui_lists.inc.orig:2256
  msgid "Available and/or installed"
  msgstr ""
  
  msgid "Available and/or installed"
  msgstr ""
  
-#: includes/ui/ui_lists.inc:2315
+#: includes/ui/sav.ui_lists.inc:2326 includes/ui/ui_lists.inc:2315
+#: includes/ui/ui_lists.inc.orig:2326
  msgid "Standard new company American COA (4 digit)"
  msgstr ""
  
  msgid "Standard new company American COA (4 digit)"
  msgstr ""
  
-#: includes/ui/ui_lists.inc:2317
+#: includes/ui/sav.ui_lists.inc:2328 includes/ui/ui_lists.inc:2317
+#: includes/ui/ui_lists.inc.orig:2328
  msgid "Standard American COA (4 digit) with demo data"
  msgstr ""
  
  msgid "Standard American COA (4 digit) with demo data"
  msgstr ""
  
-#: includes/ui/ui_msgs.inc:63
-msgid "in units of : "
+#: includes/ui/sav.ui_lists.inc:2349 includes/ui/ui_lists.inc:2338
+#: includes/ui/ui_lists.inc.orig:2349
+msgid "No payment Link"
  msgstr ""
  
  msgstr ""
  
-#: includes/ui/ui_view.inc:306
-msgid "Date Voided:"
+#: includes/ui/simple_crud_class.inc:227 includes/ui/ui_input.inc:203
+msgid "Submit changes"
  msgstr ""
  
  msgstr ""
  
-#: includes/ui/ui_view.inc:407 reporting/rep107.php:175
-#: reporting/rep109.php:181 reporting/rep110.php:186 reporting/rep111.php:168
-#: reporting/rep113.php:175 reporting/rep209.php:190
-msgid "Total Tax Excluded"
+#: includes/ui/simple_crud_class.inc:229 includes/ui/ui_input.inc:204
+msgid "Clone"
  msgstr ""
  
  msgstr ""
  
-#: includes/ui/ui_view.inc:413 includes/ui/ui_view.inc:432
-#: includes/ui/ui_view.inc:451 reporting/includes/doctext.inc:151
-msgid "Included"
+#: includes/ui/simple_crud_class.inc:229 includes/ui/ui_input.inc:205
+msgid "Edit new record with current data"
  msgstr ""
  
  msgstr ""
  
-#: includes/ui/ui_view.inc:484
-#: purchasing/inquiry/supplier_allocation_inquiry.php:99
-msgid "Allocations"
+#: includes/ui/simple_crud_class.inc:231 includes/ui/ui_input.inc:206
+msgid "Cancel edition"
  msgstr ""
  
  msgstr ""
  
-#: includes/ui/ui_view.inc:488 reporting/includes/doctext.inc:110
-msgid "Total Amount"
+#: includes/ui/ui_controls.inc:72
+msgid "Request from outside of this page is forbidden."
  msgstr ""
  
  msgstr ""
  
-#: includes/ui/ui_view.inc:512
-msgid "Total Allocated:"
+#: includes/ui/ui_controls.inc:73
+msgid "CSRF attack detected from: "
  msgstr ""
  
  msgstr ""
  
-#: includes/ui/ui_view.inc:516
-msgid "Left to Allocate:"
+#: includes/ui/ui_controls.inc:139
+msgid "You should automatically be forwarded."
  msgstr ""
  
  msgstr ""
  
-#: includes/ui/ui_view.inc:552
-msgid "No Quick Entries are defined."
+#: 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:19
+#: sales/manage/customers.php.orig:20
+msgid "Customers"
+msgstr ""
+
+#: includes/ui/ui_controls.inc:452
+msgid "Branches"
+msgstr ""
+
+#: includes/ui/ui_controls.inc:454 purchasing/manage/suppliers.php:19
+msgid "Suppliers"
+msgstr ""
+
+#: includes/ui/ui_controls.inc:456 inventory/transfers.php:230
+#: inventory/manage/items.php:19
+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_input.inc:621 reporting/includes/reports_classes.inc:216
+msgid "Click Here to Pick up the date"
+msgstr ""
+
+#: includes/ui/ui_input.inc:914 includes/ui/ui_input.inc:926
+msgid "Current Credit:"
+msgstr ""
+
+#: includes/ui/ui_input.inc:940
+msgid "Bank Balance:"
+msgstr ""
+
+#: includes/ui/ui_msgs.inc:63
+msgid "in units of : "
+msgstr ""
+
+#: includes/ui/ui_view.inc:306
+msgid "Date Voided:"
+msgstr ""
+
+#: includes/ui/ui_view.inc:407 reporting/rep107.php:171
+#: reporting/rep109.php:179 reporting/rep110.php:184 reporting/rep111.php:166
+#: reporting/rep113.php:173 reporting/rep209.php:188
+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:180
+#: reporting/rep109.php:188 reporting/rep110.php:193 reporting/rep111.php:175
+#: reporting/rep113.php:182 reporting/rep209.php:197
+msgid "Included"
+msgstr ""
+
+#: includes/ui/ui_view.inc:484
+#: purchasing/inquiry/supplier_allocation_inquiry.php:100
+msgid "Allocations"
+msgstr ""
+
+#: includes/ui/ui_view.inc:488 reporting/includes/doctext.inc:145
+#: reporting/includes/doctext.inc:186
+msgid "Total Amount"
+msgstr ""
+
+#: includes/ui/ui_view.inc:512
+msgid "Total Allocated:"
+msgstr ""
+
+#: includes/ui/ui_view.inc:516
+msgid "Left to Allocate:"
+msgstr ""
+
+#: includes/ui/ui_view.inc:569
+msgid "No Quick Entries are defined."
  msgstr ""
  
  msgstr ""
  
-#: includes/ui/ui_view.inc:580
+#: includes/ui/ui_view.inc:597
  msgid "No Quick Entry lines are defined."
  msgstr ""
  
  msgid "No Quick Entry lines are defined."
  msgstr ""
  
-#: includes/ui/ui_view.inc:762 purchasing/includes/ui/invoice_ui.inc:451
+#: includes/ui/ui_view.inc:779 purchasing/includes/ui/invoice_ui.inc:452
  msgid "and"
  msgstr ""
  
  msgid "and"
  msgstr ""
  
-#: includes/ui/ui_view.inc:823
+#: includes/ui/ui_view.inc:840
  msgid "January"
  msgstr ""
  
  msgid "January"
  msgstr ""
  
-#: includes/ui/ui_view.inc:823
+#: includes/ui/ui_view.inc:840
  msgid "February"
  msgstr ""
  
  msgid "February"
  msgstr ""
  
-#: includes/ui/ui_view.inc:823
+#: includes/ui/ui_view.inc:840
  msgid "March"
  msgstr ""
  
  msgid "March"
  msgstr ""
  
-#: includes/ui/ui_view.inc:823
+#: includes/ui/ui_view.inc:840
  msgid "April"
  msgstr ""
  
  msgid "April"
  msgstr ""
  
-#: includes/ui/ui_view.inc:823
+#: includes/ui/ui_view.inc:840
  msgid "May"
  msgstr ""
  
  msgid "May"
  msgstr ""
  
-#: includes/ui/ui_view.inc:823
+#: includes/ui/ui_view.inc:840
  msgid "June"
  msgstr ""
  
  msgid "June"
  msgstr ""
  
-#: includes/ui/ui_view.inc:823
+#: includes/ui/ui_view.inc:840
  msgid "July"
  msgstr ""
  
  msgid "July"
  msgstr ""
  
-#: includes/ui/ui_view.inc:823
+#: includes/ui/ui_view.inc:840
  msgid "August"
  msgstr ""
  
  msgid "August"
  msgstr ""
  
-#: includes/ui/ui_view.inc:823
+#: includes/ui/ui_view.inc:840
  msgid "September"
  msgstr ""
  
  msgid "September"
  msgstr ""
  
-#: includes/ui/ui_view.inc:823
+#: includes/ui/ui_view.inc:840
  msgid "October"
  msgstr ""
  
  msgid "October"
  msgstr ""
  
-#: includes/ui/ui_view.inc:823
+#: includes/ui/ui_view.inc:840
  msgid "November"
  msgstr ""
  
  msgid "November"
  msgstr ""
  
-#: includes/ui/ui_view.inc:823
+#: includes/ui/ui_view.inc:840
  msgid "December"
  msgstr ""
  
  msgid "December"
  msgstr ""
  
-#: includes/ui/ui_view.inc:824
+#: includes/ui/ui_view.inc:841
  msgid "Su"
  msgstr ""
  
  msgid "Su"
  msgstr ""
  
-#: includes/ui/ui_view.inc:824
+#: includes/ui/ui_view.inc:841
  msgid "Mo"
  msgstr ""
  
  msgid "Mo"
  msgstr ""
  
-#: includes/ui/ui_view.inc:824
+#: includes/ui/ui_view.inc:841
  msgid "Tu"
  msgstr ""
  
  msgid "Tu"
  msgstr ""
  
-#: includes/ui/ui_view.inc:824
+#: includes/ui/ui_view.inc:841
  msgid "We"
  msgstr ""
  
  msgid "We"
  msgstr ""
  
-#: includes/ui/ui_view.inc:824
+#: includes/ui/ui_view.inc:841
  msgid "Th"
  msgstr ""
  
  msgid "Th"
  msgstr ""
  
-#: includes/ui/ui_view.inc:824
+#: includes/ui/ui_view.inc:841
  msgid "Fr"
  msgstr ""
  
  msgid "Fr"
  msgstr ""
  
-#: includes/ui/ui_view.inc:824
+#: includes/ui/ui_view.inc:841
  msgid "Sa"
  msgstr ""
  
  msgid "Sa"
  msgstr ""
  
-#: includes/ui/ui_view.inc:825
+#: includes/ui/ui_view.inc:842
  msgid "W"
  msgstr ""
  
  msgid "W"
  msgstr ""
  
@@ -6894,7 +7013,7 @@ msgid "Enter &Another Adjustment"
  msgstr ""
  
  #: inventory/adjustments.php:90 inventory/transfers.php:87
  msgstr ""
  
  #: inventory/adjustments.php:90 inventory/transfers.php:87
-#: sales/sales_order_entry.php:352
+#: sales/sales_order_entry.php:350
  msgid "You must enter at least one non empty item line."
  msgstr ""
  
  msgid "You must enter at least one non empty item line."
  msgstr ""
  
@@ -6952,24 +7071,25 @@ msgstr ""
  
  #: inventory/cost_update.php:85 inventory/prices.php:56
  #: inventory/purchasing_data.php:101 inventory/reorder_level.php:43
  
  #: inventory/cost_update.php:85 inventory/prices.php:56
  #: inventory/purchasing_data.php:101 inventory/reorder_level.php:43
-#: inventory/inquiry/stock_movements.php:49
-#: inventory/inquiry/stock_status.php:41 inventory/manage/item_codes.php:105
+#: inventory/inquiry/stock_movements.php:53
+#: inventory/inquiry/stock_status.php:47 inventory/manage/item_codes.php:105
  #: manufacturing/work_order_entry.php:396
  #: manufacturing/work_order_entry.php:401 purchasing/inquiry/po_search.php:74
  #: sales/inquiry/sales_deliveries_view.php:114
  #: manufacturing/work_order_entry.php:396
  #: manufacturing/work_order_entry.php:401 purchasing/inquiry/po_search.php:74
  #: sales/inquiry/sales_deliveries_view.php:114
-#: sales/inquiry/sales_orders_view.php:233
+#: sales/inquiry/sales_orders_view.php:239
+#: sales/inquiry/sales_orders_view.php.orig:239
  msgid "Item:"
  msgstr ""
  
  msgid "Item:"
  msgstr ""
  
-#: inventory/cost_update.php:105
+#: inventory/cost_update.php:102
  msgid "Standard Material Cost Per Unit"
  msgstr ""
  
  msgid "Standard Material Cost Per Unit"
  msgstr ""
  
-#: inventory/cost_update.php:108
+#: inventory/cost_update.php:105
  msgid "Standard Labour Cost Per Unit"
  msgstr ""
  
  msgid "Standard Labour Cost Per Unit"
  msgstr ""
  
-#: inventory/cost_update.php:109
+#: inventory/cost_update.php:106
  msgid "Standard Overhead Cost Per Unit"
  msgstr ""
  
  msgid "Standard Overhead Cost Per Unit"
  msgstr ""
  
@@ -6977,8 +7097,8 @@ msgstr ""
  msgid "Inventory Item Sales prices"
  msgstr ""
  
  msgid "Inventory Item Sales prices"
  msgstr ""
  
-#: inventory/prices.php:27 inventory/inquiry/stock_movements.php:30
-#: inventory/inquiry/stock_status.php:34 inventory/manage/sales_kits.php:24
+#: inventory/prices.php:27 inventory/inquiry/stock_movements.php:32
+#: inventory/inquiry/stock_status.php:37 inventory/manage/sales_kits.php:24
  #: manufacturing/inquiry/where_used_inquiry.php:21
  #: sales/credit_note_entry.php:49
  msgid "There are no items defined in the system."
  #: manufacturing/inquiry/where_used_inquiry.php:21
  #: sales/credit_note_entry.php:49
  msgid "There are no items defined in the system."
@@ -7007,19 +7127,19 @@ msgid "The selected price has been deleted."
  msgstr ""
  
  #: inventory/prices.php:133 reporting/rep104.php:116
  msgstr ""
  
  #: inventory/prices.php:133 reporting/rep104.php:116
-#: sales/customer_delivery.php:352 sales/customer_invoice.php:396
+#: sales/customer_delivery.php:355 sales/customer_invoice.php:400
  #: sales/view/view_credit.php:73 sales/view/view_dispatch.php:93
  #: sales/view/view_invoice.php:92 sales/includes/ui/sales_credit_ui.inc:102
  msgid "Sales Type"
  msgstr ""
  
  #: inventory/prices.php:133 inventory/purchasing_data.php:129
  #: 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:133 inventory/purchasing_data.php:129
-#: purchasing/includes/ui/invoice_ui.inc:483
+#: purchasing/includes/ui/invoice_ui.inc:484
  #: purchasing/po_receive_items.php:63 purchasing/view/view_grn.php:41
  #: purchasing/view/view_po.php:45 reporting/rep104.php:109
  #: purchasing/po_receive_items.php:63 purchasing/view/view_grn.php:41
  #: purchasing/view/view_po.php:45 reporting/rep104.php:109
-#: reporting/includes/doctext.inc:105 reporting/includes/doctext.inc:113
-#: sales/customer_credit_invoice.php:283 sales/customer_delivery.php:430
-#: sales/customer_invoice.php:449 sales/view/view_credit.php:91
+#: reporting/includes/doctext.inc:30 reporting/includes/doctext.inc:170
+#: sales/customer_credit_invoice.php:283 sales/customer_delivery.php:433
+#: sales/customer_invoice.php:468 sales/view/view_credit.php:91
  #: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:114
  #: sales/view/view_sales_order.php:202
  #: sales/includes/ui/sales_credit_ui.inc:168
  #: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:114
  #: sales/view/view_sales_order.php:202
  #: sales/includes/ui/sales_credit_ui.inc:168
@@ -7060,7 +7180,7 @@ msgstr ""
  
  #: inventory/purchasing_data.php:24 purchasing/po_entry_items.php:62
  #: purchasing/supplier_credit.php:32 purchasing/supplier_invoice.php:32
  
  #: inventory/purchasing_data.php:24 purchasing/po_entry_items.php:62
  #: purchasing/supplier_credit.php:32 purchasing/supplier_invoice.php:32
-#: purchasing/supplier_payment.php:40 purchasing/supplier_payment.php.orig:40
+#: purchasing/supplier_payment.php:40
  msgid "There are no suppliers defined in the system."
  msgstr ""
  
  msgid "There are no suppliers defined in the system."
  msgstr ""
  
@@ -7133,29 +7253,29 @@ msgid ""
  "manufactured items)."
  msgstr ""
  
  "manufactured items)."
  msgstr ""
  
-#: inventory/reorder_level.php:57 inventory/inquiry/stock_status.php:65
-#: inventory/inquiry/stock_status.php:69
+#: inventory/reorder_level.php:57 inventory/inquiry/stock_status.php:72
+#: inventory/inquiry/stock_status.php:76
  #: manufacturing/search_work_orders.php:162
  #: manufacturing/inquiry/where_used_inquiry.php:45
  #: manufacturing/manage/bom_edit.php:70
  #: manufacturing/search_work_orders.php:162
  #: manufacturing/inquiry/where_used_inquiry.php:45
  #: manufacturing/manage/bom_edit.php:70
-#: purchasing/inquiry/po_search_completed.php:119
-#: purchasing/inquiry/po_search_completed.php:129
+#: purchasing/inquiry/po_search_completed.php:124
+#: purchasing/inquiry/po_search_completed.php:134
  #: purchasing/inquiry/po_search.php:133 purchasing/inquiry/po_search.php:144
  #: purchasing/inquiry/po_search.php:133 purchasing/inquiry/po_search.php:144
-#: reporting/rep105.php:118 reporting/rep301.php:106 reporting/rep302.php:130
-#: reporting/rep303.php:122 reporting/rep304.php:123
-#: reporting/reports_main.php:179 reporting/reports_main.php:185
-#: reporting/reports_main.php:190 reporting/reports_main.php:201
+#: reporting/rep105.php:118 reporting/rep301.php:110 reporting/rep302.php:130
+#: reporting/rep303.php:122 reporting/rep304.php:121
+#: reporting/reports_main.php:180 reporting/reports_main.php:186
+#: reporting/reports_main.php:191 reporting/reports_main.php:202
  #: sales/manage/sales_points.php:84
  msgid "Location"
  msgstr ""
  
  #: sales/manage/sales_points.php:84
  msgid "Location"
  msgstr ""
  
-#: inventory/reorder_level.php:57 inventory/inquiry/stock_movements.php:77
-#: inventory/inquiry/stock_status.php:69 purchasing/supplier_credit.php:203
-#: sales/sales_order_entry.php:493 sales/includes/ui/sales_order_ui.inc:175
+#: inventory/reorder_level.php:57 inventory/inquiry/stock_movements.php:82
+#: inventory/inquiry/stock_status.php:76 purchasing/supplier_credit.php:203
+#: sales/sales_order_entry.php:492 sales/includes/ui/sales_order_ui.inc:175
  msgid "Quantity On Hand"
  msgstr ""
  
  msgid "Quantity On Hand"
  msgstr ""
  
-#: inventory/reorder_level.php:57 inventory/inquiry/stock_status.php:69
+#: inventory/reorder_level.php:57 inventory/inquiry/stock_status.php:76
  #: sales/includes/db/sales_order_db.inc:110
  #: sales/includes/db/sales_order_db.inc:263
  msgid "Re-Order Level"
  #: sales/includes/db/sales_order_db.inc:110
  #: sales/includes/db/sales_order_db.inc:263
  msgid "Re-Order Level"
@@ -7209,7 +7329,8 @@ msgstr ""
  #: inventory/includes/item_adjustments_ui.inc:34
  #: manufacturing/work_order_entry.php:210 purchasing/inquiry/po_search.php:67
  #: sales/inquiry/sales_deliveries_view.php:107
  #: inventory/includes/item_adjustments_ui.inc:34
  #: manufacturing/work_order_entry.php:210 purchasing/inquiry/po_search.php:67
  #: sales/inquiry/sales_deliveries_view.php:107
-#: sales/inquiry/sales_orders_view.php:224
+#: sales/inquiry/sales_orders_view.php:230
+#: sales/inquiry/sales_orders_view.php.orig:230
  msgid "Location:"
  msgstr ""
  
  msgid "Location:"
  msgstr ""
  
@@ -7230,9 +7351,9 @@ msgstr ""
  #: manufacturing/includes/work_order_issue_ui.inc:33
  #: purchasing/includes/ui/po_ui.inc:236 purchasing/po_receive_items.php:62
  #: purchasing/view/view_grn.php:40 purchasing/view/view_po.php:45
  #: manufacturing/includes/work_order_issue_ui.inc:33
  #: purchasing/includes/ui/po_ui.inc:236 purchasing/po_receive_items.php:62
  #: purchasing/view/view_grn.php:40 purchasing/view/view_po.php:45
-#: reporting/includes/doctext.inc:104 reporting/includes/doctext.inc:107
-#: reporting/includes/doctext.inc:112 sales/customer_credit_invoice.php:282
-#: sales/customer_delivery.php:428 sales/customer_invoice.php:448
+#: reporting/includes/doctext.inc:29 reporting/includes/doctext.inc:169
+#: reporting/includes/doctext.inc:206 sales/customer_credit_invoice.php:282
+#: sales/customer_delivery.php:431 sales/customer_invoice.php:467
  #: sales/view/view_credit.php:90 sales/view/view_dispatch.php:112
  #: sales/view/view_invoice.php:113 sales/view/view_sales_order.php:201
  #: sales/includes/ui/sales_credit_ui.inc:167
  #: sales/view/view_credit.php:90 sales/view/view_dispatch.php:112
  #: sales/view/view_invoice.php:113 sales/view/view_sales_order.php:201
  #: sales/includes/ui/sales_credit_ui.inc:167
@@ -7244,10 +7365,10 @@ msgstr ""
  #: inventory/includes/stock_transfers_ui.inc:60
  #: manufacturing/includes/work_order_issue_ui.inc:33
  #: purchasing/includes/ui/po_ui.inc:236 purchasing/view/view_grn.php:40
  #: inventory/includes/stock_transfers_ui.inc:60
  #: manufacturing/includes/work_order_issue_ui.inc:33
  #: purchasing/includes/ui/po_ui.inc:236 purchasing/view/view_grn.php:40
-#: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:104
-#: reporting/includes/doctext.inc:107 reporting/includes/doctext.inc:112
-#: sales/customer_credit_invoice.php:282 sales/customer_delivery.php:428
-#: sales/customer_invoice.php:448 sales/view/view_credit.php:90
+#: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:29
+#: reporting/includes/doctext.inc:169 reporting/includes/doctext.inc:206
+#: sales/customer_credit_invoice.php:282 sales/customer_delivery.php:431
+#: sales/customer_invoice.php:467 sales/view/view_credit.php:90
  #: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:113
  #: sales/view/view_sales_order.php:201
  #: sales/includes/ui/sales_credit_ui.inc:167
  #: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:113
  #: sales/view/view_sales_order.php:201
  #: sales/includes/ui/sales_credit_ui.inc:167
@@ -7265,12 +7386,12 @@ 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:483
+#: purchasing/includes/ui/invoice_ui.inc:484
  #: purchasing/includes/ui/po_ui.inc:236 purchasing/view/view_grn.php:40
  #: purchasing/includes/ui/po_ui.inc:236 purchasing/view/view_grn.php:40
-#: purchasing/view/view_po.php:45 reporting/rep301.php:100
+#: purchasing/view/view_po.php:45 reporting/rep301.php:103
  #: reporting/rep303.php:109 reporting/rep303.php:115 reporting/rep401.php:69
  #: reporting/rep303.php:109 reporting/rep303.php:115 reporting/rep401.php:69
-#: reporting/includes/doctext.inc:49 reporting/includes/doctext.inc:105
-#: reporting/includes/doctext.inc:112 sales/view/view_credit.php:90
+#: reporting/includes/doctext.inc:29 reporting/includes/doctext.inc:170
+#: reporting/includes/doctext.inc:203 sales/view/view_credit.php:90
  #: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:113
  #: sales/view/view_sales_order.php:201
  #: sales/includes/ui/sales_credit_ui.inc:167
  #: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:113
  #: sales/view/view_sales_order.php:201
  #: sales/includes/ui/sales_credit_ui.inc:167
@@ -7283,8 +7404,8 @@ msgstr ""
  #: inventory/manage/item_units.php:94
  #: manufacturing/includes/work_order_issue_ui.inc:34
  #: purchasing/includes/ui/po_ui.inc:237 purchasing/view/view_grn.php:41
  #: inventory/manage/item_units.php:94
  #: manufacturing/includes/work_order_issue_ui.inc:34
  #: purchasing/includes/ui/po_ui.inc:237 purchasing/view/view_grn.php:41
-#: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:105
-#: reporting/includes/doctext.inc:113 sales/view/view_credit.php:91
+#: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:30
+#: reporting/includes/doctext.inc:170 sales/view/view_credit.php:91
  #: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:114
  #: sales/view/view_sales_order.php:201
  #: sales/includes/ui/sales_credit_ui.inc:167
  #: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:114
  #: sales/view/view_sales_order.php:201
  #: sales/includes/ui/sales_credit_ui.inc:167
@@ -7295,12 +7416,12 @@ msgstr ""
  #: inventory/includes/item_adjustments_ui.inc:63
  #: inventory/view/view_adjustment.php:57
  #: manufacturing/includes/manufacturing_ui.inc:29
  #: inventory/includes/item_adjustments_ui.inc:63
  #: inventory/view/view_adjustment.php:57
  #: manufacturing/includes/manufacturing_ui.inc:29
-#: manufacturing/includes/work_order_issue_ui.inc:34 reporting/rep301.php:100
+#: manufacturing/includes/work_order_issue_ui.inc:34 reporting/rep301.php:103
  msgid "Unit Cost"
  msgstr ""
  
  #: inventory/includes/stock_transfers_ui.inc:35
  msgid "Unit Cost"
  msgstr ""
  
  #: inventory/includes/stock_transfers_ui.inc:35
-#: inventory/inquiry/stock_movements.php:56
+#: inventory/inquiry/stock_movements.php:60
  #: manufacturing/includes/work_order_issue_ui.inc:164
  msgid "From Location:"
  msgstr ""
  #: manufacturing/includes/work_order_issue_ui.inc:164
  msgid "From Location:"
  msgstr ""
@@ -7339,60 +7460,61 @@ msgid ""
  "\t\t\t\tusing this item as component"
  msgstr ""
  
  "\t\t\t\tusing this item as component"
  msgstr ""
  
-#: inventory/inquiry/stock_movements.php:27
+#: inventory/inquiry/stock_movements.php:28
  msgid "Inventory Item Movement"
  msgstr ""
  
  msgid "Inventory Item Movement"
  msgstr ""
  
-#: inventory/inquiry/stock_movements.php:61
+#: inventory/inquiry/stock_movements.php:65
  msgid "Show Movements"
  msgstr ""
  
  msgid "Show Movements"
  msgstr ""
  
-#: inventory/inquiry/stock_movements.php:61
-#: purchasing/includes/ui/invoice_ui.inc:452
+#: inventory/inquiry/stock_movements.php:65
+#: purchasing/includes/ui/invoice_ui.inc:453
  #: purchasing/inquiry/supplier_allocation_inquiry.php:57
  #: purchasing/inquiry/supplier_allocation_inquiry.php:57
-#: purchasing/inquiry/supplier_inquiry.php:54
+#: purchasing/inquiry/supplier_inquiry.php:58
  #: purchasing/inquiry/supplier_inquiry.php.orig:54
  #: sales/inquiry/customer_allocation_inquiry.php:51
  #: purchasing/inquiry/supplier_inquiry.php.orig:54
  #: sales/inquiry/customer_allocation_inquiry.php:51
-#: sales/inquiry/customer_inquiry.php:54
+#: sales/inquiry/customer_inquiry.php:58
+#: sales/inquiry/customer_inquiry.php.orig:58
  msgid "Refresh Inquiry"
  msgstr ""
  
  msgid "Refresh Inquiry"
  msgstr ""
  
-#: inventory/inquiry/stock_movements.php:76
+#: inventory/inquiry/stock_movements.php:81
  msgid "Detail"
  msgstr ""
  
  msgid "Detail"
  msgstr ""
  
-#: inventory/inquiry/stock_movements.php:77
+#: inventory/inquiry/stock_movements.php:82
  msgid "Quantity In"
  msgstr ""
  
  msgid "Quantity In"
  msgstr ""
  
-#: inventory/inquiry/stock_movements.php:77
+#: inventory/inquiry/stock_movements.php:82
  msgid "Quantity Out"
  msgstr ""
  
  msgid "Quantity Out"
  msgstr ""
  
-#: inventory/inquiry/stock_movements.php:92
+#: inventory/inquiry/stock_movements.php:97
  msgid "Quantity on hand before"
  msgstr ""
  
  msgid "Quantity on hand before"
  msgstr ""
  
-#: inventory/inquiry/stock_movements.php:180
+#: inventory/inquiry/stock_movements.php:185
  msgid "Quantity on hand after"
  msgstr ""
  
  msgid "Quantity on hand after"
  msgstr ""
  
-#: inventory/inquiry/stock_status.php:18 inventory/inquiry/stock_status.php:20
+#: inventory/inquiry/stock_status.php:19 inventory/inquiry/stock_status.php:21
  msgid "Inventory Item Status"
  msgstr ""
  
  msgid "Inventory Item Status"
  msgstr ""
  
-#: inventory/inquiry/stock_status.php:55
+#: inventory/inquiry/stock_status.php:62
  msgid ""
  "This is a service and cannot have a stock holding, only the total quantity "
  "on outstanding sales orders is shown."
  msgstr ""
  
  msgid ""
  "This is a service and cannot have a stock holding, only the total quantity "
  "on outstanding sales orders is shown."
  msgstr ""
  
-#: inventory/inquiry/stock_status.php:65 inventory/inquiry/stock_status.php:70
+#: inventory/inquiry/stock_status.php:72 inventory/inquiry/stock_status.php:77
  #: reporting/rep303.php:109 reporting/rep303.php:115
  msgid "Demand"
  msgstr ""
  
  #: reporting/rep303.php:109 reporting/rep303.php:115
  msgid "Demand"
  msgstr ""
  
-#: inventory/inquiry/stock_status.php:70 reporting/rep303.php:109
+#: inventory/inquiry/stock_status.php:77 reporting/rep303.php:109
  #: reporting/rep303.php:115
  msgid "On Order"
  msgstr ""
  #: reporting/rep303.php:115
  msgid "On Order"
  msgstr ""
@@ -7431,8 +7553,8 @@ msgstr ""
  #: inventory/manage/sales_kits.php:40 inventory/view/view_adjustment.php:57
  #: inventory/view/view_transfer.php:56 manufacturing/view/wo_issue_view.php:77
  #: manufacturing/manage/bom_edit.php:71 purchasing/po_receive_items.php:62
  #: inventory/manage/sales_kits.php:40 inventory/view/view_adjustment.php:57
  #: inventory/view/view_transfer.php:56 manufacturing/view/wo_issue_view.php:77
  #: manufacturing/manage/bom_edit.php:71 purchasing/po_receive_items.php:62
-#: sales/customer_credit_invoice.php:282 sales/customer_delivery.php:429
-#: sales/customer_invoice.php:448
+#: sales/customer_credit_invoice.php:282 sales/customer_delivery.php:432
+#: sales/customer_invoice.php:467
  msgid "Units"
  msgstr ""
  
  msgid "Units"
  msgstr ""
  
@@ -7464,19 +7586,19 @@ msgstr ""
  msgid "Default values for new items"
  msgstr ""
  
  msgid "Default values for new items"
  msgstr ""
  
-#: inventory/manage/item_categories.php:184 inventory/manage/items.php:336
+#: inventory/manage/item_categories.php:184 inventory/manage/items.php:324
  msgid "Item Tax Type:"
  msgstr ""
  
  msgid "Item Tax Type:"
  msgstr ""
  
-#: inventory/manage/item_categories.php:186 inventory/manage/items.php:338
+#: inventory/manage/item_categories.php:186 inventory/manage/items.php:326
  msgid "Item Type:"
  msgstr ""
  
  msgid "Item Type:"
  msgstr ""
  
-#: inventory/manage/item_categories.php:188 inventory/manage/items.php:340
+#: inventory/manage/item_categories.php:188 inventory/manage/items.php:328
  msgid "Units of Measure:"
  msgstr ""
  
  msgid "Units of Measure:"
  msgstr ""
  
-#: inventory/manage/item_categories.php:190 inventory/manage/items.php:344
+#: inventory/manage/item_categories.php:190 inventory/manage/items.php:332
  msgid "Exclude from sales:"
  msgstr ""
  
  msgid "Exclude from sales:"
  msgstr ""
  
@@ -7484,7 +7606,7 @@ msgstr ""
  msgid "Foreign Item Codes"
  msgstr ""
  
  msgid "Foreign Item Codes"
  msgstr ""
  
-#: inventory/manage/item_codes.php:23 sales/sales_order_entry.php:660
+#: inventory/manage/item_codes.php:23 sales/sales_order_entry.php:659
  msgid "There are no inventory items defined in the system."
  msgstr ""
  
  msgid "There are no inventory items defined in the system."
  msgstr ""
  
@@ -7496,7 +7618,7 @@ msgstr ""
  msgid "Item code description cannot be empty."
  msgstr ""
  
  msgid "Item code description cannot be empty."
  msgstr ""
  
-#: inventory/manage/item_codes.php:55 inventory/manage/items.php:150
+#: inventory/manage/item_codes.php:55 inventory/manage/items.php:154
  #: inventory/manage/sales_kits.php:88
  msgid "This item code is already assigned to stock item or sale kit."
  msgstr ""
  #: inventory/manage/sales_kits.php:88
  msgid "This item code is already assigned to stock item or sale kit."
  msgstr ""
@@ -7518,9 +7640,9 @@ msgid "EAN/UPC Code"
  msgstr ""
  
  #: inventory/manage/item_codes.php:125 reporting/rep104.php:115
  msgstr ""
  
  #: inventory/manage/item_codes.php:125 reporting/rep104.php:115
-#: reporting/rep105.php:117 reporting/rep301.php:100 reporting/rep301.php:105
+#: reporting/rep105.php:117 reporting/rep301.php:103 reporting/rep301.php:109
  #: reporting/rep302.php:122 reporting/rep302.php:129 reporting/rep303.php:121
  #: reporting/rep302.php:122 reporting/rep302.php:129 reporting/rep303.php:121
-#: reporting/rep304.php:114 reporting/rep304.php:122
+#: reporting/rep304.php:112 reporting/rep304.php:120
  msgid "Category"
  msgstr ""
  
  msgid "Category"
  msgstr ""
  
@@ -7535,7 +7657,7 @@ msgstr ""
  msgid "Quantity:"
  msgstr ""
  
  msgid "Quantity:"
  msgstr ""
  
-#: inventory/manage/item_codes.php:180 inventory/manage/items.php:311
+#: inventory/manage/item_codes.php:180 inventory/manage/items.php:299
  #: inventory/manage/movement_types.php:129 inventory/manage/sales_kits.php:206
  #: inventory/manage/sales_kits.php:232
  #: manufacturing/manage/work_centres.php:138
  #: inventory/manage/movement_types.php:129 inventory/manage/sales_kits.php:206
  #: inventory/manage/sales_kits.php:232
  #: manufacturing/manage/work_centres.php:138
@@ -7545,123 +7667,140 @@ msgstr ""
  msgid "Description:"
  msgstr ""
  
  msgid "Description:"
  msgstr ""
  
-#: inventory/manage/item_codes.php:181 inventory/manage/items.php:313
+#: inventory/manage/item_codes.php:181 inventory/manage/items.php:301
  #: inventory/manage/sales_kits.php:207 inventory/manage/sales_kits.php:233
  msgid "Category:"
  msgstr ""
  
  #: inventory/manage/sales_kits.php:207 inventory/manage/sales_kits.php:233
  msgid "Category:"
  msgstr ""
  
-#: inventory/manage/items.php:69
-msgid "Only jpg files are supported - a file extension of .jpg is expected"
+#: inventory/manage/items.php:78
+msgid ""
+"Only graphics files are supported - a file extension of .jpg, .png or .gif "
+"is expected"
  msgstr ""
  
  msgstr ""
  
-#: inventory/manage/items.php:100
+#: inventory/manage/items.php:104
  msgid ""
  "There are no item categories defined in the system. At least one item "
  "category is required to add a item."
  msgstr ""
  
  msgid ""
  "There are no item categories defined in the system. At least one item "
  "category is required to add a item."
  msgstr ""
  
-#: inventory/manage/items.php:102
+#: inventory/manage/items.php:106
  msgid ""
  "There are no item tax types defined in the system. At least one item tax "
  "type is required to add a item."
  msgstr ""
  
  msgid ""
  "There are no item tax types defined in the system. At least one item tax "
  "type is required to add a item."
  msgstr ""
  
-#: inventory/manage/items.php:129
+#: inventory/manage/items.php:133
  msgid "The item name must be entered."
  msgstr ""
  
  msgid "The item name must be entered."
  msgstr ""
  
-#: inventory/manage/items.php:135
+#: inventory/manage/items.php:139
  msgid "The item code cannot be empty"
  msgstr ""
  
  msgid "The item code cannot be empty"
  msgstr ""
  
-#: inventory/manage/items.php:143
+#: inventory/manage/items.php:147
  msgid ""
  "The item code cannot contain any of the following characters -  & + OR a "
  "space OR quotes"
  msgstr ""
  
  msgid ""
  "The item code cannot contain any of the following characters -  & + OR a "
  "space OR quotes"
  msgstr ""
  
-#: inventory/manage/items.php:179
+#: inventory/manage/items.php:183
  msgid "Item has been updated."
  msgstr ""
  
  msgid "Item has been updated."
  msgstr ""
  
-#: inventory/manage/items.php:192
+#: inventory/manage/items.php:196
  msgid "A new item has been added."
  msgstr ""
  
  msgid "A new item has been added."
  msgstr ""
  
-#: inventory/manage/items.php:234
+#: inventory/manage/items.php:239
  msgid "Selected item has been deleted."
  msgstr ""
  
  msgid "Selected item has been deleted."
  msgstr ""
  
-#: inventory/manage/items.php:250
-msgid "Select an item:"
-msgstr ""
-
-#: inventory/manage/items.php:251
-msgid "New item"
-msgstr ""
-
-#: inventory/manage/items.php:268 inventory/view/view_adjustment.php:56
+#: inventory/manage/items.php:256 inventory/view/view_adjustment.php:56
  #: inventory/view/view_transfer.php:39 inventory/view/view_transfer.php:56
  #: manufacturing/search_work_orders.php:163
  #: manufacturing/view/wo_issue_view.php:44
  #: manufacturing/view/wo_production_view.php:45
  #: inventory/view/view_transfer.php:39 inventory/view/view_transfer.php:56
  #: manufacturing/search_work_orders.php:163
  #: manufacturing/view/wo_issue_view.php:44
  #: manufacturing/view/wo_production_view.php:45
-#: purchasing/includes/ui/invoice_ui.inc:470
-#: purchasing/includes/ui/invoice_ui.inc:482 reporting/rep204.php:82
+#: purchasing/includes/ui/invoice_ui.inc:471
+#: purchasing/includes/ui/invoice_ui.inc:483 reporting/rep204.php:82
  msgid "Item"
  msgstr ""
  
  msgid "Item"
  msgstr ""
  
-#: inventory/manage/items.php:273 inventory/manage/items.php:304
+#: inventory/manage/items.php:261 inventory/manage/items.php:292
  msgid "Item Code:"
  msgstr ""
  
  msgid "Item Code:"
  msgstr ""
  
-#: inventory/manage/items.php:342
+#: inventory/manage/items.php:330
  msgid "Editable description:"
  msgstr ""
  
  msgid "Editable description:"
  msgstr ""
  
-#: inventory/manage/items.php:362 sales/manage/customer_branches.php:248
+#: inventory/manage/items.php:350 sales/manage/customer_branches.php:248
  msgid "GL Accounts"
  msgstr ""
  
  msgid "GL Accounts"
  msgstr ""
  
-#: inventory/manage/items.php:385
+#: inventory/manage/items.php:373
  msgid "Other"
  msgstr ""
  
  msgid "Other"
  msgstr ""
  
-#: inventory/manage/items.php:388
+#: inventory/manage/items.php:376
  msgid "Image File (.jpg)"
  msgstr ""
  
  msgid "Image File (.jpg)"
  msgstr ""
  
-#: inventory/manage/items.php:403
+#: inventory/manage/items.php:391
  msgid "No image"
  msgstr ""
  
  msgid "No image"
  msgstr ""
  
-#: inventory/manage/items.php:408
+#: inventory/manage/items.php:396
  msgid "Delete Image:"
  msgstr ""
  
  msgid "Delete Image:"
  msgstr ""
  
-#: inventory/manage/items.php:410
+#: inventory/manage/items.php:398
  msgid "Item status:"
  msgstr ""
  
  msgid "Item status:"
  msgstr ""
  
-#: inventory/manage/items.php:416
+#: inventory/manage/items.php:404
  msgid "Insert New Item"
  msgstr ""
  
  msgid "Insert New Item"
  msgstr ""
  
-#: inventory/manage/items.php:420
+#: inventory/manage/items.php:408
  msgid "Update Item"
  msgstr ""
  
  msgid "Update Item"
  msgstr ""
  
-#: inventory/manage/items.php:423
+#: inventory/manage/items.php:411
  msgid "Select this items and return to document entry."
  msgstr ""
  
  msgid "Select this items and return to document entry."
  msgstr ""
  
-#: inventory/manage/items.php:424
+#: inventory/manage/items.php:412
  msgid "Clone This Item"
  msgstr ""
  
  msgid "Clone This Item"
  msgstr ""
  
-#: inventory/manage/items.php:425
+#: inventory/manage/items.php:413
  msgid "Delete This Item"
  msgstr ""
  
  msgid "Delete This Item"
  msgstr ""
  
+#: inventory/manage/items.php:428
+msgid "Select an item:"
+msgstr ""
+
+#: inventory/manage/items.php:429
+msgid "New item"
+msgstr ""
+
+#: inventory/manage/items.php:452 purchasing/manage/suppliers.php:303
+#: sales/manage/customer_branches.php:322 sales/manage/customers.php:338
+#: sales/manage/customers.php.orig:339
+msgid "&General settings"
+msgstr ""
+
+#: inventory/manage/items.php:453 purchasing/manage/suppliers.php:305
+#: sales/manage/customers.php:340 sales/manage/customers.php.orig:341
+msgid "&Transactions"
+msgstr ""
+
+#: inventory/manage/items.php:454
+msgid "&Status"
+msgstr ""
+
  #: inventory/manage/item_units.php:16
  msgid "Units of Measure"
  msgstr ""
  #: inventory/manage/item_units.php:16
  msgid "Units of Measure"
  msgstr ""
@@ -7927,7 +8066,7 @@ msgstr ""
  #: inventory/view/view_transfer.php:40 manufacturing/view/wo_issue_view.php:44
  #: manufacturing/includes/manufacturing_ui.inc:29
  #: manufacturing/includes/manufacturing_ui.inc:83
  #: inventory/view/view_transfer.php:40 manufacturing/view/wo_issue_view.php:44
  #: manufacturing/includes/manufacturing_ui.inc:29
  #: manufacturing/includes/manufacturing_ui.inc:83
-#: reporting/includes/doctext.inc:108
+#: reporting/includes/doctext.inc:207
  msgid "From Location"
  msgstr ""
  
  msgid "From Location"
  msgstr ""
  
@@ -7948,15 +8087,16 @@ msgid "at Location:"
  msgstr ""
  
  #: manufacturing/search_work_orders.php:76
  msgstr ""
  
  #: manufacturing/search_work_orders.php:76
-#: purchasing/inquiry/po_search_completed.php:72
+#: purchasing/inquiry/po_search_completed.php:75
  msgid "for item:"
  msgstr ""
  
  #: manufacturing/search_work_orders.php:78
  msgid "for item:"
  msgstr ""
  
  #: manufacturing/search_work_orders.php:78
-#: purchasing/inquiry/po_search_completed.php:74
+#: purchasing/inquiry/po_search_completed.php:77
  #: purchasing/inquiry/po_search.php:76
  #: sales/inquiry/sales_deliveries_view.php:116
  #: purchasing/inquiry/po_search.php:76
  #: sales/inquiry/sales_deliveries_view.php:116
-#: sales/inquiry/sales_orders_view.php:238
+#: sales/inquiry/sales_orders_view.php:245
+#: sales/inquiry/sales_orders_view.php.orig:245
  msgid "Select documents"
  msgstr ""
  
  msgid "Select documents"
  msgstr ""
  
@@ -7983,7 +8123,8 @@ msgstr ""
  #: manufacturing/search_work_orders.php:167
  #: manufacturing/includes/manufacturing_ui.inc:277
  #: manufacturing/includes/manufacturing_ui.inc:281
  #: manufacturing/search_work_orders.php:167
  #: manufacturing/includes/manufacturing_ui.inc:277
  #: manufacturing/includes/manufacturing_ui.inc:281
-#: reporting/includes/doctext.inc:46 sales/inquiry/sales_orders_view.php:259
+#: reporting/includes/doctext.inc:205 sales/inquiry/sales_orders_view.php:266
+#: sales/inquiry/sales_orders_view.php.orig:266
  msgid "Required By"
  msgstr ""
  
  msgid "Required By"
  msgstr ""
  
@@ -8373,7 +8514,7 @@ msgstr ""
  msgid "BOM for item:"
  msgstr ""
  
  msgid "BOM for item:"
  msgstr ""
  
-#: manufacturing/view/work_order_view.php:56 reporting/rep409.php:93
+#: manufacturing/view/work_order_view.php:56 reporting/rep409.php:91
  msgid "Work Order Requirements"
  msgstr ""
  
  msgid "Work Order Requirements"
  msgstr ""
  
@@ -8424,7 +8565,7 @@ msgstr ""
  #: manufacturing/manage/bom_edit.php:71
  #: manufacturing/includes/manufacturing_ui.inc:28
  #: manufacturing/includes/manufacturing_ui.inc:83
  #: manufacturing/manage/bom_edit.php:71
  #: manufacturing/includes/manufacturing_ui.inc:28
  #: manufacturing/includes/manufacturing_ui.inc:83
-#: reporting/includes/doctext.inc:108
+#: reporting/includes/doctext.inc:207
  msgid "Work Centre"
  msgstr ""
  
  msgid "Work Centre"
  msgstr ""
  
@@ -8527,17 +8668,17 @@ msgid "There are no Requirements for this Order."
  msgstr ""
  
  #: manufacturing/includes/manufacturing_ui.inc:84
  msgstr ""
  
  #: manufacturing/includes/manufacturing_ui.inc:84
-#: reporting/includes/doctext.inc:108
+#: reporting/includes/doctext.inc:207
  msgid "Unit Quantity"
  msgstr ""
  
  #: manufacturing/includes/manufacturing_ui.inc:84
  msgid "Unit Quantity"
  msgstr ""
  
  #: manufacturing/includes/manufacturing_ui.inc:84
-#: reporting/includes/doctext.inc:108
+#: reporting/includes/doctext.inc:207
  msgid "Total Quantity"
  msgstr ""
  
  #: manufacturing/includes/manufacturing_ui.inc:84
  msgid "Total Quantity"
  msgstr ""
  
  #: manufacturing/includes/manufacturing_ui.inc:84
-#: reporting/includes/doctext.inc:108
+#: reporting/includes/doctext.inc:207
  msgid "Units Issued"
  msgstr ""
  
  msgid "Units Issued"
  msgstr ""
  
@@ -8569,14 +8710,14 @@ 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
-#: reporting/includes/doctext.inc:45
+#: reporting/includes/doctext.inc:201
  msgid "Manufactured Item"
  msgstr ""
  
  #: manufacturing/includes/manufacturing_ui.inc:277
  #: manufacturing/includes/manufacturing_ui.inc:281
  #: manufacturing/includes/manufacturing_ui.inc:332
  msgid "Manufactured Item"
  msgstr ""
  
  #: manufacturing/includes/manufacturing_ui.inc:277
  #: manufacturing/includes/manufacturing_ui.inc:281
  #: manufacturing/includes/manufacturing_ui.inc:332
-#: reporting/includes/doctext.inc:48
+#: reporting/includes/doctext.inc:202
  msgid "Into Location"
  msgstr ""
  
  msgid "Into Location"
  msgstr ""
  
@@ -8627,7 +8768,7 @@ msgstr ""
  
  #: manufacturing/includes/db/work_orders_db.inc:278
  #: purchasing/includes/db/po_db.inc:116
  
  #: manufacturing/includes/db/work_orders_db.inc:278
  #: purchasing/includes/db/po_db.inc:116
-#: sales/includes/db/cust_trans_db.inc:109
+#: sales/includes/db/cust_trans_db.inc:111
  #: sales/includes/db/sales_order_db.inc:249
  msgid "Updated."
  msgstr ""
  #: sales/includes/db/sales_order_db.inc:249
  msgid "Updated."
  msgstr ""
@@ -8653,18 +8794,19 @@ msgstr ""
  msgid "Produced"
  msgstr ""
  
  msgid "Produced"
  msgstr ""
  
-#: purchasing/includes/db/invoice_db.inc:282
+#: purchasing/includes/db/invoice_db.inc:284
  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:81
+#: purchasing/includes/db/invoice_db.inc:284 reporting/rep106.php:81
  #: sales/inquiry/sales_deliveries_view.php:166
  #: sales/inquiry/sales_deliveries_view.php:166
-#: sales/inquiry/sales_orders_view.php:142
+#: sales/inquiry/sales_orders_view.php:145
+#: sales/inquiry/sales_orders_view.php.orig:145
  msgid "Invoice"
  msgstr ""
  
  msgid "Invoice"
  msgstr ""
  
-#: purchasing/includes/db/invoice_db.inc:682
  #: purchasing/includes/db/invoice_db.inc:684
  #: purchasing/includes/db/invoice_db.inc:684
+#: purchasing/includes/db/invoice_db.inc:686
  msgid "GRN Removal"
  msgstr ""
  
  msgid "GRN Removal"
  msgstr ""
  
@@ -8694,9 +8836,9 @@ msgstr ""
  #: purchasing/includes/ui/po_ui.inc:344
  #: purchasing/view/view_supp_credit.php:44
  #: purchasing/view/view_supp_invoice.php:47
  #: purchasing/includes/ui/po_ui.inc:344
  #: purchasing/view/view_supp_credit.php:44
  #: purchasing/view/view_supp_invoice.php:47
-#: purchasing/inquiry/po_search_completed.php:120
+#: purchasing/inquiry/po_search_completed.php:125
  #: purchasing/inquiry/po_search.php:134
  #: purchasing/inquiry/po_search.php:134
-#: purchasing/inquiry/supplier_inquiry.php:166
+#: purchasing/inquiry/supplier_inquiry.php:172
  #: purchasing/inquiry/supplier_inquiry.php.orig:166
  msgid "Supplier's Reference"
  msgstr ""
  #: purchasing/inquiry/supplier_inquiry.php.orig:166
  msgid "Supplier's Reference"
  msgstr ""
@@ -8720,12 +8862,13 @@ msgid "Terms:"
  msgstr ""
  
  #: purchasing/includes/ui/invoice_ui.inc:126
  msgstr ""
  
  #: purchasing/includes/ui/invoice_ui.inc:126
-#: purchasing/manage/suppliers.php:92 purchasing/manage/suppliers.php:97
+#: purchasing/manage/suppliers.php:95 purchasing/manage/suppliers.php:100
  msgid "Supplier's Currency:"
  msgstr ""
  
  #: purchasing/includes/ui/invoice_ui.inc:130
  msgid "Supplier's Currency:"
  msgstr ""
  
  #: purchasing/includes/ui/invoice_ui.inc:130
-#: purchasing/manage/suppliers.php:99 sales/manage/customer_branches.php:246
+#: purchasing/manage/suppliers.php:102 sales/manage/customer_branches.php:246
+#: sales/manage/customers.php:288 sales/manage/customers.php.orig:289
  msgid "Tax Group:"
  msgstr ""
  
  msgid "Tax Group:"
  msgstr ""
  
@@ -8768,116 +8911,117 @@ msgstr ""
  msgid "Quick Entry:"
  msgstr ""
  
  msgid "Quick Entry:"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:391
+#: purchasing/includes/ui/invoice_ui.inc:392
  msgid "Add to Invoice"
  msgstr ""
  
  msgid "Add to Invoice"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:393
+#: purchasing/includes/ui/invoice_ui.inc:394
  msgid "Add to Credit Note"
  msgstr ""
  
  msgid "Add to Credit Note"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:395 sales/customer_invoice.php:503
+#: purchasing/includes/ui/invoice_ui.inc:396 sales/customer_invoice.php:522
  msgid "Remove"
  msgstr ""
  
  msgid "Remove"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:395
-#: purchasing/includes/ui/invoice_ui.inc:430
+#: purchasing/includes/ui/invoice_ui.inc:396
+#: purchasing/includes/ui/invoice_ui.inc:431
  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:397
+#: purchasing/includes/ui/invoice_ui.inc:398
  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:428
+#: purchasing/includes/ui/invoice_ui.inc:429
  msgid "Items Received Yet to be Invoiced"
  msgstr ""
  
  msgid "Items Received Yet to be Invoiced"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:433
+#: purchasing/includes/ui/invoice_ui.inc:434
  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:438
+#: purchasing/includes/ui/invoice_ui.inc:439
  msgid "Received Items Charged on this Invoice"
  msgstr ""
  
  msgid "Received Items Charged on this Invoice"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:440
+#: purchasing/includes/ui/invoice_ui.inc:441
  msgid "Received Items Credited on this Note"
  msgstr ""
  
  msgid "Received Items Credited on this Note"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:450
+#: purchasing/includes/ui/invoice_ui.inc:451
  msgid "Received between"
  msgstr ""
  
  msgid "Received between"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:461
+#: purchasing/includes/ui/invoice_ui.inc:462
  msgid "Add All Items"
  msgstr ""
  
  msgid "Add All Items"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:470
-#: purchasing/includes/ui/invoice_ui.inc:482
-#: sales/inquiry/sales_orders_view.php:150
+#: purchasing/includes/ui/invoice_ui.inc:471
+#: purchasing/includes/ui/invoice_ui.inc:483
+#: sales/inquiry/sales_orders_view.php:153
+#: sales/inquiry/sales_orders_view.php.orig:153
  msgid "Delivery"
  msgstr ""
  
  msgid "Delivery"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:470
+#: purchasing/includes/ui/invoice_ui.inc:471
  msgid "P.O."
  msgstr ""
  
  msgid "P.O."
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:471
+#: purchasing/includes/ui/invoice_ui.inc:472
  msgid "Received On"
  msgstr ""
  
  msgid "Received On"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:471 purchasing/view/view_po.php:46
+#: purchasing/includes/ui/invoice_ui.inc:472 purchasing/view/view_po.php:46
  msgid "Quantity Received"
  msgstr ""
  
  msgid "Quantity Received"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:471 purchasing/view/view_grn.php:41
+#: purchasing/includes/ui/invoice_ui.inc:472 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:472
+#: purchasing/includes/ui/invoice_ui.inc:473
  msgid "Qty Yet To Invoice"
  msgstr ""
  
  msgid "Qty Yet To Invoice"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:472
+#: purchasing/includes/ui/invoice_ui.inc:473
  #: purchasing/includes/ui/po_ui.inc:238
  #: sales/includes/ui/sales_order_ui.inc:142
  msgid "Price after Tax"
  msgstr ""
  
  #: purchasing/includes/ui/po_ui.inc:238
  #: sales/includes/ui/sales_order_ui.inc:142
  msgid "Price after Tax"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:472
+#: purchasing/includes/ui/invoice_ui.inc:473
  #: purchasing/includes/ui/po_ui.inc:238
  #: sales/includes/ui/sales_order_ui.inc:142
  msgid "Price before Tax"
  msgstr ""
  
  #: purchasing/includes/ui/po_ui.inc:238
  #: sales/includes/ui/sales_order_ui.inc:142
  msgid "Price before Tax"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:478
+#: purchasing/includes/ui/invoice_ui.inc:479
  msgid "Qty Yet To Credit"
  msgstr ""
  
  msgid "Qty Yet To Credit"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:483
+#: purchasing/includes/ui/invoice_ui.inc:484
  msgid "Line Value"
  msgstr ""
  
  msgid "Line Value"
  msgstr ""
  
-#: purchasing/includes/ui/invoice_ui.inc:550
+#: purchasing/includes/ui/invoice_ui.inc:551
  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:553
+#: purchasing/includes/ui/invoice_ui.inc:554
  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:554
+#: purchasing/includes/ui/invoice_ui.inc:555
  msgid "Credits can only be applied to invoiced items."
  msgstr ""
  
  msgid "Credits can only be applied to invoiced items."
  msgstr ""
  
@@ -8885,15 +9029,15 @@ msgstr ""
  msgid "Supplier Currency:"
  msgstr ""
  
  msgid "Supplier Currency:"
  msgstr ""
  
-#: purchasing/includes/ui/po_ui.inc:178 sales/sales_order_entry.php:684
+#: purchasing/includes/ui/po_ui.inc:178 sales/sales_order_entry.php:683
  msgid "Order Date:"
  msgstr ""
  
  msgid "Order Date:"
  msgstr ""
  
-#: purchasing/includes/ui/po_ui.inc:179 sales/sales_order_entry.php:671
+#: purchasing/includes/ui/po_ui.inc:179 sales/sales_order_entry.php:670
  msgid "Delivery Date:"
  msgstr ""
  
  msgid "Delivery Date:"
  msgstr ""
  
-#: purchasing/includes/ui/po_ui.inc:179 sales/sales_order_entry.php:665
+#: purchasing/includes/ui/po_ui.inc:179 sales/sales_order_entry.php:664
  msgid "Invoice Date:"
  msgstr ""
  
  msgid "Invoice Date:"
  msgstr ""
  
@@ -8938,17 +9082,18 @@ msgid "Line Total"
  msgstr ""
  
  #: purchasing/includes/ui/po_ui.inc:289 purchasing/po_receive_items.php:114
  msgstr ""
  
  #: purchasing/includes/ui/po_ui.inc:289 purchasing/po_receive_items.php:114
-#: reporting/includes/doctext.inc:149 sales/customer_credit_invoice.php:324
-#: sales/customer_delivery.php:498 sales/customer_invoice.php:544
-#: sales/view/view_dispatch.php:146 sales/view/view_invoice.php:148
-#: sales/includes/ui/sales_credit_ui.inc:217
+#: reporting/rep107.php:146 reporting/rep109.php:148 reporting/rep110.php:159
+#: reporting/rep111.php:135 reporting/rep113.php:148 reporting/rep209.php:167
+#: sales/customer_credit_invoice.php:324 sales/customer_delivery.php:501
+#: sales/customer_invoice.php:563 sales/view/view_dispatch.php:146
+#: sales/view/view_invoice.php:148 sales/includes/ui/sales_credit_ui.inc:217
  #: sales/includes/ui/sales_order_ui.inc:229
  msgid "Sub-total"
  msgstr ""
  
  #: purchasing/includes/ui/po_ui.inc:298 purchasing/po_receive_items.php:122
  #: purchasing/view/view_grn.php:79 purchasing/view/view_po.php:93
  #: sales/includes/ui/sales_order_ui.inc:229
  msgid "Sub-total"
  msgstr ""
  
  #: purchasing/includes/ui/po_ui.inc:298 purchasing/po_receive_items.php:122
  #: purchasing/view/view_grn.php:79 purchasing/view/view_po.php:93
-#: sales/customer_delivery.php:505 sales/view/view_sales_order.php:244
+#: sales/customer_delivery.php:508 sales/view/view_sales_order.php:244
  #: sales/includes/ui/sales_order_ui.inc:236
  msgid "Amount Total"
  msgstr ""
  #: sales/includes/ui/sales_order_ui.inc:236
  msgid "Amount Total"
  msgstr ""
@@ -9075,7 +9220,7 @@ msgstr ""
  msgid "Enter a new purchase order"
  msgstr ""
  
  msgid "Enter a new purchase order"
  msgstr ""
  
-#: purchasing/po_entry_items.php:213 sales/sales_order_entry.php:465
+#: purchasing/po_entry_items.php:213 sales/sales_order_entry.php:464
  msgid "Item description cannot be empty."
  msgstr ""
  
  msgid "Item description cannot be empty."
  msgstr ""
  
@@ -9111,8 +9256,7 @@ msgid ""
  msgstr ""
  
  #: purchasing/po_entry_items.php:326 purchasing/supplier_invoice.php:343
  msgstr ""
  
  #: purchasing/po_entry_items.php:326 purchasing/supplier_invoice.php:343
-#: purchasing/supplier_payment.php:117
-#: purchasing/supplier_payment.php.orig:114
+#: purchasing/supplier_payment.php:118
  msgid "There is no supplier selected."
  msgstr ""
  
  msgid "There is no supplier selected."
  msgstr ""
  
@@ -9121,7 +9265,7 @@ msgid "The entered order date is invalid."
  msgstr ""
  
  #: purchasing/po_entry_items.php:340 purchasing/po_receive_items.php:181
  msgstr ""
  
  #: purchasing/po_entry_items.php:340 purchasing/po_receive_items.php:181
-#: sales/sales_order_entry.php:347
+#: sales/sales_order_entry.php:345
  msgid "The entered date is not in fiscal year"
  msgstr ""
  
  msgid "The entered date is not in fiscal year"
  msgstr ""
  
@@ -9137,52 +9281,57 @@ msgstr ""
  msgid "You must enter a supplier's invoice reference."
  msgstr ""
  
  msgid "You must enter a supplier's invoice reference."
  msgstr ""
  
-#: purchasing/po_entry_items.php:377
+#: purchasing/po_entry_items.php:378 purchasing/supplier_invoice.php:187
+msgid ""
+"This invoice number has already been entered. It cannot be entered again."
+msgstr ""
+
+#: purchasing/po_entry_items.php:384
  msgid "There is no delivery address specified."
  msgstr ""
  
  msgid "There is no delivery address specified."
  msgstr ""
  
-#: purchasing/po_entry_items.php:383
+#: purchasing/po_entry_items.php:390
  msgid "There is no location specified to move any items into."
  msgstr ""
  
  msgid "There is no location specified to move any items into."
  msgstr ""
  
-#: purchasing/po_entry_items.php:390
+#: purchasing/po_entry_items.php:397
  msgid ""
  "The order cannot be placed because there are no lines entered on this order."
  msgstr ""
  
  msgid ""
  "The order cannot be placed because there are no lines entered on this order."
  msgstr ""
  
-#: purchasing/po_entry_items.php:516 sales/sales_order_entry.php:688
+#: purchasing/po_entry_items.php:523 sales/sales_order_entry.php:687
  msgid "Place Order"
  msgstr ""
  
  msgid "Place Order"
  msgstr ""
  
-#: purchasing/po_entry_items.php:517
+#: purchasing/po_entry_items.php:524
  msgid "Update Order"
  msgstr ""
  
  msgid "Update Order"
  msgstr ""
  
-#: purchasing/po_entry_items.php:518 sales/sales_order_entry.php:687
+#: purchasing/po_entry_items.php:525 sales/sales_order_entry.php:686
  msgid "Cancel Order"
  msgstr ""
  
  msgid "Cancel Order"
  msgstr ""
  
-#: purchasing/po_entry_items.php:520
+#: purchasing/po_entry_items.php:527
  msgid "Process GRN"
  msgstr ""
  
  msgid "Process GRN"
  msgstr ""
  
-#: purchasing/po_entry_items.php:521
+#: purchasing/po_entry_items.php:528
  msgid "Update GRN"
  msgstr ""
  
  msgid "Update GRN"
  msgstr ""
  
-#: purchasing/po_entry_items.php:522
+#: purchasing/po_entry_items.php:529
  msgid "Cancel GRN"
  msgstr ""
  
  msgid "Cancel GRN"
  msgstr ""
  
-#: purchasing/po_entry_items.php:525 sales/customer_invoice.php:563
+#: purchasing/po_entry_items.php:532 sales/customer_invoice.php:582
  msgid "Process Invoice"
  msgstr ""
  
  msgid "Process Invoice"
  msgstr ""
  
-#: purchasing/po_entry_items.php:526
+#: purchasing/po_entry_items.php:533
  msgid "Update Invoice"
  msgstr ""
  
  msgid "Update Invoice"
  msgstr ""
  
-#: purchasing/po_entry_items.php:527 sales/sales_order_entry.php:668
+#: purchasing/po_entry_items.php:534 sales/sales_order_entry.php:667
  msgid "Cancel Invoice"
  msgstr ""
  
  msgid "Cancel Invoice"
  msgstr ""
  
@@ -9209,17 +9358,17 @@ msgid ""
  msgstr ""
  
  #: purchasing/po_receive_items.php:62 reporting/rep105.php:112
  msgstr ""
  
  #: purchasing/po_receive_items.php:62 reporting/rep105.php:112
-#: sales/customer_delivery.php:429
+#: sales/customer_delivery.php:432
  msgid "Ordered"
  msgstr ""
  
  #: purchasing/po_receive_items.php:63 reporting/rep101.php:131
  #: reporting/rep105.php:113 reporting/rep105.php:167 reporting/rep201.php:119
  msgid "Ordered"
  msgstr ""
  
  #: purchasing/po_receive_items.php:63 reporting/rep101.php:131
  #: reporting/rep105.php:113 reporting/rep105.php:167 reporting/rep201.php:119
-#: reporting/includes/doctext.inc:119
+#: reporting/includes/doctext.inc:225
  msgid "Outstanding"
  msgstr ""
  
  msgid "Outstanding"
  msgstr ""
  
-#: purchasing/po_receive_items.php:63 sales/customer_delivery.php:430
+#: purchasing/po_receive_items.php:63 sales/customer_delivery.php:433
  msgid "This Delivery"
  msgstr ""
  
  msgid "This Delivery"
  msgstr ""
  
@@ -9375,11 +9524,6 @@ msgid ""
  "incorrect format."
  msgstr ""
  
  "incorrect format."
  msgstr ""
  
-#: purchasing/supplier_invoice.php:187
-msgid ""
-"This invoice number has already been entered. It cannot be entered again."
-msgstr ""
-
  #: purchasing/supplier_invoice.php:224
  msgid "The quantity to invoice must be numeric and greater than zero."
  msgstr ""
  #: purchasing/supplier_invoice.php:224
  msgid "The quantity to invoice must be numeric and greater than zero."
  msgstr ""
@@ -9416,87 +9560,74 @@ msgstr ""
  msgid "Enter Invoice"
  msgstr ""
  
  msgid "Enter Invoice"
  msgstr ""
  
-#: purchasing/supplier_payment.php:31 purchasing/supplier_payment.php.orig:31
+#: purchasing/supplier_payment.php:31
  msgid "Supplier Payment Entry"
  msgstr ""
  
  msgid "Supplier Payment Entry"
  msgstr ""
  
-#: purchasing/supplier_payment.php:88 purchasing/supplier_payment.php.orig:85
+#: purchasing/supplier_payment.php:90
  msgid "Invalid purchase invoice number."
  msgstr ""
  
  msgid "Invalid purchase invoice number."
  msgstr ""
  
-#: purchasing/supplier_payment.php:95 purchasing/supplier_payment.php.orig:92
+#: purchasing/supplier_payment.php:96
  msgid "Payment has been sucessfully entered"
  msgstr ""
  
  msgid "Payment has been sucessfully entered"
  msgstr ""
  
-#: purchasing/supplier_payment.php:97 purchasing/supplier_payment.php.orig:94
+#: purchasing/supplier_payment.php:98
  msgid "&Print This Remittance"
  msgstr ""
  
  msgid "&Print This Remittance"
  msgstr ""
  
-#: purchasing/supplier_payment.php:98 purchasing/supplier_payment.php.orig:95
+#: purchasing/supplier_payment.php:99
  msgid "&Email This Remittance"
  msgstr ""
  
  msgid "&Email This Remittance"
  msgstr ""
  
-#: purchasing/supplier_payment.php:100 purchasing/supplier_payment.php.orig:97
+#: purchasing/supplier_payment.php:101
  msgid "View the GL &Journal Entries for this Payment"
  msgstr ""
  
  msgid "View the GL &Journal Entries for this Payment"
  msgstr ""
  
-#: purchasing/supplier_payment.php:104
-#: purchasing/supplier_payment.php.orig:101
+#: purchasing/supplier_payment.php:105
  msgid "Enter another supplier &payment"
  msgstr ""
  
  msgid "Enter another supplier &payment"
  msgstr ""
  
-#: purchasing/supplier_payment.php:151
-#: purchasing/supplier_payment.php.orig:148 sales/customer_payments.php:139
-#: sales/customer_payments.php.orig:139
+#: purchasing/supplier_payment.php:152 sales/customer_payments.php:192
  msgid "The exchange rate must be numeric and greater than zero."
  msgstr ""
  
  msgid "The exchange rate must be numeric and greater than zero."
  msgstr ""
  
-#: purchasing/supplier_payment.php:163
-#: purchasing/supplier_payment.php.orig:160
+#: purchasing/supplier_payment.php:164
  msgid "The entered discount is invalid or less than zero."
  msgstr ""
  
  msgid "The entered discount is invalid or less than zero."
  msgstr ""
  
-#: purchasing/supplier_payment.php:171
-#: purchasing/supplier_payment.php.orig:168
+#: purchasing/supplier_payment.php:172
  msgid ""
  "The total of the amount and the discount is zero or negative. Please enter "
  "positive values."
  msgstr ""
  
  msgid ""
  "The total of the amount and the discount is zero or negative. Please enter "
  "positive values."
  msgstr ""
  
-#: purchasing/supplier_payment.php:272
-#: purchasing/supplier_payment.php.orig:269
+#: purchasing/supplier_payment.php:273
  msgid "Payment To:"
  msgstr ""
  
  msgid "Payment To:"
  msgstr ""
  
-#: purchasing/supplier_payment.php:279
-#: purchasing/supplier_payment.php.orig:281
+#: purchasing/supplier_payment.php:280
  msgid "From Bank Account:"
  msgstr ""
  
  msgid "From Bank Account:"
  msgstr ""
  
-#: purchasing/supplier_payment.php:287
-#: purchasing/supplier_payment.php.orig:289
+#: purchasing/supplier_payment.php:288
  #: 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:311
-#: purchasing/supplier_payment.php.orig:312 sales/customer_payments.php:288
-#: sales/customer_payments.php.orig:289
+#: purchasing/supplier_payment.php:311 sales/customer_payments.php:409
  msgid "Amount of Discount:"
  msgstr ""
  
  #: purchasing/supplier_payment.php:312
  msgid "Amount of Discount:"
  msgstr ""
  
  #: purchasing/supplier_payment.php:312
-#: purchasing/supplier_payment.php.orig:313
  msgid "Amount of Payment:"
  msgstr ""
  
  #: purchasing/supplier_payment.php:318
  msgid "Amount of Payment:"
  msgstr ""
  
  #: purchasing/supplier_payment.php:318
-#: purchasing/supplier_payment.php.orig:319
  msgid "The amount and discount are in the bank account's currency."
  msgstr ""
  
  #: purchasing/supplier_payment.php:321
  msgid "The amount and discount are in the bank account's currency."
  msgstr ""
  
  #: purchasing/supplier_payment.php:321
-#: purchasing/supplier_payment.php.orig:322
  msgid "Enter Payment"
  msgstr ""
  
  msgid "Enter Payment"
  msgstr ""
  
@@ -9514,8 +9645,8 @@ msgstr ""
  msgid "Line Details"
  msgstr ""
  
  msgid "Line Details"
  msgstr ""
  
-#: purchasing/view/view_grn.php:40 reporting/includes/doctext.inc:36
-#: reporting/includes/doctext.inc:105
+#: purchasing/view/view_grn.php:40 reporting/includes/doctext.inc:65
+#: reporting/includes/doctext.inc:170 reporting/includes/doctext.inc:222
  #: sales/inquiry/sales_deliveries_view.php:186
  msgid "Delivery Date"
  msgstr ""
  #: sales/inquiry/sales_deliveries_view.php:186
  msgid "Delivery Date"
  msgstr ""
@@ -9544,13 +9675,15 @@ msgid "Requested By"
  msgstr ""
  
  #: purchasing/view/view_po.php:100
  msgstr ""
  
  #: purchasing/view/view_po.php:100
-#: purchasing/inquiry/supplier_allocation_inquiry.php:147
-#: purchasing/inquiry/supplier_inquiry.php:187
+#: purchasing/inquiry/supplier_allocation_inquiry.php:148
+#: purchasing/inquiry/supplier_inquiry.php:193
  #: purchasing/inquiry/supplier_inquiry.php.orig:187
  #: purchasing/inquiry/supplier_inquiry.php.orig:187
-#: sales/inquiry/customer_allocation_inquiry.php:162
-#: sales/inquiry/customer_inquiry.php:239
+#: sales/inquiry/customer_allocation_inquiry.php:165
+#: sales/inquiry/customer_inquiry.php:251
+#: sales/inquiry/customer_inquiry.php.orig:251
  #: sales/inquiry/sales_deliveries_view.php:206
  #: sales/inquiry/sales_deliveries_view.php:206
-#: sales/inquiry/sales_orders_view.php:309
+#: sales/inquiry/sales_orders_view.php:316
+#: sales/inquiry/sales_orders_view.php.orig:316
  msgid "Marked items are overdue."
  msgstr ""
  
  msgid "Marked items are overdue."
  msgstr ""
  
@@ -9597,7 +9730,7 @@ msgstr ""
  msgid "SUPPLIER INVOICE"
  msgstr ""
  
  msgid "SUPPLIER INVOICE"
  msgstr ""
  
-#: purchasing/view/view_supp_invoice.php:72 reporting/includes/doctext.inc:153
+#: purchasing/view/view_supp_invoice.php:72 reporting/rep107.php:194
  #: sales/view/view_invoice.php:164
  msgid "TOTAL INVOICE"
  msgstr ""
  #: sales/view/view_invoice.php:164
  msgid "TOTAL INVOICE"
  msgstr ""
@@ -9622,201 +9755,211 @@ msgstr ""
  msgid "Payment Currency"
  msgstr ""
  
  msgid "Payment Currency"
  msgstr ""
  
-#: purchasing/view/view_supp_payment.php:66
+#: purchasing/view/view_supp_payment.php:62 sales/customer_delivery.php:433
+#: sales/customer_invoice.php:468 sales/view/view_receipt.php:45
+#: sales/view/view_sales_order.php:202
+msgid "Discount"
+msgstr ""
+
+#: purchasing/view/view_supp_payment.php:69
  msgid "Supplier's Currency"
  msgstr ""
  
  msgid "Supplier's Currency"
  msgstr ""
  
-#: purchasing/manage/suppliers.php:21 sales/manage/customer_branches.php:33
+#: purchasing/manage/suppliers.php:24 sales/manage/customer_branches.php:33
  msgid ""
  "There are no tax groups defined in the system. At least one tax group is "
  "required before proceeding."
  msgstr ""
  
  msgid ""
  "There are no tax groups defined in the system. At least one tax group is "
  "required before proceeding."
  msgstr ""
  
-#: purchasing/manage/suppliers.php:83
+#: purchasing/manage/suppliers.php:86
  msgid "Basic Data"
  msgstr ""
  
  msgid "Basic Data"
  msgstr ""
  
-#: purchasing/manage/suppliers.php:85
+#: purchasing/manage/suppliers.php:88
  msgid "Supplier Name:"
  msgstr ""
  
  msgid "Supplier Name:"
  msgstr ""
  
-#: purchasing/manage/suppliers.php:86
+#: purchasing/manage/suppliers.php:89
  msgid "Supplier Short Name:"
  msgstr ""
  
  msgid "Supplier Short Name:"
  msgstr ""
  
-#: purchasing/manage/suppliers.php:89
+#: purchasing/manage/suppliers.php:92
  msgid "Website:"
  msgstr ""
  
  msgid "Website:"
  msgstr ""
  
-#: purchasing/manage/suppliers.php:100
-msgid "Our Customer No:"
-msgstr ""
-
  #: purchasing/manage/suppliers.php:103
  #: purchasing/manage/suppliers.php:103
-msgid "Contact Data"
-msgstr ""
-
-#: purchasing/manage/suppliers.php:109
-msgid "System default"
+msgid "Our Customer No:"
  msgstr ""
  
  msgstr ""
  
-#: purchasing/manage/suppliers.php:111
+#: purchasing/manage/suppliers.php:105
  msgid "Purchasing"
  msgstr ""
  
  msgid "Purchasing"
  msgstr ""
  
-#: purchasing/manage/suppliers.php:112
+#: purchasing/manage/suppliers.php:106
  msgid "Bank Name/Account:"
  msgstr ""
  
  msgid "Bank Name/Account:"
  msgstr ""
  
-#: purchasing/manage/suppliers.php:113 sales/manage/customers.php:228
+#: purchasing/manage/suppliers.php:107 sales/manage/customers.php:259
+#: sales/manage/customers.php.orig:260
  msgid "Credit Limit:"
  msgstr ""
  
  msgid "Credit Limit:"
  msgstr ""
  
-#: purchasing/manage/suppliers.php:114 sales/manage/customers.php:230
+#: purchasing/manage/suppliers.php:108 sales/manage/customers.php:261
+#: sales/manage/customers.php.orig:262
  msgid "Payment Terms:"
  msgstr ""
  
  msgid "Payment Terms:"
  msgstr ""
  
-#: purchasing/manage/suppliers.php:120 purchasing/manage/suppliers.php:123
+#: purchasing/manage/suppliers.php:114 purchasing/manage/suppliers.php:117
  msgid "Prices contain tax included:"
  msgstr ""
  
  msgid "Prices contain tax included:"
  msgstr ""
  
-#: purchasing/manage/suppliers.php:125 reporting/rep704.php:91
-#: reporting/rep704.php:101 reporting/rep704.php:109
+#: purchasing/manage/suppliers.php:119 reporting/rep704.php:92
+#: reporting/rep704.php:102 reporting/rep704.php:110
  msgid "Accounts"
  msgstr ""
  
  msgid "Accounts"
  msgstr ""
  
-#: purchasing/manage/suppliers.php:126
+#: purchasing/manage/suppliers.php:120
  msgid "Accounts Payable Account:"
  msgstr ""
  
  msgid "Accounts Payable Account:"
  msgstr ""
  
-#: purchasing/manage/suppliers.php:127
+#: purchasing/manage/suppliers.php:121
  msgid "Purchase Account:"
  msgstr ""
  
  msgid "Purchase Account:"
  msgstr ""
  
-#: purchasing/manage/suppliers.php:128
+#: purchasing/manage/suppliers.php:122
  msgid "Use Item Inventory/COGS Account"
  msgstr ""
  
  msgid "Use Item Inventory/COGS Account"
  msgstr ""
  
-#: purchasing/manage/suppliers.php:146 sales/manage/customer_branches.php:266
+#: purchasing/manage/suppliers.php:125 purchasing/manage/suppliers.php:154
+msgid "Contact Data"
+msgstr ""
+
+#: purchasing/manage/suppliers.php:145 sales/manage/customer_branches.php:266
  msgid "Addresses"
  msgstr ""
  
  msgid "Addresses"
  msgstr ""
  
-#: purchasing/manage/suppliers.php:147 sales/manage/customer_branches.php:267
+#: purchasing/manage/suppliers.php:146 sales/manage/customer_branches.php:267
  msgid "Mailing Address:"
  msgstr ""
  
  msgid "Mailing Address:"
  msgstr ""
  
-#: purchasing/manage/suppliers.php:148
+#: purchasing/manage/suppliers.php:147
  msgid "Physical Address:"
  msgstr ""
  
  msgid "Physical Address:"
  msgstr ""
  
-#: purchasing/manage/suppliers.php:150
+#: purchasing/manage/suppliers.php:149
  msgid "General"
  msgstr ""
  
  msgid "General"
  msgstr ""
  
-#: purchasing/manage/suppliers.php:151 sales/manage/customer_branches.php:269
-#: sales/manage/customers.php:251
+#: purchasing/manage/suppliers.php:150 sales/manage/customer_branches.php:269
+#: sales/manage/customers.php:282 sales/manage/customers.php.orig:283
  msgid "General Notes:"
  msgstr ""
  
  msgid "General Notes:"
  msgstr ""
  
-#: purchasing/manage/suppliers.php:153
+#: purchasing/manage/suppliers.php:152
  msgid "Supplier status:"
  msgstr ""
  
  msgid "Supplier status:"
  msgstr ""
  
-#: purchasing/manage/suppliers.php:160
+#: purchasing/manage/suppliers.php:158
+msgid "System default"
+msgstr ""
+
+#: purchasing/manage/suppliers.php:165
  msgid "Update Supplier"
  msgstr ""
  
  msgid "Update Supplier"
  msgstr ""
  
-#: purchasing/manage/suppliers.php:161
+#: purchasing/manage/suppliers.php:166
  msgid "Update supplier data"
  msgstr ""
  
  msgid "Update supplier data"
  msgstr ""
  
-#: purchasing/manage/suppliers.php:162
+#: purchasing/manage/suppliers.php:167
  msgid "Select this supplier and return to document entry."
  msgstr ""
  
  msgid "Select this supplier and return to document entry."
  msgstr ""
  
-#: purchasing/manage/suppliers.php:163
+#: purchasing/manage/suppliers.php:168
  msgid "Delete Supplier"
  msgstr ""
  
  msgid "Delete Supplier"
  msgstr ""
  
-#: purchasing/manage/suppliers.php:164
+#: purchasing/manage/suppliers.php:169
  msgid "Delete supplier data if have been never used"
  msgstr ""
  
  msgid "Delete supplier data if have been never used"
  msgstr ""
  
-#: purchasing/manage/suppliers.php:168
+#: purchasing/manage/suppliers.php:173
  msgid "Add New Supplier Details"
  msgstr ""
  
  msgid "Add New Supplier Details"
  msgstr ""
  
-#: purchasing/manage/suppliers.php:187
+#: purchasing/manage/suppliers.php:192
  msgid "The supplier name must be entered."
  msgstr ""
  
  msgid "The supplier name must be entered."
  msgstr ""
  
-#: purchasing/manage/suppliers.php:194
+#: purchasing/manage/suppliers.php:199
  msgid "The supplier short name must be entered."
  msgstr ""
  
  msgid "The supplier short name must be entered."
  msgstr ""
  
-#: purchasing/manage/suppliers.php:214
+#: purchasing/manage/suppliers.php:219
  msgid "Supplier has been updated."
  msgstr ""
  
  msgid "Supplier has been updated."
  msgstr ""
  
-#: purchasing/manage/suppliers.php:232
+#: purchasing/manage/suppliers.php:237
  msgid "A new supplier has been added."
  msgstr ""
  
  msgid "A new supplier has been added."
  msgstr ""
  
-#: purchasing/manage/suppliers.php:250
+#: purchasing/manage/suppliers.php:255
  msgid ""
  "Cannot delete this supplier because there are transactions that refer to "
  "this supplier."
  msgstr ""
  
  msgid ""
  "Cannot delete this supplier because there are transactions that refer to "
  "this supplier."
  msgstr ""
  
-#: purchasing/manage/suppliers.php:258
+#: purchasing/manage/suppliers.php:263
  msgid ""
  "Cannot delete the supplier record because purchase orders have been created "
  "against this supplier."
  msgstr ""
  
  msgid ""
  "Cannot delete the supplier record because purchase orders have been created "
  "against this supplier."
  msgstr ""
  
-#: purchasing/manage/suppliers.php:279
+#: purchasing/manage/suppliers.php:284
  #: purchasing/inquiry/supplier_allocation_inquiry.php:48
  msgid "Select a supplier: "
  msgstr ""
  
  #: purchasing/inquiry/supplier_allocation_inquiry.php:48
  msgid "Select a supplier: "
  msgstr ""
  
-#: purchasing/manage/suppliers.php:280
+#: purchasing/manage/suppliers.php:285
  msgid "New supplier"
  msgstr ""
  
  msgid "New supplier"
  msgstr ""
  
-#: purchasing/manage/suppliers.php:298 sales/manage/customer_branches.php:322
-#: sales/manage/customers.php:300
-msgid "&General settings"
+#: purchasing/manage/suppliers.php:304 sales/manage/customer_branches.php:323
+#: sales/manage/customers.php:339 sales/manage/customers.php.orig:340
+msgid "&Contacts"
  msgstr ""
  
  msgstr ""
  
-#: purchasing/manage/suppliers.php:299 sales/manage/customer_branches.php:323
-#: sales/manage/customers.php:301
-msgid "&Contacts"
+#: purchasing/manage/suppliers.php:306
+msgid "Purchase &Orders"
  msgstr ""
  
  msgstr ""
  
-#: purchasing/inquiry/po_search_completed.php:24
+#: purchasing/inquiry/po_search_completed.php:26
  msgid "Search Purchase Orders"
  msgstr ""
  
  msgid "Search Purchase Orders"
  msgstr ""
  
-#: purchasing/inquiry/po_search_completed.php:60
+#: purchasing/inquiry/po_search_completed.php:63
  #: purchasing/inquiry/po_search.php:62
  #: sales/inquiry/sales_deliveries_view.php:103
  #: purchasing/inquiry/po_search.php:62
  #: sales/inquiry/sales_deliveries_view.php:103
-#: sales/inquiry/sales_orders_view.php:217
+#: sales/inquiry/sales_orders_view.php:223
+#: sales/inquiry/sales_orders_view.php.orig:223
  msgid "#:"
  msgstr ""
  
  msgid "#:"
  msgstr ""
  
-#: purchasing/inquiry/po_search_completed.php:65
+#: purchasing/inquiry/po_search_completed.php:68
  msgid "into location:"
  msgstr ""
  
  msgid "into location:"
  msgstr ""
  
-#: purchasing/inquiry/po_search_completed.php:121
+#: purchasing/inquiry/po_search_completed.php:126
  #: purchasing/inquiry/po_search.php:135
  #: purchasing/inquiry/po_search.php:135
-#: sales/inquiry/sales_orders_view.php:258
+#: sales/inquiry/sales_orders_view.php:265
+#: sales/inquiry/sales_orders_view.php.orig:265
  msgid "Order Date"
  msgstr ""
  
  msgid "Order Date"
  msgstr ""
  
-#: purchasing/inquiry/po_search_completed.php:123
+#: purchasing/inquiry/po_search_completed.php:128
  #: purchasing/inquiry/po_search.php:137
  #: purchasing/inquiry/po_search.php:137
-#: sales/inquiry/sales_orders_view.php:261
+#: sales/inquiry/sales_orders_view.php:268
+#: sales/inquiry/sales_orders_view.php.orig:268
  msgid "Order Total"
  msgstr ""
  
  msgid "Order Total"
  msgstr ""
  
@@ -9841,78 +9984,90 @@ msgstr ""
  msgid "show settled:"
  msgstr ""
  
  msgid "show settled:"
  msgstr ""
  
-#: purchasing/inquiry/supplier_allocation_inquiry.php:129
+#: purchasing/inquiry/supplier_allocation_inquiry.php:103
+msgid "Pay"
+msgstr ""
+
+#: purchasing/inquiry/supplier_allocation_inquiry.php:130
  msgid "Supp Reference"
  msgstr ""
  
  msgid "Supp Reference"
  msgstr ""
  
-#: purchasing/inquiry/supplier_allocation_inquiry.php:135
+#: purchasing/inquiry/supplier_allocation_inquiry.php:136
  #: reporting/rep101.php:131 reporting/rep201.php:119
  #: reporting/rep101.php:131 reporting/rep201.php:119
-#: reporting/includes/doctext.inc:119
-#: sales/inquiry/customer_allocation_inquiry.php:151
+#: reporting/includes/doctext.inc:225
+#: sales/inquiry/customer_allocation_inquiry.php:154
  msgid "Allocated"
  msgstr ""
  
  msgid "Allocated"
  msgstr ""
  
-#: purchasing/inquiry/supplier_inquiry.php:25
+#: purchasing/inquiry/supplier_inquiry.php:27
  #: purchasing/inquiry/supplier_inquiry.php.orig:25
  msgid "Supplier Inquiry"
  msgstr ""
  
  #: purchasing/inquiry/supplier_inquiry.php.orig:25
  msgid "Supplier Inquiry"
  msgstr ""
  
-#: purchasing/inquiry/supplier_inquiry.php:47
+#: purchasing/inquiry/supplier_inquiry.php:51
  #: purchasing/inquiry/supplier_inquiry.php.orig:47
  msgid "Select a supplier:"
  msgstr ""
  
  #: purchasing/inquiry/supplier_inquiry.php.orig:47
  msgid "Select a supplier:"
  msgstr ""
  
-#: purchasing/inquiry/supplier_inquiry.php:66
-#: purchasing/inquiry/supplier_inquiry.php:67
-#: purchasing/inquiry/supplier_inquiry.php:68
+#: purchasing/inquiry/supplier_inquiry.php:70
+#: purchasing/inquiry/supplier_inquiry.php:71
+#: purchasing/inquiry/supplier_inquiry.php:72
  #: purchasing/inquiry/supplier_inquiry.php.orig:66
  #: purchasing/inquiry/supplier_inquiry.php.orig:67
  #: purchasing/inquiry/supplier_inquiry.php.orig:66
  #: purchasing/inquiry/supplier_inquiry.php.orig:67
-#: purchasing/inquiry/supplier_inquiry.php.orig:68 reporting/rep102.php:120
-#: reporting/rep102.php:121 reporting/rep102.php:122 reporting/rep102.php:242
+#: purchasing/inquiry/supplier_inquiry.php.orig:68 reporting/rep102.php:118
+#: reporting/rep102.php:119 reporting/rep102.php:120 reporting/rep102.php:240
+#: reporting/rep108.php:150 reporting/rep108.php:151 reporting/rep108.php:152
  #: reporting/rep202.php:122 reporting/rep202.php:123 reporting/rep202.php:124
  #: reporting/rep202.php:154 reporting/rep202.php:155 reporting/rep202.php:156
  #: reporting/rep202.php:122 reporting/rep202.php:123 reporting/rep202.php:124
  #: reporting/rep202.php:154 reporting/rep202.php:155 reporting/rep202.php:156
-#: reporting/rep202.php:248 reporting/includes/doctext.inc:181
-#: sales/create_recurrent_invoices.php:115
+#: reporting/rep202.php:248 sales/create_recurrent_invoices.php:115
  #: sales/manage/recurrent_invoices.php:102
  #: sales/manage/recurrent_invoices.php:102
-#: sales/inquiry/customer_inquiry.php:71 sales/inquiry/customer_inquiry.php:72
-#: sales/inquiry/customer_inquiry.php:73
+#: sales/inquiry/customer_inquiry.php:75 sales/inquiry/customer_inquiry.php:76
+#: sales/inquiry/customer_inquiry.php:77
+#: sales/inquiry/customer_inquiry.php.orig:75
+#: sales/inquiry/customer_inquiry.php.orig:76
+#: sales/inquiry/customer_inquiry.php.orig:77
  msgid "Days"
  msgstr ""
  
  msgid "Days"
  msgstr ""
  
-#: purchasing/inquiry/supplier_inquiry.php:68
-#: purchasing/inquiry/supplier_inquiry.php.orig:68 reporting/rep102.php:122
-#: reporting/rep202.php:124 reporting/rep202.php:156
-#: reporting/includes/doctext.inc:182 sales/inquiry/customer_inquiry.php:73
+#: purchasing/inquiry/supplier_inquiry.php:72
+#: purchasing/inquiry/supplier_inquiry.php.orig:68 reporting/rep102.php:120
+#: reporting/rep108.php:152 reporting/rep202.php:124 reporting/rep202.php:156
+#: sales/inquiry/customer_inquiry.php:77
+#: sales/inquiry/customer_inquiry.php.orig:77
  msgid "Over"
  msgstr ""
  
  msgid "Over"
  msgstr ""
  
-#: purchasing/inquiry/supplier_inquiry.php:72
+#: purchasing/inquiry/supplier_inquiry.php:76
  #: purchasing/inquiry/supplier_inquiry.php.orig:72
  #: purchasing/inquiry/supplier_inquiry.php.orig:72
-#: sales/inquiry/customer_inquiry.php:76
+#: sales/inquiry/customer_inquiry.php:80
+#: sales/inquiry/customer_inquiry.php.orig:80
  msgid "Terms"
  msgstr ""
  
  msgid "Terms"
  msgstr ""
  
-#: purchasing/inquiry/supplier_inquiry.php:72
-#: purchasing/inquiry/supplier_inquiry.php.orig:72 reporting/rep102.php:125
-#: reporting/rep102.php:240 reporting/rep202.php:128 reporting/rep202.php:246
-#: reporting/includes/doctext.inc:177 sales/inquiry/customer_inquiry.php:76
+#: purchasing/inquiry/supplier_inquiry.php:76
+#: purchasing/inquiry/supplier_inquiry.php.orig:72 reporting/rep102.php:123
+#: reporting/rep102.php:238 reporting/rep108.php:154 reporting/rep202.php:128
+#: reporting/rep202.php:246 sales/inquiry/customer_inquiry.php:80
+#: sales/inquiry/customer_inquiry.php.orig:80
  msgid "Current"
  msgstr ""
  
  msgid "Current"
  msgstr ""
  
-#: purchasing/inquiry/supplier_inquiry.php:73
-#: purchasing/inquiry/supplier_inquiry.php.orig:73 reporting/rep102.php:126
-#: reporting/rep202.php:129 reporting/includes/doctext.inc:178
-#: sales/inquiry/customer_inquiry.php:77
+#: purchasing/inquiry/supplier_inquiry.php:77
+#: purchasing/inquiry/supplier_inquiry.php.orig:73 reporting/rep102.php:124
+#: reporting/rep108.php:154 reporting/rep202.php:129
+#: sales/inquiry/customer_inquiry.php:81
+#: sales/inquiry/customer_inquiry.php.orig:81
  msgid "Total Balance"
  msgstr ""
  
  msgid "Total Balance"
  msgstr ""
  
-#: purchasing/inquiry/supplier_inquiry.php:127
+#: purchasing/inquiry/supplier_inquiry.php:133
  #: purchasing/inquiry/supplier_inquiry.php.orig:127
  #: purchasing/inquiry/supplier_inquiry.php.orig:127
-#: sales/inquiry/customer_inquiry.php:158
+#: sales/inquiry/customer_inquiry.php:164
+#: sales/inquiry/customer_inquiry.php.orig:164
  msgid "Credit This"
  msgstr ""
  
  msgid "Credit This"
  msgstr ""
  
-#: purchasing/inquiry/supplier_inquiry.php:149
+#: purchasing/inquiry/supplier_inquiry.php:155
  #: purchasing/inquiry/supplier_inquiry.php.orig:149
  msgid "Print Remittance"
  msgstr ""
  #: purchasing/inquiry/supplier_inquiry.php.orig:149
  msgid "Print Remittance"
  msgstr ""
@@ -9982,32 +10137,32 @@ msgstr ""
  msgid "Marked items are settled."
  msgstr ""
  
  msgid "Marked items are settled."
  msgstr ""
  
-#: reporting/rep101.php:120 reporting/rep102.php:108 reporting/rep114.php:103
+#: reporting/rep101.php:120 reporting/rep102.php:106 reporting/rep114.php:103
  #: reporting/rep202.php:110 reporting/rep203.php:81
  msgid "Balances in Home Currency"
  msgstr ""
  
  #: reporting/rep101.php:130 reporting/rep201.php:118 reporting/rep203.php:91
  #: reporting/rep202.php:110 reporting/rep203.php:81
  msgid "Balances in Home Currency"
  msgstr ""
  
  #: reporting/rep101.php:130 reporting/rep201.php:118 reporting/rep203.php:91
-#: reporting/rep709.php:109 reporting/includes/doctext.inc:110
-#: reporting/includes/doctext.inc:118
+#: reporting/rep709.php:109 reporting/includes/doctext.inc:145
+#: reporting/includes/doctext.inc:186 reporting/includes/doctext.inc:224
  msgid "Trans Type"
  msgstr ""
  
  #: reporting/rep101.php:130 reporting/rep201.php:118
  msgid "Trans Type"
  msgstr ""
  
  #: reporting/rep101.php:130 reporting/rep201.php:118
-#: reporting/includes/doctext.inc:118
+#: reporting/includes/doctext.inc:224
  msgid "Charges"
  msgstr ""
  
  #: reporting/rep101.php:130 reporting/rep201.php:119
  msgid "Charges"
  msgstr ""
  
  #: reporting/rep101.php:130 reporting/rep201.php:119
-#: reporting/includes/doctext.inc:119
+#: reporting/includes/doctext.inc:225
  msgid "Credits"
  msgstr ""
  
  msgid "Credits"
  msgstr ""
  
-#: reporting/rep101.php:139 reporting/rep102.php:136 reporting/rep201.php:127
+#: reporting/rep101.php:139 reporting/rep102.php:134 reporting/rep201.php:127
  #: reporting/rep202.php:139 reporting/rep203.php:100 reporting/rep303.php:124
  #: reporting/reports_main.php:38 reporting/reports_main.php:47
  #: reporting/reports_main.php:138 reporting/reports_main.php:147
  #: reporting/rep202.php:139 reporting/rep203.php:100 reporting/rep303.php:124
  #: reporting/reports_main.php:38 reporting/reports_main.php:47
  #: reporting/reports_main.php:138 reporting/reports_main.php:147
-#: reporting/reports_main.php:155 reporting/reports_main.php:194
+#: reporting/reports_main.php:155 reporting/reports_main.php:195
  msgid "Suppress Zeros"
  msgstr ""
  
  msgid "Suppress Zeros"
  msgstr ""
  
@@ -10015,48 +10170,49 @@ msgstr ""
  msgid "Customer Balances"
  msgstr ""
  
  msgid "Customer Balances"
  msgstr ""
  
-#: reporting/rep101.php:244 reporting/rep102.php:226 reporting/rep106.php:177
+#: reporting/rep101.php:244 reporting/rep102.php:224 reporting/rep106.php:177
  #: reporting/rep201.php:231 reporting/rep202.php:231 reporting/rep203.php:177
  #: reporting/rep201.php:231 reporting/rep202.php:231 reporting/rep203.php:177
-#: reporting/rep204.php:144 reporting/rep301.php:172 reporting/rep304.php:193
+#: reporting/rep204.php:144 reporting/rep301.php:176 reporting/rep304.php:191
  #: reporting/rep305.php:181
  msgid "Grand Total"
  msgstr ""
  
  #: reporting/rep305.php:181
  msgid "Grand Total"
  msgstr ""
  
-#: reporting/rep102.php:102 reporting/rep106.php:91 reporting/rep202.php:104
+#: reporting/rep102.php:100 reporting/rep106.php:91 reporting/rep202.php:104
  #: reporting/rep709.php:93 reporting/reports_main.php:46
  #: reporting/reports_main.php:84 reporting/reports_main.php:146
  #: reporting/rep709.php:93 reporting/reports_main.php:46
  #: reporting/reports_main.php:84 reporting/reports_main.php:146
-#: reporting/reports_main.php:180 reporting/reports_main.php:392
+#: reporting/reports_main.php:181 reporting/reports_main.php:393
  msgid "Summary Only"
  msgstr ""
  
  msgid "Summary Only"
  msgstr ""
  
-#: reporting/rep102.php:104 reporting/rep202.php:106 reporting/rep709.php:95
+#: reporting/rep102.php:102 reporting/rep202.php:106 reporting/rep709.php:95
  msgid "Detailed Report"
  msgstr ""
  
  msgid "Detailed Report"
  msgstr ""
  
-#: reporting/rep102.php:131 reporting/rep202.php:134 reporting/rep203.php:97
-#: reporting/reports_main.php:35 reporting/reports_main.php:42
-#: reporting/reports_main.php:61 reporting/reports_main.php:75
-#: reporting/reports_main.php:83 reporting/reports_main.php:135
-#: reporting/reports_main.php:142 reporting/reports_main.php:152
-#: reporting/reports_main.php:199 reporting/reports_main.php:207
-#: reporting/reports_main.php:239 reporting/reports_main.php:250
-#: reporting/reports_main.php:261 reporting/reports_main.php:277
-#: reporting/reports_main.php:287 reporting/reports_main.php:298
-#: reporting/reports_main.php:310 reporting/reports_main.php:324
-#: reporting/reports_main.php:333 reporting/reports_main.php:343
-#: reporting/reports_main.php:354 reporting/reports_main.php:366
-#: reporting/reports_main.php:374 reporting/reports_main.php:383
-#: reporting/reports_main.php:391 reporting/reports_main.php:397
+#: reporting/rep102.php:129 reporting/rep202.php:134 reporting/rep203.php:97
+#: reporting/rep301.php:108 reporting/reports_main.php:35
+#: reporting/reports_main.php:42 reporting/reports_main.php:61
+#: reporting/reports_main.php:75 reporting/reports_main.php:83
+#: reporting/reports_main.php:135 reporting/reports_main.php:142
+#: reporting/reports_main.php:152 reporting/reports_main.php:178
+#: reporting/reports_main.php:200 reporting/reports_main.php:208
+#: reporting/reports_main.php:240 reporting/reports_main.php:251
+#: reporting/reports_main.php:262 reporting/reports_main.php:278
+#: reporting/reports_main.php:288 reporting/reports_main.php:299
+#: reporting/reports_main.php:311 reporting/reports_main.php:325
+#: reporting/reports_main.php:334 reporting/reports_main.php:344
+#: reporting/reports_main.php:355 reporting/reports_main.php:367
+#: reporting/reports_main.php:375 reporting/reports_main.php:384
+#: reporting/reports_main.php:392 reporting/reports_main.php:398
  msgid "End Date"
  msgstr ""
  
  msgid "End Date"
  msgstr ""
  
-#: reporting/rep102.php:135 reporting/rep202.php:138
+#: reporting/rep102.php:133 reporting/rep202.php:138
  #: reporting/reports_main.php:45 reporting/reports_main.php:110
  #: reporting/reports_main.php:145
  msgid "Show Also Allocated"
  msgstr ""
  
  #: reporting/reports_main.php:45 reporting/reports_main.php:110
  #: reporting/reports_main.php:145
  msgid "Show Also Allocated"
  msgstr ""
  
-#: reporting/rep102.php:140
+#: reporting/rep102.php:138
  msgid "Aged Customer Analysis"
  msgstr ""
  
  msgid "Aged Customer Analysis"
  msgstr ""
  
@@ -10117,7 +10273,7 @@ msgstr ""
  msgid "Customers in"
  msgstr ""
  
  msgid "Customers in"
  msgstr ""
  
-#: reporting/rep103.php:196 sales/includes/ui/sales_order_ui.inc:413
+#: reporting/rep103.php:196
  msgid "Price List"
  msgstr ""
  
  msgid "Price List"
  msgstr ""
  
@@ -10133,7 +10289,7 @@ msgstr ""
  msgid "Category/Items"
  msgstr ""
  
  msgid "Category/Items"
  msgstr ""
  
-#: reporting/rep104.php:109 reporting/rep301.php:100 reporting/rep303.php:109
+#: reporting/rep104.php:109 reporting/rep301.php:103 reporting/rep303.php:109
  #: reporting/rep303.php:115
  msgid "UOM"
  msgstr ""
  #: reporting/rep303.php:115
  msgid "UOM"
  msgstr ""
@@ -10163,19 +10319,25 @@ msgid "Back Orders Only"
  msgstr ""
  
  #: reporting/rep105.php:107 reporting/rep204.php:82
  msgstr ""
  
  #: reporting/rep105.php:107 reporting/rep204.php:82
-#: sales/inquiry/customer_allocation_inquiry.php:144
-#: sales/inquiry/customer_inquiry.php:214
+#: sales/inquiry/customer_allocation_inquiry.php:147
+#: sales/inquiry/customer_inquiry.php:226
+#: sales/inquiry/customer_inquiry.php.orig:226
  msgid "Order"
  msgstr ""
  
  msgid "Order"
  msgstr ""
  
-#: reporting/rep105.php:107 reporting/rep106.php:81
-#: reporting/includes/doctext.inc:165 sales/create_recurrent_invoices.php:115
-#: sales/customer_credit_invoice.php:238 sales/customer_delivery.php:336
-#: sales/customer_invoice.php:375 sales/manage/recurrent_invoices.php:102
-#: sales/view/view_credit.php:58 sales/inquiry/customer_inquiry.php:219
+#: reporting/rep105.php:107 reporting/rep106.php:81 reporting/rep112.php:168
+#: sales/create_recurrent_invoices.php:115
+#: sales/customer_credit_invoice.php:238 sales/customer_delivery.php:339
+#: sales/customer_invoice.php:379 sales/manage/customers.php:247
+#: sales/manage/customers.php:285 sales/manage/customers.php.orig:248
+#: sales/manage/customers.php.orig:286 sales/manage/recurrent_invoices.php:102
+#: sales/view/view_credit.php:58 sales/inquiry/customer_inquiry.php:231
+#: sales/inquiry/customer_inquiry.php.orig:231
  #: sales/inquiry/sales_deliveries_view.php:182
  #: sales/inquiry/sales_deliveries_view.php:182
-#: sales/inquiry/sales_orders_view.php:256
-#: sales/inquiry/sales_orders_view.php:270
+#: sales/inquiry/sales_orders_view.php:263
+#: sales/inquiry/sales_orders_view.php:277
+#: sales/inquiry/sales_orders_view.php.orig:263
+#: sales/inquiry/sales_orders_view.php.orig:277
  msgid "Branch"
  msgstr ""
  
  msgid "Branch"
  msgstr ""
  
@@ -10195,8 +10357,8 @@ msgstr ""
  msgid "Loc"
  msgstr ""
  
  msgid "Loc"
  msgstr ""
  
-#: reporting/rep105.php:112 sales/customer_delivery.php:429
-#: sales/customer_invoice.php:448
+#: reporting/rep105.php:112 sales/customer_delivery.php:432
+#: sales/customer_invoice.php:467
  msgid "Invoiced"
  msgstr ""
  
  msgid "Invoiced"
  msgstr ""
  
@@ -10222,7 +10384,7 @@ msgstr ""
  msgid "Salesman"
  msgstr ""
  
  msgid "Salesman"
  msgstr ""
  
-#: reporting/rep106.php:86 reporting/includes/header2.inc:98
+#: reporting/rep106.php:86 reporting/includes/header2.inc:110
  #: sales/manage/sales_people.php:99
  msgid "Email"
  msgstr ""
  #: sales/manage/sales_people.php:99
  msgid "Email"
  msgstr ""
@@ -10235,76 +10397,136 @@ msgstr ""
  msgid "Salesman Listing"
  msgstr ""
  
  msgid "Salesman Listing"
  msgstr ""
  
-#: reporting/rep107.php:66 reporting/rep107.php:91 reporting/rep107.php:96
-#: reporting/includes/doctext.inc:94
+#: reporting/rep107.php:66 reporting/rep107.php:89 reporting/rep107.php:94
+#: reporting/includes/doctext.inc:105
  msgid "INVOICE"
  msgstr ""
  
  msgid "INVOICE"
  msgstr ""
  
+#: reporting/rep107.php:149 reporting/rep109.php:151 reporting/rep110.php:162
+#: reporting/rep111.php:138 reporting/rep113.php:151
+#: sales/view/view_credit.php:138 sales/view/view_dispatch.php:155
+#: sales/view/view_invoice.php:157 sales/view/view_sales_order.php:227
+#: sales/includes/ui/sales_credit_ui.inc:222
+msgid "Shipping"
+msgstr ""
+
  #: reporting/rep108.php:84 reporting/rep108.php:115
  #: reporting/rep108.php:84 reporting/rep108.php:115
-#: reporting/includes/doctext.inc:117
+#: reporting/includes/doctext.inc:216
  msgid "STATEMENT"
  msgstr ""
  
  msgid "STATEMENT"
  msgstr ""
  
+#: reporting/rep108.php:126
+msgid "Outstanding Transactions"
+msgstr ""
+
+#: reporting/rep108.php:169
+msgid "Statement"
+msgstr ""
+
+#: reporting/rep108.php:169
+msgid "as of"
+msgstr ""
+
  #: reporting/rep109.php:65 reporting/rep109.php:93 reporting/rep109.php:99
  #: reporting/rep109.php:65 reporting/rep109.php:93 reporting/rep109.php:99
-#: reporting/includes/doctext.inc:92
+#: reporting/includes/doctext.inc:53
  msgid "SALES ORDER"
  msgstr ""
  
  #: reporting/rep109.php:67 reporting/rep109.php:88 reporting/rep109.php:99
  msgid "SALES ORDER"
  msgstr ""
  
  #: reporting/rep109.php:67 reporting/rep109.php:88 reporting/rep109.php:99
-#: reporting/includes/doctext.inc:92
+#: reporting/includes/doctext.inc:53
  msgid "QUOTE"
  msgstr ""
  
  msgid "QUOTE"
  msgstr ""
  
+#: reporting/rep109.php:157 reporting/rep111.php:144
+msgid "TOTAL ORDER EX VAT"
+msgstr ""
+
+#: reporting/rep109.php:203 reporting/rep111.php:190
+msgid "TOTAL ORDER VAT INCL."
+msgstr ""
+
  #: reporting/rep110.php:68
  msgid "DELIVERY"
  msgstr ""
  
  #: reporting/rep110.php:70 reporting/rep110.php:97
  #: reporting/rep110.php:68
  msgid "DELIVERY"
  msgstr ""
  
  #: reporting/rep110.php:70 reporting/rep110.php:97
-#: reporting/includes/doctext.inc:90
+#: reporting/includes/doctext.inc:70
  msgid "PACKING SLIP"
  msgstr ""
  
  #: reporting/rep110.php:92 reporting/rep110.php:103
  msgid "PACKING SLIP"
  msgstr ""
  
  #: reporting/rep110.php:92 reporting/rep110.php:103
-#: reporting/includes/doctext.inc:90
+#: reporting/includes/doctext.inc:70
  msgid "DELIVERY NOTE"
  msgstr ""
  
  msgid "DELIVERY NOTE"
  msgstr ""
  
+#: reporting/rep110.php:206
+msgid "TOTAL DELIVERY INCL. VAT"
+msgstr ""
+
  #: reporting/rep111.php:61 reporting/rep111.php:86
  #: reporting/rep111.php:61 reporting/rep111.php:86
-#: reporting/includes/doctext.inc:86
+#: reporting/includes/doctext.inc:38
  msgid "SALES QUOTATION"
  msgstr ""
  
  #: reporting/rep112.php:92 reporting/rep112.php:112
  msgid "SALES QUOTATION"
  msgstr ""
  
  #: reporting/rep112.php:92 reporting/rep112.php:112
-#: reporting/includes/doctext.inc:100
+#: reporting/includes/doctext.inc:176
  msgid "RECEIPT"
  msgstr ""
  
  msgid "RECEIPT"
  msgstr ""
  
-#: reporting/rep113.php:66 reporting/rep113.php:91 reporting/rep113.php:96
-#: reporting/includes/doctext.inc:102
-msgid "CREDIT NOTE"
+#: reporting/rep112.php:121 reporting/rep210.php:135
+msgid "As advance / full / part / payment towards:"
  msgstr ""
  
  msgstr ""
  
-#: reporting/rep114.php:85
-msgid "Sales Summary Report"
+#: reporting/rep112.php:149
+msgid "TOTAL RECEIPT"
  msgstr ""
  
  msgstr ""
  
-#: reporting/rep114.php:89 reporting/reports_main.php:62
-msgid "Tax Id Only"
+#: reporting/rep112.php:159
+msgid "Received / Sign"
  msgstr ""
  
  msgstr ""
  
-#: reporting/rep114.php:93
-msgid "Tax Id"
+#: reporting/rep112.php:161
+msgid "By Cash / Cheque* / Draft No."
  msgstr ""
  
  msgstr ""
  
-#: reporting/rep114.php:93
-msgid "Total ex. Tax"
+#: reporting/rep112.php:163
+msgid "Dated"
  msgstr ""
  
  msgstr ""
  
-#: reporting/rep114.php:93 reporting/rep709.php:110 taxes/tax_groups.php:177
-msgid "Tax"
+#: reporting/rep112.php:166
+msgid "Drawn on Bank"
  msgstr ""
  
  msgstr ""
  
-#: reporting/rep201.php:108
+#: reporting/rep113.php:66 reporting/rep113.php:91 reporting/rep113.php:96
+#: reporting/includes/doctext.inc:91
+msgid "CREDIT NOTE"
+msgstr ""
+
+#: reporting/rep113.php:195 sales/view/view_credit.php:143
+msgid "TOTAL CREDIT"
+msgstr ""
+
+#: reporting/rep114.php:85
+msgid "Sales Summary Report"
+msgstr ""
+
+#: reporting/rep114.php:89 reporting/reports_main.php:62
+msgid "Tax Id Only"
+msgstr ""
+
+#: reporting/rep114.php:93
+msgid "Tax Id"
+msgstr ""
+
+#: reporting/rep114.php:93
+msgid "Total ex. Tax"
+msgstr ""
+
+#: reporting/rep114.php:93 reporting/rep709.php:110 taxes/tax_groups.php:177
+msgid "Tax"
+msgstr ""
+
+#: reporting/rep201.php:108
  msgid "Balances in Home currency"
  msgstr ""
  
  msgid "Balances in Home currency"
  msgstr ""
  
@@ -10341,16 +10563,24 @@ msgid "Outstanding GRNs Report"
  msgstr ""
  
  #: reporting/rep209.php:88 reporting/rep209.php:107 reporting/rep209.php:112
  msgstr ""
  
  #: reporting/rep209.php:88 reporting/rep209.php:107 reporting/rep209.php:112
-#: reporting/includes/doctext.inc:88
+#: reporting/includes/doctext.inc:149
  msgid "PURCHASE ORDER"
  msgstr ""
  
  msgid "PURCHASE ORDER"
  msgstr ""
  
+#: reporting/rep209.php:211
+msgid "TOTAL PO"
+msgstr ""
+
  #: reporting/rep210.php:94 reporting/rep210.php:121 reporting/rep210.php:126
  #: reporting/rep210.php:94 reporting/rep210.php:121 reporting/rep210.php:126
-#: reporting/includes/doctext.inc:98
+#: reporting/includes/doctext.inc:129
  msgid "REMITTANCE"
  msgstr ""
  
  msgid "REMITTANCE"
  msgstr ""
  
-#: reporting/rep301.php:108
+#: reporting/rep210.php:164
+msgid "TOTAL REMITTANCE"
+msgstr ""
+
+#: reporting/rep301.php:112
  msgid "Inventory Valuation Report"
  msgstr ""
  
  msgid "Inventory Valuation Report"
  msgstr ""
  
@@ -10394,24 +10624,24 @@ msgstr ""
  msgid "Stock Check Sheets"
  msgstr ""
  
  msgid "Stock Check Sheets"
  msgstr ""
  
-#: reporting/rep304.php:114 reporting/rep305.php:95
+#: reporting/rep304.php:112 reporting/rep305.php:95
  msgid "Qty"
  msgstr ""
  
  msgid "Qty"
  msgstr ""
  
-#: reporting/rep304.php:114 sales/manage/customer_branches.php:240
-#: sales/manage/customers.php:224
+#: reporting/rep304.php:112 sales/manage/customer_branches.php:240
+#: sales/manage/customers.php:255 sales/manage/customers.php.orig:256
  msgid "Sales"
  msgstr ""
  
  msgid "Sales"
  msgstr ""
  
-#: reporting/rep304.php:114
+#: reporting/rep304.php:112
  msgid "Cost"
  msgstr ""
  
  msgid "Cost"
  msgstr ""
  
-#: reporting/rep304.php:114
+#: reporting/rep304.php:112
  msgid "Contribution"
  msgstr ""
  
  msgid "Contribution"
  msgstr ""
  
-#: reporting/rep304.php:126
+#: reporting/rep304.php:124
  msgid "Inventory Sales Report"
  msgstr ""
  
  msgid "Inventory Sales Report"
  msgstr ""
  
@@ -10443,19 +10673,15 @@ msgstr ""
  msgid "Bill of Material Listing"
  msgstr ""
  
  msgid "Bill of Material Listing"
  msgstr ""
  
-#: reporting/rep409.php:60 reporting/rep409.php:79 reporting/rep409.php:84
-#: reporting/includes/doctext.inc:96
+#: reporting/rep409.php:58 reporting/rep409.php:77 reporting/rep409.php:82
+#: reporting/includes/doctext.inc:192
  msgid "WORK ORDER"
  msgstr ""
  
  msgid "WORK ORDER"
  msgstr ""
  
-#: reporting/rep409.php:134
+#: reporting/rep409.php:132
  msgid "Insufficient stock"
  msgstr ""
  
  msgid "Insufficient stock"
  msgstr ""
  
-#: reporting/rep409.php:147 reporting/includes/doctext.inc:138
-msgid "Work Order No."
-msgstr ""
-
  #: reporting/rep501.php:85
  msgid "YTD"
  msgstr ""
  #: reporting/rep501.php:85
  msgid "YTD"
  msgstr ""
@@ -10464,7 +10690,7 @@ msgstr ""
  msgid "Dimension Summary"
  msgstr ""
  
  msgid "Dimension Summary"
  msgstr ""
  
-#: reporting/rep601.php:83 reporting/includes/doctext.inc:72
+#: reporting/rep601.php:83 reporting/includes/doctext.inc:247
  msgid "Bank Account"
  msgstr ""
  
  msgid "Bank Account"
  msgstr ""
  
@@ -10492,13 +10718,13 @@ msgstr ""
  msgid "List of Journal Entries"
  msgstr ""
  
  msgid "List of Journal Entries"
  msgstr ""
  
-#: reporting/rep704.php:66
+#: reporting/rep704.php:67
  msgid "GL Account Transactions"
  msgstr ""
  
  #: reporting/rep705.php:243 reporting/rep705.php:256 reporting/rep705.php:267
  msgid "GL Account Transactions"
  msgstr ""
  
  #: reporting/rep705.php:243 reporting/rep705.php:256 reporting/rep705.php:267
-#: reporting/reports_main.php:269 reporting/reports_main.php:317
-#: reporting/reports_main.php:360
+#: reporting/reports_main.php:270 reporting/reports_main.php:318
+#: reporting/reports_main.php:361
  msgid "Year"
  msgstr ""
  
  msgid "Year"
  msgstr ""
  
@@ -10560,7 +10786,7 @@ msgstr ""
  msgid "Action"
  msgstr ""
  
  msgid "Action"
  msgstr ""
  
-#: reporting/rep710.php:87 reporting/reports_main.php:395
+#: reporting/rep710.php:87 reporting/reports_main.php:396
  msgid "Audit Trail"
  msgstr ""
  
  msgid "Audit Trail"
  msgstr ""
  
@@ -10591,20 +10817,20 @@ msgstr ""
  #: reporting/reports_main.php:72 reporting/reports_main.php:80
  #: reporting/reports_main.php:86 reporting/reports_main.php:140
  #: reporting/reports_main.php:150 reporting/reports_main.php:157
  #: reporting/reports_main.php:72 reporting/reports_main.php:80
  #: reporting/reports_main.php:86 reporting/reports_main.php:140
  #: reporting/reports_main.php:150 reporting/reports_main.php:157
-#: reporting/reports_main.php:161 reporting/reports_main.php:182
-#: reporting/reports_main.php:187 reporting/reports_main.php:196
-#: reporting/reports_main.php:204 reporting/reports_main.php:209
-#: reporting/reports_main.php:216 reporting/reports_main.php:230
-#: reporting/reports_main.php:241 reporting/reports_main.php:247
-#: reporting/reports_main.php:253 reporting/reports_main.php:267
-#: reporting/reports_main.php:274 reporting/reports_main.php:284
-#: reporting/reports_main.php:295 reporting/reports_main.php:304
-#: reporting/reports_main.php:315 reporting/reports_main.php:321
-#: reporting/reports_main.php:330 reporting/reports_main.php:340
-#: reporting/reports_main.php:348 reporting/reports_main.php:358
-#: reporting/reports_main.php:363 reporting/reports_main.php:371
-#: reporting/reports_main.php:380 reporting/reports_main.php:387
-#: reporting/reports_main.php:394 reporting/reports_main.php:401
+#: reporting/reports_main.php:161 reporting/reports_main.php:183
+#: reporting/reports_main.php:188 reporting/reports_main.php:197
+#: reporting/reports_main.php:205 reporting/reports_main.php:210
+#: reporting/reports_main.php:217 reporting/reports_main.php:231
+#: reporting/reports_main.php:242 reporting/reports_main.php:248
+#: reporting/reports_main.php:254 reporting/reports_main.php:268
+#: reporting/reports_main.php:275 reporting/reports_main.php:285
+#: reporting/reports_main.php:296 reporting/reports_main.php:305
+#: reporting/reports_main.php:316 reporting/reports_main.php:322
+#: reporting/reports_main.php:331 reporting/reports_main.php:341
+#: reporting/reports_main.php:349 reporting/reports_main.php:359
+#: reporting/reports_main.php:364 reporting/reports_main.php:372
+#: reporting/reports_main.php:381 reporting/reports_main.php:388
+#: reporting/reports_main.php:395 reporting/reports_main.php:402
  msgid "Destination"
  msgstr ""
  
  msgid "Destination"
  msgstr ""
  
@@ -10613,9 +10839,9 @@ msgid "&Aged Customer Analysis"
  msgstr ""
  
  #: reporting/reports_main.php:48 reporting/reports_main.php:148
  msgstr ""
  
  #: reporting/reports_main.php:48 reporting/reports_main.php:148
-#: reporting/reports_main.php:282 reporting/reports_main.php:293
-#: reporting/reports_main.php:328 reporting/reports_main.php:338
-#: reporting/reports_main.php:369 reporting/reports_main.php:378
+#: reporting/reports_main.php:283 reporting/reports_main.php:294
+#: reporting/reports_main.php:329 reporting/reports_main.php:339
+#: reporting/reports_main.php:370 reporting/reports_main.php:379
  msgid "Graphics"
  msgstr ""
  
  msgid "Graphics"
  msgstr ""
  
@@ -10640,8 +10866,8 @@ msgid "&Price Listing"
  msgstr ""
  
  #: reporting/reports_main.php:67 reporting/reports_main.php:76
  msgstr ""
  
  #: reporting/reports_main.php:67 reporting/reports_main.php:76
-#: reporting/reports_main.php:178 reporting/reports_main.php:184
-#: reporting/reports_main.php:189 reporting/reports_main.php:200
+#: reporting/reports_main.php:179 reporting/reports_main.php:185
+#: reporting/reports_main.php:190 reporting/reports_main.php:201
  msgid "Inventory Category"
  msgstr ""
  
  msgid "Inventory Category"
  msgstr ""
  
@@ -10649,7 +10875,7 @@ msgstr ""
  msgid "Sales Types"
  msgstr ""
  
  msgid "Sales Types"
  msgstr ""
  
-#: reporting/reports_main.php:69 reporting/reports_main.php:191
+#: reporting/reports_main.php:69 reporting/reports_main.php:192
  msgid "Show Pictures"
  msgstr ""
  
  msgid "Show Pictures"
  msgstr ""
  
@@ -10744,347 +10970,271 @@ msgstr ""
  msgid "Inventory &Valuation Report"
  msgstr ""
  
  msgid "Inventory &Valuation Report"
  msgstr ""
  
-#: reporting/reports_main.php:183
+#: reporting/reports_main.php:184
  msgid "Inventory &Planning Report"
  msgstr ""
  
  msgid "Inventory &Planning Report"
  msgstr ""
  
-#: reporting/reports_main.php:188
+#: reporting/reports_main.php:189
  msgid "Stock &Check Sheets"
  msgstr ""
  
  msgid "Stock &Check Sheets"
  msgstr ""
  
-#: reporting/reports_main.php:192
+#: reporting/reports_main.php:193
  msgid "Inventory Column"
  msgstr ""
  
  msgid "Inventory Column"
  msgstr ""
  
-#: reporting/reports_main.php:193
+#: reporting/reports_main.php:194
  msgid "Show Shortage"
  msgstr ""
  
  msgid "Show Shortage"
  msgstr ""
  
-#: reporting/reports_main.php:197
+#: reporting/reports_main.php:198
  msgid "Inventory &Sales Report"
  msgstr ""
  
  msgid "Inventory &Sales Report"
  msgstr ""
  
-#: reporting/reports_main.php:205
+#: reporting/reports_main.php:206
  msgid "&GRN Valuation Report"
  msgstr ""
  
  msgid "&GRN Valuation Report"
  msgstr ""
  
-#: reporting/reports_main.php:211
+#: reporting/reports_main.php:212
  msgid "Manufacturing"
  msgstr ""
  
  msgid "Manufacturing"
  msgstr ""
  
-#: reporting/reports_main.php:212
+#: reporting/reports_main.php:213
  msgid "&Bill of Material Listing"
  msgstr ""
  
  msgid "&Bill of Material Listing"
  msgstr ""
  
-#: reporting/reports_main.php:213
+#: reporting/reports_main.php:214
  msgid "From product"
  msgstr ""
  
  msgid "From product"
  msgstr ""
  
-#: reporting/reports_main.php:214
+#: reporting/reports_main.php:215
  msgid "To product"
  msgstr ""
  
  msgid "To product"
  msgstr ""
  
-#: reporting/reports_main.php:217
+#: reporting/reports_main.php:218
  msgid "Print &Work Orders"
  msgstr ""
  
  msgid "Print &Work Orders"
  msgstr ""
  
-#: reporting/reports_main.php:220
+#: reporting/reports_main.php:221
  msgid "Email Locations"
  msgstr ""
  
  msgid "Email Locations"
  msgstr ""
  
-#: reporting/reports_main.php:225
+#: reporting/reports_main.php:226
  msgid "Dimension &Summary"
  msgstr ""
  
  msgid "Dimension &Summary"
  msgstr ""
  
-#: reporting/reports_main.php:226
+#: reporting/reports_main.php:227
  msgid "From Dimension"
  msgstr ""
  
  msgid "From Dimension"
  msgstr ""
  
-#: reporting/reports_main.php:227
+#: reporting/reports_main.php:228
  msgid "To Dimension"
  msgstr ""
  
  msgid "To Dimension"
  msgstr ""
  
-#: reporting/reports_main.php:228
+#: reporting/reports_main.php:229
  msgid "Show Balance"
  msgstr ""
  
  msgid "Show Balance"
  msgstr ""
  
-#: reporting/reports_main.php:235
+#: reporting/reports_main.php:236
  msgid "Banking"
  msgstr ""
  
  msgid "Banking"
  msgstr ""
  
-#: reporting/reports_main.php:236
+#: reporting/reports_main.php:237
  msgid "Bank &Statement"
  msgstr ""
  
  msgid "Bank &Statement"
  msgstr ""
  
-#: reporting/reports_main.php:243
+#: reporting/reports_main.php:244
  msgid "General Ledger"
  msgstr ""
  
  msgid "General Ledger"
  msgstr ""
  
-#: reporting/reports_main.php:244
+#: reporting/reports_main.php:245
  msgid "Chart of &Accounts"
  msgstr ""
  
  msgid "Chart of &Accounts"
  msgstr ""
  
-#: reporting/reports_main.php:245
+#: reporting/reports_main.php:246
  msgid "Show Balances"
  msgstr ""
  
  msgid "Show Balances"
  msgstr ""
  
-#: reporting/reports_main.php:248
+#: reporting/reports_main.php:249
  msgid "List of &Journal Entries"
  msgstr ""
  
  msgid "List of &Journal Entries"
  msgstr ""
  
-#: reporting/reports_main.php:259 reporting/reports_main.php:308
-#: reporting/reports_main.php:352
+#: reporting/reports_main.php:260 reporting/reports_main.php:309
+#: reporting/reports_main.php:353
  msgid "GL Account &Transactions"
  msgstr ""
  
  msgid "GL Account &Transactions"
  msgstr ""
  
-#: reporting/reports_main.php:262 reporting/reports_main.php:311
-#: reporting/reports_main.php:355
+#: reporting/reports_main.php:263 reporting/reports_main.php:312
+#: reporting/reports_main.php:356
  msgid "From Account"
  msgstr ""
  
  msgid "From Account"
  msgstr ""
  
-#: reporting/reports_main.php:263 reporting/reports_main.php:312
-#: reporting/reports_main.php:356
+#: reporting/reports_main.php:264 reporting/reports_main.php:313
+#: reporting/reports_main.php:357
  msgid "To Account"
  msgstr ""
  
  msgid "To Account"
  msgstr ""
  
-#: reporting/reports_main.php:268 reporting/reports_main.php:316
-#: reporting/reports_main.php:359
+#: reporting/reports_main.php:269 reporting/reports_main.php:317
+#: reporting/reports_main.php:360
  msgid "Annual &Expense Breakdown"
  msgstr ""
  
  msgid "Annual &Expense Breakdown"
  msgstr ""
  
-#: reporting/reports_main.php:275 reporting/reports_main.php:322
-#: reporting/reports_main.php:364
+#: reporting/reports_main.php:276 reporting/reports_main.php:323
+#: reporting/reports_main.php:365
  msgid "&Balance Sheet"
  msgstr ""
  
  msgid "&Balance Sheet"
  msgstr ""
  
-#: reporting/reports_main.php:281 reporting/reports_main.php:292
-#: reporting/reports_main.php:327 reporting/reports_main.php:337
-#: reporting/reports_main.php:368 reporting/reports_main.php:377
+#: reporting/reports_main.php:282 reporting/reports_main.php:293
+#: reporting/reports_main.php:328 reporting/reports_main.php:338
+#: reporting/reports_main.php:369 reporting/reports_main.php:378
  msgid "Decimal values"
  msgstr ""
  
  msgid "Decimal values"
  msgstr ""
  
-#: reporting/reports_main.php:285 reporting/reports_main.php:331
-#: reporting/reports_main.php:372
+#: reporting/reports_main.php:286 reporting/reports_main.php:332
+#: reporting/reports_main.php:373
  msgid "&Profit and Loss Statement"
  msgstr ""
  
  msgid "&Profit and Loss Statement"
  msgstr ""
  
-#: reporting/reports_main.php:299 reporting/reports_main.php:344
-#: reporting/reports_main.php:384
+#: reporting/reports_main.php:300 reporting/reports_main.php:345
+#: reporting/reports_main.php:385
  msgid "Zero values"
  msgstr ""
  
  msgid "Zero values"
  msgstr ""
  
-#: reporting/reports_main.php:389
+#: reporting/reports_main.php:390
  msgid "Ta&x Report"
  msgstr ""
  
  msgid "Ta&x Report"
  msgstr ""
  
-#: reporting/includes/doctext.inc:14
-msgid "Cust no"
-msgstr ""
-
-#: reporting/includes/doctext.inc:18
-msgid "Order To"
-msgstr ""
-
-#: reporting/includes/doctext.inc:20
-msgid "Deliver To"
-msgstr ""
-
-#: reporting/includes/doctext.inc:22 reporting/includes/doctext.inc:29
+#: reporting/includes/doctext.inc:18 reporting/includes/doctext.inc:134
  #: sales/view/view_dispatch.php:51 sales/view/view_invoice.php:51
  msgid "Charge To"
  msgstr ""
  
  #: sales/view/view_dispatch.php:51 sales/view/view_invoice.php:51
  msgid "Charge To"
  msgstr ""
  
-#: reporting/includes/doctext.inc:27
-msgid "With thanks from"
-msgstr ""
-
-#: reporting/includes/doctext.inc:30 sales/view/view_dispatch.php:74
+#: reporting/includes/doctext.inc:23 sales/view/view_dispatch.php:74
  msgid "Delivered To"
  msgstr ""
  
  msgid "Delivered To"
  msgstr ""
  
-#: reporting/includes/doctext.inc:34 sales/view/view_sales_order.php:69
-#: sales/inquiry/sales_orders_view.php:273
-#: sales/includes/ui/sales_order_ui.inc:605
-msgid "Valid until"
-msgstr ""
-
-#: reporting/includes/doctext.inc:38
-msgid "To Be Invoiced Before"
-msgstr ""
-
-#: reporting/includes/doctext.inc:41
-msgid "Your Ref"
-msgstr ""
-
-#: reporting/includes/doctext.inc:56 sales/manage/customer_branches.php:296
-msgid "Sales Person"
-msgstr ""
-
-#: reporting/includes/doctext.inc:57
-msgid "Your VAT no."
-msgstr ""
-
-#: reporting/includes/doctext.inc:59
-msgid "Customers Reference"
-msgstr ""
-
-#: reporting/includes/doctext.inc:60 sales/view/view_dispatch.php:87
-#: sales/view/view_invoice.php:86
-msgid "Our Order No"
-msgstr ""
-
-#: reporting/includes/doctext.inc:62
-msgid "Our VAT No."
-msgstr ""
-
-#: reporting/includes/doctext.inc:63
-msgid "Domicile"
-msgstr ""
-
-#: reporting/includes/doctext.inc:68
-msgid "* Subject to Realisation of the Cheque."
-msgstr ""
-
-#: reporting/includes/doctext.inc:70
-msgid "All amounts stated in"
-msgstr ""
-
-#: reporting/includes/doctext.inc:74
-msgid "Please quote Invoice no. when paying. All amounts stated in"
-msgstr ""
-
-#: reporting/includes/doctext.inc:75
-msgid "Please quote Credit no. when paying. All amounts stated in"
-msgstr ""
-
-#: reporting/includes/doctext.inc:78
-msgid "Phone/Fax/Email"
-msgstr ""
-
-#: reporting/includes/doctext.inc:80 reporting/includes/doctext.inc:127
-msgid "You can pay through"
-msgstr ""
-
-#: reporting/includes/doctext.inc:113 sales/customer_credit_invoice.php:283
+#: reporting/includes/doctext.inc:30 sales/customer_credit_invoice.php:283
  #: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113
  #: sales/view/view_invoice.php:114 sales/includes/ui/sales_credit_ui.inc:168
  #: sales/includes/ui/sales_order_ui.inc:142
  msgid "Discount %"
  msgstr ""
  
  #: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113
  #: sales/view/view_invoice.php:114 sales/includes/ui/sales_credit_ui.inc:168
  #: sales/includes/ui/sales_order_ui.inc:142
  msgid "Discount %"
  msgstr ""
  
-#: reporting/includes/doctext.inc:118
-msgid "DueDate"
-msgstr ""
-
-#: reporting/includes/doctext.inc:124
-msgid "Dear"
+#: reporting/includes/doctext.inc:33
+msgid "All amounts stated in"
  msgstr ""
  
  msgstr ""
  
-#: reporting/includes/doctext.inc:125
-msgid "Attached you will find "
+#: reporting/includes/doctext.inc:39
+msgid "Quotation No."
  msgstr ""
  
  msgstr ""
  
-#: reporting/includes/doctext.inc:126
-msgid "Kindest regards"
+#: reporting/includes/doctext.inc:44 reporting/includes/doctext.inc:61
+#: reporting/includes/doctext.inc:82 reporting/includes/doctext.inc:96
+#: reporting/includes/doctext.inc:118 reporting/includes/doctext.inc:139
+#: reporting/includes/doctext.inc:162 reporting/includes/doctext.inc:180
+#: reporting/includes/doctext.inc:218
+msgid "Customers Reference"
  msgstr ""
  
  msgstr ""
  
-#: reporting/includes/doctext.inc:131 reporting/includes/doctext.inc:140
-msgid "Delivery Note No."
+#: reporting/includes/doctext.inc:45 reporting/includes/doctext.inc:62
+#: reporting/includes/doctext.inc:83 reporting/includes/doctext.inc:97
+#: reporting/includes/doctext.inc:119 reporting/includes/doctext.inc:163
+#: reporting/includes/doctext.inc:219 sales/manage/customer_branches.php:296
+msgid "Sales Person"
  msgstr ""
  
  msgstr ""
  
-#: reporting/includes/doctext.inc:132
-msgid "Receipt No."
+#: reporting/includes/doctext.inc:46 reporting/includes/doctext.inc:63
+#: reporting/includes/doctext.inc:84 reporting/includes/doctext.inc:98
+#: reporting/includes/doctext.inc:120 reporting/includes/doctext.inc:141
+#: reporting/includes/doctext.inc:164 reporting/includes/doctext.inc:182
+#: reporting/includes/doctext.inc:220
+msgid "Your VAT no."
  msgstr ""
  
  msgstr ""
  
-#: reporting/includes/doctext.inc:133
-msgid "Remittance No."
+#: reporting/includes/doctext.inc:47
+msgid "Our Quotation No"
  msgstr ""
  
  msgstr ""
  
-#: reporting/includes/doctext.inc:134
-msgid "Purchase Order No."
+#: reporting/includes/doctext.inc:48 sales/view/view_sales_order.php:69
+#: sales/inquiry/sales_orders_view.php:280
+#: sales/inquiry/sales_orders_view.php.orig:280
+#: sales/includes/ui/sales_order_ui.inc:605
+msgid "Valid until"
  msgstr ""
  
  msgstr ""
  
-#: reporting/includes/doctext.inc:135 reporting/includes/doctext.inc:141
+#: reporting/includes/doctext.inc:54
  msgid "Order No."
  msgstr ""
  
  msgid "Order No."
  msgstr ""
  
-#: reporting/includes/doctext.inc:136
-msgid "Quotation No."
-msgstr ""
-
-#: reporting/includes/doctext.inc:137
-msgid "Invoice No."
-msgstr ""
-
-#: reporting/includes/doctext.inc:138
-msgid "Credit No."
+#: reporting/includes/doctext.inc:64 reporting/includes/doctext.inc:85
+#: reporting/includes/doctext.inc:99 reporting/includes/doctext.inc:142
+#: reporting/includes/doctext.inc:165 reporting/includes/doctext.inc:183
+#: reporting/includes/doctext.inc:221 sales/view/view_dispatch.php:87
+#: sales/view/view_invoice.php:86
+msgid "Our Order No"
  msgstr ""
  
  msgstr ""
  
-#: reporting/includes/doctext.inc:150 sales/view/view_credit.php:138
-#: sales/view/view_dispatch.php:155 sales/view/view_invoice.php:157
-#: sales/view/view_sales_order.php:227
-#: sales/includes/ui/sales_credit_ui.inc:222
-msgid "Shipping"
+#: reporting/includes/doctext.inc:71 reporting/includes/doctext.inc:121
+msgid "Delivery Note No."
  msgstr ""
  
  msgstr ""
  
-#: reporting/includes/doctext.inc:153 sales/view/view_credit.php:143
-msgid "TOTAL CREDIT"
+#: reporting/includes/doctext.inc:86
+msgid "To Be Invoiced Before"
  msgstr ""
  
  msgstr ""
  
-#: reporting/includes/doctext.inc:154
-msgid "TOTAL ORDER EX VAT"
+#: reporting/includes/doctext.inc:92
+msgid "Credit No."
  msgstr ""
  
  msgstr ""
  
-#: reporting/includes/doctext.inc:155
-msgid "TOTAL ORDER VAT INCL."
+#: reporting/includes/doctext.inc:93
+msgid "Please quote Credit no. when paying. All amounts stated in"
  msgstr ""
  
  msgstr ""
  
-#: reporting/includes/doctext.inc:156
-msgid "TOTAL PO"
+#: reporting/includes/doctext.inc:106
+msgid "Invoice No."
  msgstr ""
  
  msgstr ""
  
-#: reporting/includes/doctext.inc:157
-msgid "TOTAL DELIVERY INCL. VAT"
+#: reporting/includes/doctext.inc:108
+msgid "Please quote Invoice no. when paying. All amounts stated in"
  msgstr ""
  
  msgstr ""
  
-#: reporting/includes/doctext.inc:161
-msgid "As advance / full / part / payment towards:"
+#: reporting/includes/doctext.inc:130
+msgid "Remittance No."
  msgstr ""
  
  msgstr ""
  
-#: reporting/includes/doctext.inc:162
-msgid "By Cash / Cheque* / Draft No."
+#: reporting/includes/doctext.inc:131 reporting/includes/doctext.inc:151
+msgid "Order To"
  msgstr ""
  
  msgstr ""
  
-#: reporting/includes/doctext.inc:163
-msgid "Dated"
+#: reporting/includes/doctext.inc:150
+msgid "Purchase Order No."
  msgstr ""
  
  msgstr ""
  
-#: reporting/includes/doctext.inc:164
-msgid "Drawn on Bank"
+#: reporting/includes/doctext.inc:154
+msgid "Deliver To"
  msgstr ""
  
  msgstr ""
  
-#: reporting/includes/doctext.inc:166
-msgid "Received / Sign"
+#: reporting/includes/doctext.inc:177
+msgid "Receipt No."
  msgstr ""
  
  msgstr ""
  
-#: reporting/includes/doctext.inc:170
-msgid "TOTAL RECEIPT"
+#: reporting/includes/doctext.inc:178
+msgid "With thanks from"
  msgstr ""
  
  msgstr ""
  
-#: reporting/includes/doctext.inc:172
-msgid "TOTAL REMITTANCE"
+#: reporting/includes/doctext.inc:193
+msgid "Work Order No."
  msgstr ""
  
  msgstr ""
  
-#: reporting/includes/doctext.inc:176
-msgid "Outstanding Transactions"
+#: reporting/includes/doctext.inc:224
+msgid "DueDate"
  msgstr ""
  
  msgstr ""
  
-#: reporting/includes/doctext.inc:179
-msgid "Statement"
+#: reporting/includes/doctext.inc:259 reporting/includes/pdf_report.inc:1012
+msgid "You can pay through"
  msgstr ""
  
  msgstr ""
  
-#: reporting/includes/doctext.inc:180
-msgid "as of"
+#: reporting/includes/doctext.inc:263
+msgid "* Subject to Realisation of the Cheque."
  msgstr ""
  
  #: reporting/includes/excel_report.inc:67 reporting/includes/pdf_report.inc:80
  msgstr ""
  
  #: reporting/includes/excel_report.inc:67 reporting/includes/pdf_report.inc:80
@@ -11107,21 +11257,29 @@ msgid "Report Date"
  msgstr ""
  
  #: reporting/includes/excel_report.inc:413
  msgstr ""
  
  #: reporting/includes/excel_report.inc:413
-#: reporting/includes/pdf_report.inc:599
+#: reporting/includes/pdf_report.inc:600
  msgid "Generated At"
  msgstr ""
  
  #: reporting/includes/excel_report.inc:419
  msgid "Generated At"
  msgstr ""
  
  #: reporting/includes/excel_report.inc:419
-#: reporting/includes/pdf_report.inc:608
+#: reporting/includes/pdf_report.inc:609
  msgid "Generated By"
  msgstr ""
  
  msgid "Generated By"
  msgstr ""
  
-#: reporting/includes/header2.inc:150 reporting/includes/pdf_report.inc:352
-#: reporting/includes/pdf_report.inc:499 reporting/includes/pdf_report.inc:627
+#: reporting/includes/header2.inc:122
+msgid "Our VAT No."
+msgstr ""
+
+#: reporting/includes/header2.inc:128
+msgid "Domicile"
+msgstr ""
+
+#: reporting/includes/header2.inc:143 reporting/includes/pdf_report.inc:352
+#: reporting/includes/pdf_report.inc:500 reporting/includes/pdf_report.inc:628
  msgid "Page"
  msgstr ""
  
  msgid "Page"
  msgstr ""
  
-#: reporting/includes/pdf_report.inc:582
+#: reporting/includes/pdf_report.inc:583
  msgid "Report Period"
  msgstr ""
  
  msgid "Report Period"
  msgstr ""
  
@@ -11129,19 +11287,31 @@ msgstr ""
  msgid "You have no email contact defined for this type of document"
  msgstr ""
  
  msgid "You have no email contact defined for this type of document"
  msgstr ""
  
-#: reporting/includes/pdf_report.inc:1022
+#: reporting/includes/pdf_report.inc:998
+msgid "Dear"
+msgstr ""
+
+#: reporting/includes/pdf_report.inc:999
+msgid "Attached you will find "
+msgstr ""
+
+#: reporting/includes/pdf_report.inc:1015
+msgid "Kindest regards"
+msgstr ""
+
+#: reporting/includes/pdf_report.inc:1026
  msgid "There is no contact email set for this document type."
  msgstr ""
  
  msgid "There is no contact email set for this document type."
  msgstr ""
  
-#: reporting/includes/pdf_report.inc:1024
+#: reporting/includes/pdf_report.inc:1028
  msgid "Sending document by email failed"
  msgstr ""
  
  msgid "Sending document by email failed"
  msgstr ""
  
-#: reporting/includes/pdf_report.inc:1027
+#: reporting/includes/pdf_report.inc:1031
  msgid "has been sent by email to destination."
  msgstr ""
  
  msgid "has been sent by email to destination."
  msgstr ""
  
-#: reporting/includes/pdf_report.inc:1057
+#: reporting/includes/pdf_report.inc:1061
  msgid "Report has been sent to network printer "
  msgstr ""
  
  msgid "Report has been sent to network printer "
  msgstr ""
  
@@ -11193,78 +11363,74 @@ msgstr ""
  msgid "No Currency Filter"
  msgstr ""
  
  msgid "No Currency Filter"
  msgstr ""
  
-#: reporting/includes/reports_classes.inc:224
-msgid "No payment Link"
-msgstr ""
-
-#: reporting/includes/reports_classes.inc:228
+#: reporting/includes/reports_classes.inc:227
  msgid "PDF/Printer"
  msgstr ""
  
  msgid "PDF/Printer"
  msgstr ""
  
-#: reporting/includes/reports_classes.inc:239
+#: reporting/includes/reports_classes.inc:238
  msgid "No Graphics"
  msgstr ""
  
  msgid "No Graphics"
  msgstr ""
  
-#: reporting/includes/reports_classes.inc:239
+#: reporting/includes/reports_classes.inc:238
  msgid "Vertical bars"
  msgstr ""
  
  msgid "Vertical bars"
  msgstr ""
  
-#: reporting/includes/reports_classes.inc:239
+#: reporting/includes/reports_classes.inc:238
  msgid "Horizontal bars"
  msgstr ""
  
  msgid "Horizontal bars"
  msgstr ""
  
-#: reporting/includes/reports_classes.inc:240
+#: reporting/includes/reports_classes.inc:239
  msgid "Dots"
  msgstr ""
  
  msgid "Dots"
  msgstr ""
  
-#: reporting/includes/reports_classes.inc:240
+#: reporting/includes/reports_classes.inc:239
  msgid "Lines"
  msgstr ""
  
  msgid "Lines"
  msgstr ""
  
-#: reporting/includes/reports_classes.inc:240
+#: reporting/includes/reports_classes.inc:239
  msgid "Pie"
  msgstr ""
  
  msgid "Pie"
  msgstr ""
  
-#: reporting/includes/reports_classes.inc:240
+#: reporting/includes/reports_classes.inc:239
  msgid "Donut"
  msgstr ""
  
  msgid "Donut"
  msgstr ""
  
-#: reporting/includes/reports_classes.inc:244
-#: reporting/includes/reports_classes.inc:247
+#: reporting/includes/reports_classes.inc:243
+#: reporting/includes/reports_classes.inc:246
  msgid "No Type Filter"
  msgstr ""
  
  msgid "No Type Filter"
  msgstr ""
  
-#: reporting/includes/reports_classes.inc:257
+#: reporting/includes/reports_classes.inc:256
  msgid "No Account Group Filter"
  msgstr ""
  
  msgid "No Account Group Filter"
  msgstr ""
  
-#: reporting/includes/reports_classes.inc:272
-#: reporting/includes/reports_classes.inc:278
-#: reporting/includes/reports_classes.inc:284
+#: reporting/includes/reports_classes.inc:271
+#: reporting/includes/reports_classes.inc:277
+#: reporting/includes/reports_classes.inc:283
  msgid "No Dimension Filter"
  msgstr ""
  
  msgid "No Dimension Filter"
  msgstr ""
  
-#: reporting/includes/reports_classes.inc:290
+#: reporting/includes/reports_classes.inc:289
  msgid "No Customer Filter"
  msgstr ""
  
  msgid "No Customer Filter"
  msgstr ""
  
-#: reporting/includes/reports_classes.inc:298
+#: reporting/includes/reports_classes.inc:297
  msgid "No Supplier Filter"
  msgstr ""
  
  msgid "No Supplier Filter"
  msgstr ""
  
-#: reporting/includes/reports_classes.inc:380
+#: reporting/includes/reports_classes.inc:379
  msgid "No Location Filter"
  msgstr ""
  
  msgid "No Location Filter"
  msgstr ""
  
-#: reporting/includes/reports_classes.inc:383
+#: reporting/includes/reports_classes.inc:382
  msgid "No Category Filter"
  msgstr ""
  
  msgid "No Category Filter"
  msgstr ""
  
-#: reporting/includes/reports_classes.inc:392
+#: reporting/includes/reports_classes.inc:391
  msgid "No Sales Folk Filter"
  msgstr ""
  
  msgid "No Sales Folk Filter"
  msgstr ""
  
-#: reporting/includes/reports_classes.inc:399
+#: reporting/includes/reports_classes.inc:398
  msgid "No Users Filter"
  msgstr ""
  
  msgid "No Users Filter"
  msgstr ""
  
@@ -11330,7 +11496,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:662
+#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:661
  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."
@@ -11556,74 +11722,74 @@ msgstr ""
  msgid "This order has no items. There is nothing to delivery."
  msgstr ""
  
  msgid "This order has no items. There is nothing to delivery."
  msgstr ""
  
-#: sales/customer_delivery.php:107
+#: sales/customer_delivery.php:110
  msgid "Select a different delivery"
  msgstr ""
  
  msgid "Select a different delivery"
  msgstr ""
  
-#: sales/customer_delivery.php:108
+#: sales/customer_delivery.php:111
  msgid "This delivery has all items invoiced. There is nothing to modify."
  msgstr ""
  
  msgid "This delivery has all items invoiced. There is nothing to modify."
  msgstr ""
  
-#: sales/customer_delivery.php:118
+#: sales/customer_delivery.php:121
  msgid ""
  "This page can only be opened if an order or delivery note has been selected. "
  "Please select it first."
  msgstr ""
  
  msgid ""
  "This page can only be opened if an order or delivery note has been selected. "
  "Please select it first."
  msgstr ""
  
-#: sales/customer_delivery.php:120
+#: sales/customer_delivery.php:123
  msgid "Select a Sales Order to Delivery"
  msgstr ""
  
  msgid "Select a Sales Order to Delivery"
  msgstr ""
  
-#: sales/customer_delivery.php:129
+#: sales/customer_delivery.php:132
  msgid ""
  "Selected quantity cannot be less than quantity invoiced nor more than "
  "quantity\tnot dispatched on sales order."
  msgstr ""
  
  msgid ""
  "Selected quantity cannot be less than quantity invoiced nor more than "
  "quantity\tnot dispatched on sales order."
  msgstr ""
  
-#: sales/customer_delivery.php:132
+#: sales/customer_delivery.php:135
  msgid "Freight cost cannot be less than zero"
  msgstr ""
  
  msgid "Freight cost cannot be less than zero"
  msgstr ""
  
-#: sales/customer_delivery.php:144
+#: sales/customer_delivery.php:147
  msgid "The entered date of delivery is invalid."
  msgstr ""
  
  msgid "The entered date of delivery is invalid."
  msgstr ""
  
-#: sales/customer_delivery.php:150
+#: sales/customer_delivery.php:153
  msgid "The entered date of delivery is not in fiscal year."
  msgstr ""
  
  msgid "The entered date of delivery is not in fiscal year."
  msgstr ""
  
-#: sales/customer_delivery.php:156
+#: sales/customer_delivery.php:159
  msgid "The entered dead-line for invoice is invalid."
  msgstr ""
  
  msgid "The entered dead-line for invoice is invalid."
  msgstr ""
  
-#: sales/customer_delivery.php:179 sales/customer_invoice.php:293
+#: sales/customer_delivery.php:182 sales/customer_invoice.php:297
  msgid "The entered shipping value is not numeric."
  msgstr ""
  
  msgid "The entered shipping value is not numeric."
  msgstr ""
  
-#: sales/customer_delivery.php:185
+#: sales/customer_delivery.php:188
  msgid "There are no item quantities on this delivery note."
  msgstr ""
  
  msgid "There are no item quantities on this delivery note."
  msgstr ""
  
-#: sales/customer_delivery.php:288 sales/sales_order_entry.php:491
+#: sales/customer_delivery.php:291 sales/sales_order_entry.php:490
  #: sales/includes/ui/sales_order_ui.inc:244
  msgid ""
  "The delivery cannot be processed because there is an insufficient quantity "
  "for item:"
  msgstr ""
  
  #: sales/includes/ui/sales_order_ui.inc:244
  msgid ""
  "The delivery cannot be processed because there is an insufficient quantity "
  "for item:"
  msgstr ""
  
-#: sales/customer_delivery.php:350
+#: sales/customer_delivery.php:353
  msgid "For Sales Order"
  msgstr ""
  
  msgid "For Sales Order"
  msgstr ""
  
-#: sales/customer_delivery.php:359
+#: sales/customer_delivery.php:362
  msgid "Delivery From"
  msgstr ""
  
  msgid "Delivery From"
  msgstr ""
  
-#: sales/customer_delivery.php:408
+#: sales/customer_delivery.php:411
  msgid "Invoice Dead-line"
  msgstr ""
  
  msgid "Invoice Dead-line"
  msgstr ""
  
-#: sales/customer_delivery.php:418 sales/customer_invoice.php:438
+#: sales/customer_delivery.php:421 sales/customer_invoice.php:457
  #: sales/includes/ui/sales_order_ui.inc:82
  #: sales/includes/ui/sales_order_ui.inc:368
  msgid ""
  #: sales/includes/ui/sales_order_ui.inc:82
  #: sales/includes/ui/sales_order_ui.inc:368
  msgid ""
@@ -11631,47 +11797,42 @@ msgid ""
  "credit control personnel to discuss."
  msgstr ""
  
  "credit control personnel to discuss."
  msgstr ""
  
-#: sales/customer_delivery.php:423
+#: sales/customer_delivery.php:426
  msgid "Delivery Items"
  msgstr ""
  
  msgid "Delivery Items"
  msgstr ""
  
-#: sales/customer_delivery.php:429
+#: sales/customer_delivery.php:432
  msgid "Max. delivery"
  msgstr ""
  
  msgid "Max. delivery"
  msgstr ""
  
-#: sales/customer_delivery.php:429 sales/customer_invoice.php:448
+#: sales/customer_delivery.php:432 sales/customer_invoice.php:467
  #: sales/includes/ui/sales_order_ui.inc:141
  msgid "Delivered"
  msgstr ""
  
  #: sales/includes/ui/sales_order_ui.inc:141
  msgid "Delivered"
  msgstr ""
  
-#: sales/customer_delivery.php:430 sales/customer_invoice.php:449
-#: sales/view/view_receipt.php:45 sales/view/view_sales_order.php:202
-msgid "Discount"
-msgstr ""
-
-#: sales/customer_delivery.php:490 sales/customer_invoice.php:533
+#: sales/customer_delivery.php:493 sales/customer_invoice.php:552
  msgid "Shipping Cost"
  msgstr ""
  
  msgid "Shipping Cost"
  msgstr ""
  
-#: sales/customer_delivery.php:510 sales/includes/ui/sales_order_ui.inc:242
+#: sales/customer_delivery.php:513 sales/includes/ui/sales_order_ui.inc:242
  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:514
+#: sales/customer_delivery.php:517
  msgid "Action For Balance"
  msgstr ""
  
  msgid "Action For Balance"
  msgstr ""
  
-#: sales/customer_delivery.php:521 sales/customer_invoice.php:562
+#: sales/customer_delivery.php:524 sales/customer_invoice.php:581
  msgid "Refresh document page"
  msgstr ""
  
  msgid "Refresh document page"
  msgstr ""
  
-#: sales/customer_delivery.php:522
+#: sales/customer_delivery.php:525
  msgid "Process Dispatch"
  msgstr ""
  
  msgid "Process Dispatch"
  msgstr ""
  
-#: sales/customer_delivery.php:523 sales/customer_invoice.php:564
-#: sales/sales_order_entry.php:710
+#: sales/customer_delivery.php:526 sales/customer_invoice.php:583
+#: sales/sales_order_entry.php:709
  msgid "Check entered data and save document"
  msgstr ""
  
  msgid "Check entered data and save document"
  msgstr ""
  
@@ -11756,131 +11917,140 @@ msgstr ""
  msgid "Select Delivery to Invoice"
  msgstr ""
  
  msgid "Select Delivery to Invoice"
  msgstr ""
  
-#: sales/customer_invoice.php:153 sales/customer_invoice.php:304
+#: sales/customer_invoice.php:153 sales/customer_invoice.php:308
  msgid ""
  "Selected quantity cannot be less than quantity credited nor more than "
  "quantity not invoiced yet."
  msgstr ""
  
  msgid ""
  "Selected quantity cannot be less than quantity credited nor more than "
  "quantity not invoiced yet."
  msgstr ""
  
-#: sales/customer_invoice.php:257
+#: sales/customer_invoice.php:261
  msgid "The entered invoice date is invalid."
  msgstr ""
  
  msgid "The entered invoice date is invalid."
  msgstr ""
  
-#: sales/customer_invoice.php:263
+#: sales/customer_invoice.php:267
  msgid "The entered invoice date is not in fiscal year."
  msgstr ""
  
  msgid "The entered invoice date is not in fiscal year."
  msgstr ""
  
-#: sales/customer_invoice.php:269
+#: sales/customer_invoice.php:273
  msgid "The entered invoice due date is invalid."
  msgstr ""
  
  msgid "The entered invoice due date is invalid."
  msgstr ""
  
-#: sales/customer_invoice.php:299
+#: sales/customer_invoice.php:303
  msgid "There are no item quantities on this invoice."
  msgstr ""
  
  msgid "There are no item quantities on this invoice."
  msgstr ""
  
-#: sales/customer_invoice.php:379
+#: sales/customer_invoice.php:383
  msgid "Payment terms:"
  msgstr ""
  
  msgid "Payment terms:"
  msgstr ""
  
-#: sales/customer_invoice.php:382 sales/includes/ui/sales_order_ui.inc:405
+#: sales/customer_invoice.php:386 sales/includes/ui/sales_order_ui.inc:405
  #: sales/includes/ui/sales_order_ui.inc:409
  msgid "Payment:"
  msgstr ""
  
  #: sales/includes/ui/sales_order_ui.inc:409
  msgid "Payment:"
  msgstr ""
  
-#: sales/customer_invoice.php:444
+#: sales/customer_invoice.php:463
  msgid "Invoice Items"
  msgstr ""
  
  msgid "Invoice Items"
  msgstr ""
  
-#: sales/customer_invoice.php:449
+#: sales/customer_invoice.php:468
  msgid "This Invoice"
  msgstr ""
  
  msgid "This Invoice"
  msgstr ""
  
-#: sales/customer_invoice.php:457
+#: sales/customer_invoice.php:476
  msgid "Credited"
  msgstr ""
  
  msgid "Credited"
  msgstr ""
  
-#: sales/customer_invoice.php:551
+#: sales/customer_invoice.php:570
  msgid "Invoice Total"
  msgstr ""
  
  msgid "Invoice Total"
  msgstr ""
  
-#: sales/customer_payments.php:33 sales/customer_payments.php.orig:33
+#: sales/customer_payments.php:33
  msgid "Customer Payment Entry"
  msgstr ""
  
  msgid "Customer Payment Entry"
  msgstr ""
  
-#: sales/customer_payments.php:37 sales/customer_payments.php.orig:37
+#: sales/customer_payments.php:37
  msgid "There are no customers defined in the system."
  msgstr ""
  
  msgid "There are no customers defined in the system."
  msgstr ""
  
-#: sales/customer_payments.php:62 sales/customer_payments.php.orig:62
+#: sales/customer_payments.php:68
+msgid "Invalid sales invoice number."
+msgstr ""
+
+#: sales/customer_payments.php:92
  msgid "The customer payment has been successfully entered."
  msgstr ""
  
  msgid "The customer payment has been successfully entered."
  msgstr ""
  
-#: sales/customer_payments.php:64 sales/customer_payments.php.orig:64
+#: sales/customer_payments.php:94 sales/customer_payments.php:109
  msgid "&Print This Receipt"
  msgstr ""
  
  msgid "&Print This Receipt"
  msgstr ""
  
-#: sales/customer_payments.php:66 sales/customer_payments.php.orig:66
+#: sales/customer_payments.php:96 sales/customer_payments.php:111
  msgid "&View the GL Journal Entries for this Customer Payment"
  msgstr ""
  
  msgid "&View the GL Journal Entries for this Customer Payment"
  msgstr ""
  
-#: sales/customer_payments.php:70 sales/customer_payments.php.orig:70
+#: sales/customer_payments.php:100 sales/customer_payments.php:115
  msgid "Enter Another &Customer Payment"
  msgstr ""
  
  msgid "Enter Another &Customer Payment"
  msgstr ""
  
-#: sales/customer_payments.php:83 sales/customer_payments.php.orig:83
-#: sales/sales_order_entry.php:329
+#: sales/customer_payments.php:107
+msgid "The customer payment has been successfully updated."
+msgstr ""
+
+#: sales/customer_payments.php:128 sales/sales_order_entry.php:327
  msgid "There is no customer selected."
  msgstr ""
  
  msgid "There is no customer selected."
  msgstr ""
  
-#: sales/customer_payments.php:90 sales/customer_payments.php.orig:90
-#: sales/sales_order_entry.php:336
+#: sales/customer_payments.php:135 sales/sales_order_entry.php:334
  msgid "This customer has no branch defined."
  msgstr ""
  
  msgid "This customer has no branch defined."
  msgstr ""
  
-#: sales/customer_payments.php:96 sales/customer_payments.php.orig:96
+#: sales/customer_payments.php:141
  msgid "The entered date is invalid. Please enter a valid date for the payment."
  msgstr ""
  
  msgid "The entered date is invalid. Please enter a valid date for the payment."
  msgstr ""
  
-#: sales/customer_payments.php:118 sales/customer_payments.php:124
-#: sales/customer_payments.php.orig:118 sales/customer_payments.php.orig:124
+#: sales/customer_payments.php:171 sales/customer_payments.php:177
  msgid "The entered amount is invalid or negative and cannot be processed."
  msgstr ""
  
  msgid "The entered amount is invalid or negative and cannot be processed."
  msgstr ""
  
-#: sales/customer_payments.php:150 sales/customer_payments.php.orig:150
+#: sales/customer_payments.php:203
  msgid "The entered discount is not a valid number."
  msgstr ""
  
  msgid "The entered discount is not a valid number."
  msgstr ""
  
-#: sales/customer_payments.php:157 sales/customer_payments.php.orig:157
+#: sales/customer_payments.php:210
  msgid ""
  "The balance of the amount and discout is zero or negative. Please enter "
  "valid amounts."
  msgstr ""
  
  msgid ""
  "The balance of the amount and discout is zero or negative. Please enter "
  "valid amounts."
  msgstr ""
  
-#: sales/customer_payments.php:233 sales/customer_payments.php.orig:231
+#: sales/customer_payments.php:341 sales/customer_payments.php:343
  msgid "From Customer:"
  msgstr ""
  
  msgid "From Customer:"
  msgstr ""
  
-#: sales/customer_payments.php:248 sales/customer_payments.php.orig:250
+#: sales/customer_payments.php:370
  msgid "This customer account is on hold."
  msgstr ""
  
  msgid "This customer account is on hold."
  msgstr ""
  
-#: sales/customer_payments.php:255 sales/customer_payments.php.orig:257
+#: sales/customer_payments.php:380
  msgid "Into Bank Account:"
  msgstr ""
  
  msgid "Into Bank Account:"
  msgstr ""
  
-#: sales/customer_payments.php:262 sales/customer_payments.php.orig:264
+#: sales/customer_payments.php:386
  msgid "Date of Deposit:"
  msgstr ""
  
  msgid "Date of Deposit:"
  msgstr ""
  
-#: sales/customer_payments.php:287 sales/customer_payments.php.orig:288
+#: sales/customer_payments.php:408
  msgid "Customer prompt payment discount :"
  msgstr ""
  
  msgid "Customer prompt payment discount :"
  msgstr ""
  
-#: sales/customer_payments.php:296 sales/customer_payments.php.orig:297
+#: sales/customer_payments.php:417
  msgid "Amount and discount are in customer's currency."
  msgstr ""
  
  msgid "Amount and discount are in customer's currency."
  msgstr ""
  
-#: sales/customer_payments.php:300 sales/customer_payments.php.orig:301
+#: sales/customer_payments.php:422
+msgid "Update Payment"
+msgstr ""
+
+#: sales/customer_payments.php:424
  msgid "Add Payment"
  msgstr ""
  
  msgid "Add Payment"
  msgstr ""
  
@@ -12015,178 +12185,178 @@ msgstr ""
  msgid "Enter a &New Direct Invoice"
  msgstr ""
  
  msgid "Enter a &New Direct Invoice"
  msgstr ""
  
-#: sales/sales_order_entry.php:358
+#: sales/sales_order_entry.php:356
  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:365
+#: sales/sales_order_entry.php:363
  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:374
+#: sales/sales_order_entry.php:372
  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:380
+#: sales/sales_order_entry.php:378
  msgid "The Valid date is invalid."
  msgstr ""
  
  msgid "The Valid date is invalid."
  msgstr ""
  
-#: sales/sales_order_entry.php:382
+#: sales/sales_order_entry.php:380
  msgid "The delivery date is invalid."
  msgstr ""
  
  msgid "The delivery date is invalid."
  msgstr ""
  
-#: sales/sales_order_entry.php:389
+#: sales/sales_order_entry.php:387
  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:391
+#: sales/sales_order_entry.php:389
  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:400
+#: sales/sales_order_entry.php:398
  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:470
+#: sales/sales_order_entry.php:469
  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:474
+#: sales/sales_order_entry.php:473
  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:481
+#: sales/sales_order_entry.php:480
  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:512
+#: sales/sales_order_entry.php:511
  #, 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:537
+#: sales/sales_order_entry.php:536
  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:566
+#: sales/sales_order_entry.php:565
  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:567
+#: sales/sales_order_entry.php:566
  msgid "Enter a New Sales Delivery"
  msgstr ""
  
  msgid "Enter a New Sales Delivery"
  msgstr ""
  
-#: sales/sales_order_entry.php:570
+#: sales/sales_order_entry.php:569
  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:571
+#: sales/sales_order_entry.php:570
  msgid "Enter a New Sales Invoice"
  msgstr ""
  
  msgid "Enter a New Sales Invoice"
  msgstr ""
  
-#: sales/sales_order_entry.php:576
+#: sales/sales_order_entry.php:575
  msgid ""
  "This order cannot be cancelled because some of it has already been invoiced "
  "or dispatched. However, the line item quantities may be modified."
  msgstr ""
  
  msgid ""
  "This order cannot be cancelled because some of it has already been invoiced "
  "or dispatched. However, the line item quantities may be modified."
  msgstr ""
  
-#: sales/sales_order_entry.php:581
+#: sales/sales_order_entry.php:580
  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:582
+#: sales/sales_order_entry.php:581
  msgid "Enter a New Sales Quotation"
  msgstr ""
  
  msgid "Enter a New Sales Quotation"
  msgstr ""
  
-#: sales/sales_order_entry.php:586
+#: sales/sales_order_entry.php:585
  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:587
+#: sales/sales_order_entry.php:586
  msgid "Enter a New Sales Order"
  msgstr ""
  
  msgid "Enter a New Sales Order"
  msgstr ""
  
-#: sales/sales_order_entry.php:666
+#: sales/sales_order_entry.php:665
  msgid "Sales Invoice Items"
  msgstr ""
  
  msgid "Sales Invoice Items"
  msgstr ""
  
-#: sales/sales_order_entry.php:667
+#: sales/sales_order_entry.php:666
  msgid "Enter Delivery Details and Confirm Invoice"
  msgstr ""
  
  msgid "Enter Delivery Details and Confirm Invoice"
  msgstr ""
  
-#: sales/sales_order_entry.php:669
+#: sales/sales_order_entry.php:668
  msgid "Place Invoice"
  msgstr ""
  
  msgid "Place Invoice"
  msgstr ""
  
-#: sales/sales_order_entry.php:672
+#: sales/sales_order_entry.php:671
  msgid "Delivery Note Items"
  msgstr ""
  
  msgid "Delivery Note Items"
  msgstr ""
  
-#: sales/sales_order_entry.php:673
+#: sales/sales_order_entry.php:672
  msgid "Enter Delivery Details and Confirm Dispatch"
  msgstr ""
  
  msgid "Enter Delivery Details and Confirm Dispatch"
  msgstr ""
  
-#: sales/sales_order_entry.php:674
+#: sales/sales_order_entry.php:673
  msgid "Cancel Delivery"
  msgstr ""
  
  msgid "Cancel Delivery"
  msgstr ""
  
-#: sales/sales_order_entry.php:675
+#: sales/sales_order_entry.php:674
  msgid "Place Delivery"
  msgstr ""
  
  msgid "Place Delivery"
  msgstr ""
  
-#: sales/sales_order_entry.php:677
+#: sales/sales_order_entry.php:676
  msgid "Quotation Date:"
  msgstr ""
  
  msgid "Quotation Date:"
  msgstr ""
  
-#: sales/sales_order_entry.php:678
+#: sales/sales_order_entry.php:677
  msgid "Sales Quotation Items"
  msgstr ""
  
  msgid "Sales Quotation Items"
  msgstr ""
  
-#: sales/sales_order_entry.php:679
+#: sales/sales_order_entry.php:678
  msgid "Enter Delivery Details and Confirm Quotation"
  msgstr ""
  
  msgid "Enter Delivery Details and Confirm Quotation"
  msgstr ""
  
-#: sales/sales_order_entry.php:680
+#: sales/sales_order_entry.php:679
  msgid "Cancel Quotation"
  msgstr ""
  
  msgid "Cancel Quotation"
  msgstr ""
  
-#: sales/sales_order_entry.php:681
+#: sales/sales_order_entry.php:680
  msgid "Place Quotation"
  msgstr ""
  
  msgid "Place Quotation"
  msgstr ""
  
-#: sales/sales_order_entry.php:682
+#: sales/sales_order_entry.php:681
  msgid "Commit Quotations Changes"
  msgstr ""
  
  msgid "Commit Quotations Changes"
  msgstr ""
  
-#: sales/sales_order_entry.php:685
+#: sales/sales_order_entry.php:684
  msgid "Sales Order Items"
  msgstr ""
  
  msgid "Sales Order Items"
  msgstr ""
  
-#: sales/sales_order_entry.php:686
+#: sales/sales_order_entry.php:685
  msgid "Enter Delivery Details and Confirm Order"
  msgstr ""
  
  msgid "Enter Delivery Details and Confirm Order"
  msgstr ""
  
-#: sales/sales_order_entry.php:689
+#: sales/sales_order_entry.php:688
  msgid "Commit Order Changes"
  msgstr ""
  
  msgid "Commit Order Changes"
  msgstr ""
  
-#: sales/sales_order_entry.php:711
+#: sales/sales_order_entry.php:710
  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:714
+#: sales/sales_order_entry.php:713
  msgid "Validate changes and update document"
  msgstr ""
  
  msgid "Validate changes and update document"
  msgstr ""
  
-#: sales/sales_order_entry.php:718
+#: sales/sales_order_entry.php:717
  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 ""
@@ -12205,10 +12375,13 @@ msgid "Customer Allocations"
  msgstr ""
  
  #: sales/allocations/customer_allocation_main.php:32
  msgstr ""
  
  #: sales/allocations/customer_allocation_main.php:32
-#: sales/manage/customer_branches.php:280 sales/manage/customers.php:280
+#: sales/manage/customer_branches.php:280 sales/manage/customers.php:318
+#: sales/manage/customers.php.orig:319
  #: sales/inquiry/customer_allocation_inquiry.php:42
  #: sales/inquiry/customer_allocation_inquiry.php:42
-#: sales/inquiry/customer_inquiry.php:44
-#: sales/inquiry/sales_orders_view.php:234
+#: sales/inquiry/customer_inquiry.php:48
+#: sales/inquiry/customer_inquiry.php.orig:48
+#: sales/inquiry/sales_orders_view.php:241
+#: sales/inquiry/sales_orders_view.php.orig:241
  msgid "Select a customer: "
  msgstr ""
  
  msgid "Select a customer: "
  msgstr ""
  
@@ -12330,11 +12503,13 @@ msgstr ""
  msgid "Branch Short Name:"
  msgstr ""
  
  msgid "Branch Short Name:"
  msgstr ""
  
-#: sales/manage/customer_branches.php:241
+#: sales/manage/customer_branches.php:241 sales/manage/customers.php:286
+#: sales/manage/customers.php.orig:287
  msgid "Sales Person:"
  msgstr ""
  
  msgid "Sales Person:"
  msgstr ""
  
-#: sales/manage/customer_branches.php:242
+#: sales/manage/customer_branches.php:242 sales/manage/customers.php:287
+#: sales/manage/customers.php.orig:288
  msgid "Sales Area:"
  msgstr ""
  
  msgid "Sales Area:"
  msgstr ""
  
@@ -12395,142 +12570,153 @@ msgid ""
  "branch."
  msgstr ""
  
  "branch."
  msgstr ""
  
-#: sales/manage/customers.php:35
+#: sales/manage/customers.php:38 sales/manage/customers.php.orig:39
  msgid "The customer name cannot be empty."
  msgstr ""
  
  msgid "The customer name cannot be empty."
  msgstr ""
  
-#: sales/manage/customers.php:42
+#: sales/manage/customers.php:45 sales/manage/customers.php.orig:46
  msgid "The customer short name cannot be empty."
  msgstr ""
  
  msgid "The customer short name cannot be empty."
  msgstr ""
  
-#: sales/manage/customers.php:49
+#: sales/manage/customers.php:52 sales/manage/customers.php.orig:53
  msgid "The credit limit must be numeric and not less than zero."
  msgstr ""
  
  msgid "The credit limit must be numeric and not less than zero."
  msgstr ""
  
-#: sales/manage/customers.php:56
+#: sales/manage/customers.php:59 sales/manage/customers.php.orig:60
  msgid ""
  "The payment discount must be numeric and is expected to be less than 100% "
  "and greater than or equal to 0."
  msgstr ""
  
  msgid ""
  "The payment discount must be numeric and is expected to be less than 100% "
  "and greater than or equal to 0."
  msgstr ""
  
-#: sales/manage/customers.php:63
+#: sales/manage/customers.php:66 sales/manage/customers.php.orig:67
  msgid ""
  "The discount percentage must be numeric and is expected to be less than 100% "
  "and greater than or equal to 0."
  msgstr ""
  
  msgid ""
  "The discount percentage must be numeric and is expected to be less than 100% "
  "and greater than or equal to 0."
  msgstr ""
  
-#: sales/manage/customers.php:91
+#: sales/manage/customers.php:94 sales/manage/customers.php.orig:95
  msgid "Customer has been updated."
  msgstr ""
  
  msgid "Customer has been updated."
  msgstr ""
  
-#: sales/manage/customers.php:105
+#: sales/manage/customers.php:123 sales/manage/customers.php.orig:124
  msgid "A new customer has been added."
  msgstr ""
  
  msgid "A new customer has been added."
  msgstr ""
  
-#: sales/manage/customers.php:127
+#: sales/manage/customers.php:126 sales/manage/customers.php.orig:127
+msgid ""
+"A default Branch has been automatically created, please check default Branch "
+"values by using link below."
+msgstr ""
+
+#: sales/manage/customers.php:149 sales/manage/customers.php.orig:150
  msgid ""
  "This customer cannot be deleted because there are transactions that refer to "
  "it."
  msgstr ""
  
  msgid ""
  "This customer cannot be deleted because there are transactions that refer to "
  "it."
  msgstr ""
  
-#: sales/manage/customers.php:134
+#: sales/manage/customers.php:156 sales/manage/customers.php.orig:157
  msgid ""
  "Cannot delete the customer record because orders have been created against "
  "it."
  msgstr ""
  
  msgid ""
  "Cannot delete the customer record because orders have been created against "
  "it."
  msgstr ""
  
-#: sales/manage/customers.php:141
+#: sales/manage/customers.php:163 sales/manage/customers.php.orig:164
  msgid ""
  "Cannot delete this customer because there are branch records set up against "
  "it."
  msgstr ""
  
  msgid ""
  "Cannot delete this customer because there are branch records set up against "
  "it."
  msgstr ""
  
-#: sales/manage/customers.php:152
+#: sales/manage/customers.php:174 sales/manage/customers.php.orig:175
  msgid "Selected customer has been deleted."
  msgstr ""
  
  msgid "Selected customer has been deleted."
  msgstr ""
  
-#: sales/manage/customers.php:199
+#: sales/manage/customers.php:223 sales/manage/customers.php.orig:224
  msgid "Name and Address"
  msgstr ""
  
  msgid "Name and Address"
  msgstr ""
  
-#: sales/manage/customers.php:201
+#: sales/manage/customers.php:225 sales/manage/customers.php.orig:226
  msgid "Customer Name:"
  msgstr ""
  
  msgid "Customer Name:"
  msgstr ""
  
-#: sales/manage/customers.php:202
+#: sales/manage/customers.php:226 sales/manage/customers.php.orig:227
  msgid "Customer Short Name:"
  msgstr ""
  
  msgid "Customer Short Name:"
  msgstr ""
  
-#: sales/manage/customers.php:210 sales/manage/customers.php:214
+#: sales/manage/customers.php:234 sales/manage/customers.php:238
+#: sales/manage/customers.php.orig:235 sales/manage/customers.php.orig:239
  msgid "Customer's Currency:"
  msgstr ""
  
  msgid "Customer's Currency:"
  msgstr ""
  
-#: sales/manage/customers.php:217
+#: sales/manage/customers.php:241 sales/manage/customers.php.orig:242
  msgid "Sales Type/Price List:"
  msgstr ""
  
  msgid "Sales Type/Price List:"
  msgstr ""
  
-#: sales/manage/customers.php:220
+#: sales/manage/customers.php:244 sales/manage/customers.php.orig:245
  msgid "Customer status:"
  msgstr ""
  
  msgid "Customer status:"
  msgstr ""
  
-#: sales/manage/customers.php:226
+#: sales/manage/customers.php:257 sales/manage/customers.php.orig:258
  msgid "Discount Percent:"
  msgstr ""
  
  msgid "Discount Percent:"
  msgstr ""
  
-#: sales/manage/customers.php:227
+#: sales/manage/customers.php:258 sales/manage/customers.php.orig:259
  msgid "Prompt Payment Discount Percent:"
  msgstr ""
  
  msgid "Prompt Payment Discount Percent:"
  msgstr ""
  
-#: sales/manage/customers.php:231
+#: sales/manage/customers.php:262 sales/manage/customers.php.orig:263
  msgid "Credit Status:"
  msgstr ""
  
  msgid "Credit Status:"
  msgstr ""
  
-#: sales/manage/customers.php:244
+#: sales/manage/customers.php:275 sales/manage/customers.php.orig:276
  msgid "Customer branches"
  msgstr ""
  
  msgid "Customer branches"
  msgstr ""
  
-#: sales/manage/customers.php:246
+#: sales/manage/customers.php:277 sales/manage/customers.php.orig:278
  msgid "Select or &Add"
  msgstr ""
  
  msgid "Select or &Add"
  msgstr ""
  
-#: sales/manage/customers.php:246
+#: sales/manage/customers.php:277 sales/manage/customers.php.orig:278
  msgid "&Add or Edit "
  msgstr ""
  
  msgid "&Add or Edit "
  msgstr ""
  
-#: sales/manage/customers.php:257
+#: sales/manage/customers.php:295 sales/manage/customers.php.orig:296
  msgid "Add New Customer"
  msgstr ""
  
  msgid "Add New Customer"
  msgstr ""
  
-#: sales/manage/customers.php:261
+#: sales/manage/customers.php:299 sales/manage/customers.php.orig:300
  msgid "Update Customer"
  msgstr ""
  
  msgid "Update Customer"
  msgstr ""
  
-#: sales/manage/customers.php:262
+#: sales/manage/customers.php:300 sales/manage/customers.php.orig:301
  msgid "Update customer data"
  msgstr ""
  
  msgid "Update customer data"
  msgstr ""
  
-#: sales/manage/customers.php:263
+#: sales/manage/customers.php:301 sales/manage/customers.php.orig:302
  msgid "Select this customer and return to document entry."
  msgstr ""
  
  msgid "Select this customer and return to document entry."
  msgstr ""
  
-#: sales/manage/customers.php:264
+#: sales/manage/customers.php:302 sales/manage/customers.php.orig:303
  msgid "Delete Customer"
  msgstr ""
  
  msgid "Delete Customer"
  msgstr ""
  
-#: sales/manage/customers.php:265
+#: sales/manage/customers.php:303 sales/manage/customers.php.orig:304
  msgid "Delete customer data if have been never used"
  msgstr ""
  
  msgid "Delete customer data if have been never used"
  msgstr ""
  
-#: sales/manage/customers.php:272
+#: sales/manage/customers.php:310 sales/manage/customers.php.orig:311
  msgid ""
  "There are no sales types defined. Please define at least one sales type "
  "before adding a customer."
  msgstr ""
  
  msgid ""
  "There are no sales types defined. Please define at least one sales type "
  "before adding a customer."
  msgstr ""
  
-#: sales/manage/customers.php:281
+#: sales/manage/customers.php:319 sales/manage/customers.php.orig:320
  msgid "New customer"
  msgstr ""
  
  msgid "New customer"
  msgstr ""
  
+#: sales/manage/customers.php:341 sales/manage/customers.php.orig:342
+msgid "Sales &Orders"
+msgstr ""
+
  #: sales/manage/recurrent_invoices.php:24
  msgid "Recurrent Invoices"
  msgstr ""
  #: sales/manage/recurrent_invoices.php:24
  msgid "Recurrent Invoices"
  msgstr ""
@@ -12944,20 +13130,29 @@ msgstr ""
  msgid "Allocation"
  msgstr ""
  
  msgid "Allocation"
  msgstr ""
  
-#: sales/inquiry/customer_inquiry.php:26
+#: sales/inquiry/customer_allocation_inquiry.php:116
+msgid "Payment"
+msgstr ""
+
+#: sales/inquiry/customer_inquiry.php:28
+#: sales/inquiry/customer_inquiry.php.orig:28
  msgid "Customer Transactions"
  msgstr ""
  
  msgid "Customer Transactions"
  msgstr ""
  
-#: sales/inquiry/customer_inquiry.php:68
+#: sales/inquiry/customer_inquiry.php:72
+#: sales/inquiry/customer_inquiry.php.orig:72
  msgid "CUSTOMER ACCOUNT IS ON HOLD"
  msgstr ""
  
  msgid "CUSTOMER ACCOUNT IS ON HOLD"
  msgstr ""
  
-#: sales/inquiry/customer_inquiry.php:193
+#: sales/inquiry/customer_inquiry.php:205
+#: sales/inquiry/customer_inquiry.php.orig:205
  msgid "Print Receipt"
  msgstr ""
  
  msgid "Print Receipt"
  msgstr ""
  
-#: sales/inquiry/customer_inquiry.php:223
-#: sales/inquiry/customer_inquiry.php:236
+#: sales/inquiry/customer_inquiry.php:235
+#: sales/inquiry/customer_inquiry.php:248
+#: sales/inquiry/customer_inquiry.php.orig:235
+#: sales/inquiry/customer_inquiry.php.orig:248
  msgid "RB"
  msgstr ""
  
  msgid "RB"
  msgstr ""
  
@@ -13000,65 +13195,82 @@ msgstr ""
  msgid "Batch Invoicing"
  msgstr ""
  
  msgid "Batch Invoicing"
  msgstr ""
  
-#: sales/inquiry/sales_orders_view.php:46
+#: sales/inquiry/sales_orders_view.php:48
+#: sales/inquiry/sales_orders_view.php.orig:48
  msgid "Search Outstanding Sales Orders"
  msgstr ""
  
  msgid "Search Outstanding Sales Orders"
  msgstr ""
  
-#: sales/inquiry/sales_orders_view.php:51
+#: sales/inquiry/sales_orders_view.php:53
+#: sales/inquiry/sales_orders_view.php.orig:53
  msgid "Search Template for Invoicing"
  msgstr ""
  
  msgid "Search Template for Invoicing"
  msgstr ""
  
-#: sales/inquiry/sales_orders_view.php:56
+#: sales/inquiry/sales_orders_view.php:58
+#: sales/inquiry/sales_orders_view.php.orig:58
  msgid "Select Template for Delivery"
  msgstr ""
  
  msgid "Select Template for Delivery"
  msgstr ""
  
-#: sales/inquiry/sales_orders_view.php:61
+#: sales/inquiry/sales_orders_view.php:63
+#: sales/inquiry/sales_orders_view.php.orig:63
  msgid "Search All Sales Orders"
  msgstr ""
  
  msgid "Search All Sales Orders"
  msgstr ""
  
-#: sales/inquiry/sales_orders_view.php:67
+#: sales/inquiry/sales_orders_view.php:69
+#: sales/inquiry/sales_orders_view.php.orig:69
  msgid "Search All Sales Quotations"
  msgstr ""
  
  msgid "Search All Sales Quotations"
  msgstr ""
  
-#: sales/inquiry/sales_orders_view.php:131
+#: sales/inquiry/sales_orders_view.php:134
+#: sales/inquiry/sales_orders_view.php.orig:134
  msgid "Dispatch"
  msgstr ""
  
  msgid "Dispatch"
  msgstr ""
  
-#: sales/inquiry/sales_orders_view.php:171
+#: sales/inquiry/sales_orders_view.php:176
+#: sales/inquiry/sales_orders_view.php.orig:176
  msgid "Set this order as a template for direct deliveries/invoices"
  msgstr ""
  
  msgid "Set this order as a template for direct deliveries/invoices"
  msgstr ""
  
-#: sales/inquiry/sales_orders_view.php:236
+#: sales/inquiry/sales_orders_view.php:243
+#: sales/inquiry/sales_orders_view.php.orig:243
  msgid "Show All:"
  msgstr ""
  
  msgid "Show All:"
  msgstr ""
  
-#: sales/inquiry/sales_orders_view.php:253
+#: sales/inquiry/sales_orders_view.php:260
+#: sales/inquiry/sales_orders_view.php.orig:260
  msgid "Order #"
  msgstr ""
  
  msgid "Order #"
  msgstr ""
  
-#: sales/inquiry/sales_orders_view.php:257
-#: sales/inquiry/sales_orders_view.php:271
+#: sales/inquiry/sales_orders_view.php:264
+#: sales/inquiry/sales_orders_view.php:278
+#: sales/inquiry/sales_orders_view.php.orig:264
+#: sales/inquiry/sales_orders_view.php.orig:278
  msgid "Cust Order Ref"
  msgstr ""
  
  msgid "Cust Order Ref"
  msgstr ""
  
-#: sales/inquiry/sales_orders_view.php:260
-#: sales/inquiry/sales_orders_view.php:274
+#: sales/inquiry/sales_orders_view.php:267
+#: sales/inquiry/sales_orders_view.php:281
+#: sales/inquiry/sales_orders_view.php.orig:267
+#: sales/inquiry/sales_orders_view.php.orig:281
  msgid "Delivery To"
  msgstr ""
  
  msgid "Delivery To"
  msgstr ""
  
-#: sales/inquiry/sales_orders_view.php:267
+#: sales/inquiry/sales_orders_view.php:274
+#: sales/inquiry/sales_orders_view.php.orig:274
  msgid "Quote #"
  msgstr ""
  
  msgid "Quote #"
  msgstr ""
  
-#: sales/inquiry/sales_orders_view.php:272
+#: sales/inquiry/sales_orders_view.php:279
+#: sales/inquiry/sales_orders_view.php.orig:279
  msgid "Quote Date"
  msgstr ""
  
  msgid "Quote Date"
  msgstr ""
  
-#: sales/inquiry/sales_orders_view.php:275
+#: sales/inquiry/sales_orders_view.php:282
+#: sales/inquiry/sales_orders_view.php.orig:282
  msgid "Quote Total"
  msgstr ""
  
  msgid "Quote Total"
  msgstr ""
  
-#: sales/inquiry/sales_orders_view.php:302
+#: sales/inquiry/sales_orders_view.php:309
+#: sales/inquiry/sales_orders_view.php.orig:309
  msgid "Tmpl"
  msgstr ""
  
  msgid "Tmpl"
  msgstr ""
  
@@ -13072,7 +13284,7 @@ msgid ""
  "browser tab. You cannot edit more than one sales document at once."
  msgstr ""
  
  "browser tab. You cannot edit more than one sales document at once."
  msgstr ""
  
-#: sales/includes/db/custalloc_db.inc:265
+#: sales/includes/db/custalloc_db.inc:292
  msgid ""
  "Unsuspected overallocation happened due to sparse credit notes exists for "
  "this invoice.\n"
  msgid ""
  "Unsuspected overallocation happened due to sparse credit notes exists for "
  "this invoice.\n"
@@ -13081,6 +13293,7 @@ msgid ""
  msgstr ""
  
  #: sales/includes/db/sales_invoice_db.inc:173
  msgstr ""
  
  #: sales/includes/db/sales_invoice_db.inc:173
+#: sales/includes/db/sales_invoice_db.inc.orig:176
  msgid "Cash invoice"
  msgstr ""
  
  msgid "Cash invoice"
  msgstr ""
  
@@ -13145,6 +13358,7 @@ msgstr ""
  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:413
  #: sales/includes/ui/sales_order_ui.inc:415
  msgid "Price List:"
  msgstr ""
  #: sales/includes/ui/sales_order_ui.inc:415
  msgid "Price List:"
  msgstr ""