Supplier Inquiry/Customer Inquiry: removed inconsistency in unsettled/overdue transac...
authorJanusz Dobrowolski <janusz@frontaccounting.eu>
Fri, 13 Oct 2017 08:31:04 +0000 (10:31 +0200)
committerJanusz Dobrowolski <janusz@frontaccounting.eu>
Fri, 13 Oct 2017 15:38:39 +0000 (17:38 +0200)
includes/ui/ui_lists.inc
lang/new_language_template/LC_MESSAGES/empty.po
purchasing/includes/db/supp_trans_db.inc
purchasing/includes/db/suppliers_db.inc
purchasing/inquiry/supplier_inquiry.php
sales/includes/db/cust_trans_db.inc
sales/includes/db/customers_db.inc
sales/inquiry/customer_inquiry.php

index e8121c35977f762d9fd4503cd544cd1238f691a7..9ea529965d026c3a51d782d0426cd94c2cccd32b 100644 (file)
@@ -2121,7 +2121,7 @@ function journal_types_list_cells($label, $name, $value=null, $submit_on_change=
        echo "</td>\n";
 }
 
-function cust_allocations_list_cells($label, $name, $selected=null)
+function cust_allocations_list_cells($label, $name, $selected=null, $submit_on_change=false)
 {
 
        if ($label != null)
@@ -2130,12 +2130,12 @@ function cust_allocations_list_cells($label, $name, $selected=null)
        $allocs = array( 
                ALL_TEXT=>_("All Types"),
                '1'=> _("Sales Invoices"),
-               '2'=> _("Overdue Invoices"),
+               '2'=> _("Unsettled transactions"),
                '3' => _("Payments"),
                '4' => _("Credit Notes"),
                '5' => _("Delivery Notes")
        );
-       echo array_selector($name, $selected, $allocs);
+       echo array_selector($name, $selected, $allocs, array('select_submit'=> $submit_on_change));
        echo "</td>\n";
 }
 
@@ -2155,7 +2155,7 @@ function supp_allocations_list_cell($name, $selected=null)
        echo "</td>\n";
 }
 
-function supp_transactions_list_cell($name, $selected=null)
+function supp_transactions_list_cell($name, $selected=null, $submit_on_change=false)
 {
 
        echo "<td>\n";
@@ -2163,13 +2163,13 @@ function supp_transactions_list_cell($name, $selected=null)
                ALL_TEXT=>_("All Types"),
                '6'=>_("GRNs"),
                '1'=> _("Invoices"),
-               '2'=> _("Overdue Invoices"),
+               '2'=> _("Unsettled transactions"),
                '3' => _("Payments"),
                '4' => _("Credit Notes"),
                '5' => _("Overdue Credit Notes")
        );
 
-       echo array_selector($name, $selected, $allocs);
+       echo array_selector($name, $selected, $allocs, array('select_submit'=> $submit_on_change));
        echo "</td>\n";
 }
 
index 2b0d5ccdcf6b562d27d5aa7082932504f325fd2a..09e6637f8d79b9cadb882dea0db6e8a0cc2c1947 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-27 20:21+0200\n"
+"POT-Creation-Date: 2017-10-13 17:38+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -244,18 +244,18 @@ msgstr ""
 #: purchasing/inquiry/po_search_completed.php:110
 #: purchasing/inquiry/po_search.php:117
 #: purchasing/inquiry/supplier_allocation_inquiry.php:137
-#: purchasing/inquiry/supplier_inquiry.php:171
+#: purchasing/inquiry/supplier_inquiry.php:174
 #: purchasing/allocations/supplier_allocation_main.php:95
 #: reporting/rep101.php:132 reporting/rep201.php:107 reporting/rep203.php:88
 #: reporting/rep306.php:141 reporting/rep601.php:79 reporting/rep602.php:80
 #: reporting/rep704.php:82 reporting/rep704.php:85 reporting/rep704.php:88
 #: reporting/rep710.php:78 reporting/includes/doctext.inc:166
 #: reporting/includes/doctext.inc:207 reporting/includes/doctext.inc:245
-#: sales/allocations/customer_allocation_main.php:88
+#: sales/allocations/customer_allocation_main.php:93
 #: sales/view/view_sales_order.php:109 sales/view/view_sales_order.php:142
 #: sales/view/view_sales_order.php:179
 #: sales/inquiry/customer_allocation_inquiry.php:147
-#: sales/inquiry/customer_inquiry.php:193
+#: sales/inquiry/customer_inquiry.php:194
 msgid "#"
 msgstr ""
 
@@ -285,7 +285,7 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: admin/attachments.php:210 admin/backups.php:67 admin/backups.php:152
+#: admin/attachments.php:210 admin/backups.php:67 admin/backups.php:153
 msgid "Filename"
 msgstr ""
 
@@ -310,7 +310,7 @@ msgid "Attached File"
 msgstr ""
 
 #: admin/backups.php:21 admin/backups.php:40 admin/backups.php:118
-#: admin/backups.php:145 admin/backups.php:158 admin/backups.php:178
+#: admin/backups.php:146 admin/backups.php:159 admin/backups.php:179
 msgid "Select backup file first."
 msgstr ""
 
@@ -345,7 +345,7 @@ msgstr ""
 #: gl/manage/gl_account_classes.php:126 gl/manage/gl_quick_entries.php:237
 #: includes/system_tests.inc:38 includes/system_tests.inc:113
 #: includes/system_tests.inc:126 includes/ui/class.reflines_crud.inc:56
-#: includes/ui/ui_lists.inc:1852 purchasing/manage/suppliers.php:122
+#: includes/ui/ui_lists.inc:1867 purchasing/manage/suppliers.php:122
 #: reporting/rep101.php:128 reporting/rep102.php:110 reporting/rep102.php:112
 #: reporting/rep104.php:103 reporting/rep106.php:81 reporting/rep114.php:74
 #: reporting/rep201.php:103 reporting/rep202.php:116 reporting/rep202.php:118
@@ -357,93 +357,93 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: admin/backups.php:142
+#: admin/backups.php:143
 msgid "Restore backup completed."
 msgstr ""
 
-#: admin/backups.php:151
+#: admin/backups.php:152
 msgid "File successfully deleted."
 msgstr ""
 
-#: admin/backups.php:156
+#: admin/backups.php:157
 msgid "Can't delete backup file."
 msgstr ""
 
-#: admin/backups.php:168
+#: admin/backups.php:169
 msgid "You can only upload *.sql backup files"
 msgstr ""
 
-#: admin/backups.php:170
+#: admin/backups.php:171
 msgid "Filename contains forbidden chars. Please rename file and try again."
 msgstr ""
 
-#: admin/backups.php:173
+#: admin/backups.php:174
 msgid "File uploaded to backup directory"
 msgstr ""
 
-#: admin/backups.php:176
+#: admin/backups.php:177
 msgid "File was not uploaded into the system."
 msgstr ""
 
-#: admin/backups.php:185
+#: admin/backups.php:186
 msgid "Create backup"
 msgstr ""
 
-#: admin/backups.php:186 sales/includes/ui/sales_order_ui.inc:581
+#: admin/backups.php:187 sales/includes/ui/sales_order_ui.inc:581
 #: sales/includes/ui/sales_order_ui.inc:637
 msgid "Comments:"
 msgstr ""
 
-#: admin/backups.php:187
+#: admin/backups.php:188
 msgid "Compression:"
 msgstr ""
 
-#: admin/backups.php:189
+#: admin/backups.php:190
 msgid "Create Backup"
 msgstr ""
 
-#: admin/backups.php:191
+#: admin/backups.php:192
 msgid "Backup scripts maintenance"
 msgstr ""
 
-#: admin/backups.php:197
+#: admin/backups.php:198
 msgid "View Backup"
 msgstr ""
 
-#: admin/backups.php:198
+#: admin/backups.php:199
 msgid "Download Backup"
 msgstr ""
 
-#: admin/backups.php:199
+#: admin/backups.php:200
 msgid "Restore Backup"
 msgstr ""
 
-#: admin/backups.php:200
+#: admin/backups.php:201
 msgid ""
 "You are about to restore database from backup file.\n"
 "Do you want to continue?"
 msgstr ""
 
-#: admin/backups.php:202
+#: admin/backups.php:203
 msgid "Delete Backup"
 msgstr ""
 
-#: admin/backups.php:204
+#: admin/backups.php:205
 #, php-format
 msgid ""
 "You are about to remove selected backup file.\n"
 "Do you want to continue ?"
 msgstr ""
 
-#: admin/backups.php:210
+#: admin/backups.php:211
 msgid "Update security settings"
 msgstr ""
 
-#: admin/backups.php:211
+#: admin/backups.php:212
 msgid "Protect security settings"
 msgstr ""
 
-#: admin/backups.php:215
+#: admin/backups.php:216
 msgid "Upload file"
 msgstr ""
 
@@ -541,175 +541,183 @@ msgstr ""
 msgid "Company setup has been updated."
 msgstr ""
 
-#: admin/company_preferences.php:169
+#: admin/company_preferences.php:181
 msgid "General settings"
 msgstr ""
 
-#: admin/company_preferences.php:171
+#: admin/company_preferences.php:183
 msgid "Name (to appear on reports):"
 msgstr ""
 
-#: admin/company_preferences.php:172 admin/shipping_companies.php:142
+#: admin/company_preferences.php:184 admin/shipping_companies.php:142
 #: includes/ui/contacts_view.inc:106 inventory/manage/locations.php:212
 #: sales/manage/customers.php:234 sales/includes/ui/sales_order_ui.inc:628
 msgid "Address:"
 msgstr ""
 
-#: admin/company_preferences.php:173
+#: admin/company_preferences.php:185
 msgid "Domicile:"
 msgstr ""
 
-#: admin/company_preferences.php:175 admin/shipping_companies.php:138
+#: admin/company_preferences.php:187 admin/shipping_companies.php:138
 #: purchasing/manage/suppliers.php:135 sales/manage/customer_branches.php:253
 msgid "Phone Number:"
 msgstr ""
 
-#: admin/company_preferences.php:176 includes/ui/contacts_view.inc:101
+#: admin/company_preferences.php:188 includes/ui/contacts_view.inc:101
 #: purchasing/manage/suppliers.php:138 sales/manage/customer_branches.php:255
 #: sales/manage/customers.php:258
 msgid "Fax Number:"
 msgstr ""
 
-#: admin/company_preferences.php:177 admin/users.php:211
+#: admin/company_preferences.php:189 admin/users.php:211
 msgid "Email Address:"
 msgstr ""
 
-#: admin/company_preferences.php:179
+#: admin/company_preferences.php:191
 msgid "BCC Address for all outgoing mails:"
 msgstr ""
 
-#: admin/company_preferences.php:181
+#: admin/company_preferences.php:193
 msgid "Official Company Number:"
 msgstr ""
 
-#: admin/company_preferences.php:182 purchasing/manage/suppliers.php:95
+#: admin/company_preferences.php:194 purchasing/manage/suppliers.php:95
 #: sales/manage/customers.php:236
 msgid "GSTNo:"
 msgstr ""
 
-#: admin/company_preferences.php:183
+#: admin/company_preferences.php:195
 msgid "Home Currency:"
 msgstr ""
 
-#: admin/company_preferences.php:185
+#: admin/company_preferences.php:197
 msgid "Company Logo:"
 msgstr ""
 
-#: admin/company_preferences.php:186
+#: admin/company_preferences.php:198
 msgid "New Company Logo (.jpg)"
 msgstr ""
 
-#: admin/company_preferences.php:187
+#: admin/company_preferences.php:199
 msgid "Delete Company Logo:"
 msgstr ""
 
-#: admin/company_preferences.php:189
+#: admin/company_preferences.php:201
 msgid "Automatic Revaluation Currency Accounts"
 msgstr ""
 
-#: admin/company_preferences.php:190
+#: admin/company_preferences.php:202
 msgid "Time Zone on Reports"
 msgstr ""
 
-#: admin/company_preferences.php:191
+#: admin/company_preferences.php:203
+msgid "Company Logo on Reports"
+msgstr ""
+
+#: admin/company_preferences.php:204
 msgid "Database Scheme Version"
 msgstr ""
 
-#: admin/company_preferences.php:195
+#: admin/company_preferences.php:208
 msgid "General Ledger Settings"
 msgstr ""
 
-#: admin/company_preferences.php:196 gl/gl_budget.php:62
+#: admin/company_preferences.php:209 gl/gl_budget.php:62
 msgid "Fiscal Year:"
 msgstr ""
 
-#: admin/company_preferences.php:197
+#: admin/company_preferences.php:210
 msgid "Tax Periods:"
 msgstr ""
 
-#: admin/company_preferences.php:197
+#: admin/company_preferences.php:210
 msgid "Months."
 msgstr ""
 
-#: admin/company_preferences.php:198
+#: admin/company_preferences.php:211
 msgid "Tax Last Period:"
 msgstr ""
 
-#: admin/company_preferences.php:198
+#: admin/company_preferences.php:211
 msgid "Months back."
 msgstr ""
 
-#: admin/company_preferences.php:199
+#: admin/company_preferences.php:212
 msgid "Put alternative Tax Include on Docs"
 msgstr ""
 
-#: admin/company_preferences.php:200
+#: admin/company_preferences.php:213
 msgid "Suppress Tax Rates on Docs"
 msgstr ""
 
-#: admin/company_preferences.php:202
+#: admin/company_preferences.php:215
 msgid "Sales Pricing"
 msgstr ""
 
-#: admin/company_preferences.php:203
+#: admin/company_preferences.php:216
 msgid "Base for auto price calculations:"
 msgstr ""
 
-#: admin/company_preferences.php:204
+#: admin/company_preferences.php:217
 msgid "No base price list"
 msgstr ""
 
-#: admin/company_preferences.php:206
+#: admin/company_preferences.php:219
 msgid "Add Price from Std Cost:"
 msgstr ""
 
-#: admin/company_preferences.php:208
+#: admin/company_preferences.php:221
 msgid "Round calculated prices to nearest:"
 msgstr ""
 
-#: admin/company_preferences.php:212
+#: admin/company_preferences.php:225
 msgid "Optional Modules"
 msgstr ""
 
-#: admin/company_preferences.php:213 includes/dashboard.inc:118
+#: admin/company_preferences.php:226 includes/dashboard.inc:118
 #: reporting/reports_main.php:285
 msgid "Manufacturing"
 msgstr ""
 
-#: admin/company_preferences.php:214 includes/dashboard.inc:116
+#: admin/company_preferences.php:227 includes/dashboard.inc:116
 #: inventory/manage/items.php:24 reporting/reports_main.php:308
 msgid "Fixed Assets"
 msgstr ""
 
-#: admin/company_preferences.php:215
+#: admin/company_preferences.php:228
 msgid "Use Dimensions:"
 msgstr ""
 
-#: admin/company_preferences.php:217
+#: admin/company_preferences.php:230
 msgid "User Interface Options"
 msgstr ""
 
-#: admin/company_preferences.php:219
+#: admin/company_preferences.php:232
+msgid "Short Name and Name in List"
+msgstr ""
+
+#: admin/company_preferences.php:233
 msgid "Search Item List"
 msgstr ""
 
-#: admin/company_preferences.php:220
+#: admin/company_preferences.php:234
 msgid "Search Customer List"
 msgstr ""
 
-#: admin/company_preferences.php:221
+#: admin/company_preferences.php:235
 msgid "Search Supplier List"
 msgstr ""
 
-#: admin/company_preferences.php:222
+#: admin/company_preferences.php:236
 msgid "Login Timeout:"
 msgstr ""
 
-#: admin/company_preferences.php:222
+#: admin/company_preferences.php:236
 msgid "seconds"
 msgstr ""
 
-#: admin/company_preferences.php:227 admin/display_prefs.php:160
+#: admin/company_preferences.php:241 admin/display_prefs.php:160
 #: admin/gl_setup.php:274 admin/inst_chart.php:77 admin/inst_lang.php:103
 #: admin/inst_module.php:136 admin/inst_module.php:154
 #: admin/inst_module.php:197 admin/inst_theme.php:81
@@ -718,7 +726,7 @@ msgstr ""
 #: gl/includes/ui/gl_journal_ui.inc:267 includes/ui/class.crud_view.inc:289
 #: includes/ui/db_pager_view.inc:180 includes/ui/simple_crud_class.inc:56
 #: includes/ui/simple_crud_class.inc:225 includes/ui/ui_input.inc:226
-#: includes/ui/ui_input.inc:961 inventory/adjustments.php:255
+#: includes/ui/ui_input.inc:959 inventory/adjustments.php:255
 #: inventory/cost_update.php:150 inventory/reorder_level.php:111
 #: inventory/transfers.php:237 inventory/includes/item_adjustments_ui.inc:190
 #: inventory/includes/stock_transfers_ui.inc:150
@@ -863,7 +871,7 @@ msgstr ""
 #: gl/manage/gl_account_classes.php:126 gl/manage/gl_quick_entries.php:237
 #: includes/system_tests.inc:38 includes/system_tests.inc:113
 #: includes/system_tests.inc:126 includes/ui/class.reflines_crud.inc:56
-#: includes/ui/class.reflines_crud.inc:101 includes/ui/ui_lists.inc:1853
+#: includes/ui/class.reflines_crud.inc:101 includes/ui/ui_lists.inc:1868
 #: purchasing/manage/suppliers.php:122 reporting/rep101.php:127
 #: reporting/rep102.php:109 reporting/rep102.php:111 reporting/rep104.php:105
 #: reporting/rep106.php:83 reporting/rep114.php:76 reporting/rep201.php:102
@@ -1219,7 +1227,7 @@ msgid "Fiscal Year End"
 msgstr ""
 
 #: admin/fiscalyears.php:138 dimensions/inquiry/search_dimensions.php:130
-#: dimensions/inquiry/search_dimensions.php:136 includes/ui/ui_lists.inc:743
+#: dimensions/inquiry/search_dimensions.php:136 includes/ui/ui_lists.inc:758
 #: includes/ui/ui_view.inc:1546 manufacturing/search_work_orders.php:114
 #: reporting/rep402.php:103 reporting/rep501.php:87 reporting/rep710.php:113
 #: reporting/includes/excel_report.inc:231
@@ -1373,18 +1381,18 @@ msgstr ""
 #: purchasing/inquiry/po_search_completed.php:111
 #: purchasing/inquiry/po_search.php:118
 #: purchasing/inquiry/supplier_allocation_inquiry.php:138
-#: purchasing/inquiry/supplier_inquiry.php:172
+#: purchasing/inquiry/supplier_inquiry.php:175
 #: purchasing/allocations/supplier_allocation_main.php:96
 #: reporting/rep501.php:87 reporting/rep601.php:79 reporting/rep602.php:80
 #: reporting/rep702.php:53 reporting/includes/doctext.inc:220
 #: sales/customer_credit_invoice.php:241 sales/customer_credit_invoice.php:246
 #: sales/customer_delivery.php:333 sales/customer_delivery.php:338
 #: sales/customer_invoice.php:445 sales/customer_invoice.php:450
-#: sales/allocations/customer_allocation_main.php:89
+#: sales/allocations/customer_allocation_main.php:94
 #: sales/view/view_dispatch.php:85 sales/view/view_invoice.php:85
 #: sales/view/view_receipt.php:39 sales/view/view_sales_order.php:94
 #: sales/inquiry/customer_allocation_inquiry.php:148
-#: sales/inquiry/customer_inquiry.php:195
+#: sales/inquiry/customer_inquiry.php:196
 #: sales/inquiry/sales_deliveries_view.php:173
 #: sales/includes/ui/sales_credit_ui.inc:81
 #: sales/includes/ui/sales_credit_ui.inc:83
@@ -1626,7 +1634,7 @@ msgstr ""
 #: admin/inst_lang.php:35 admin/printers.php:84
 #: admin/shipping_companies.php:91 dimensions/dimension_entry.php:261
 #: dimensions/inquiry/search_dimensions.php:126
-#: dimensions/view/view_dimension.php:55 gl/gl_journal.php:546
+#: dimensions/view/view_dimension.php:55 gl/gl_journal.php:548
 #: inventory/manage/item_categories.php:117
 #: inventory/manage/item_categories.php:121
 #: manufacturing/manage/work_centres.php:101
@@ -1732,8 +1740,8 @@ msgstr ""
 msgid "Install third-party extension."
 msgstr ""
 
-#: admin/inst_module.php:167 includes/ui/ui_lists.inc:743
-#: includes/ui/ui_lists.inc:2330 reporting/includes/excel_report.inc:229
+#: admin/inst_module.php:167 includes/ui/ui_lists.inc:758
+#: includes/ui/ui_lists.inc:2345 reporting/includes/excel_report.inc:229
 #: reporting/includes/pdf_report.inc:265
 msgid "Active"
 msgstr ""
@@ -1896,7 +1904,7 @@ msgstr ""
 #: manufacturing/includes/manufacturing_ui.inc:295
 #: manufacturing/includes/manufacturing_ui.inc:346
 #: purchasing/inquiry/supplier_allocation_inquiry.php:136
-#: purchasing/inquiry/supplier_inquiry.php:170 reporting/rep102.php:130
+#: purchasing/inquiry/supplier_inquiry.php:173 reporting/rep102.php:130
 #: reporting/rep202.php:137 reporting/rep402.php:103 reporting/rep501.php:87
 #: reporting/rep601.php:79 reporting/rep602.php:80 reporting/rep702.php:60
 #: reporting/rep704.php:82 reporting/rep704.php:85 reporting/rep704.php:88
@@ -1905,7 +1913,7 @@ msgstr ""
 #: reporting/includes/doctext.inc:161 reporting/includes/doctext.inc:202
 #: reporting/includes/doctext.inc:221
 #: sales/inquiry/customer_allocation_inquiry.php:146
-#: sales/inquiry/customer_inquiry.php:192
+#: sales/inquiry/customer_inquiry.php:193
 msgid "Type"
 msgstr ""
 
@@ -2094,7 +2102,7 @@ msgid "Role:"
 msgstr ""
 
 #: admin/security_roles.php:177 gl/manage/gl_accounts.php:202
-#: inventory/inquiry/stock_movements.php:67 inventory/manage/items.php:562
+#: inventory/inquiry/stock_movements.php:67 inventory/manage/items.php:563
 #: purchasing/manage/suppliers.php:292 sales/manage/customers.php:331
 msgid "Show inactive:"
 msgstr ""
@@ -2142,7 +2150,7 @@ msgstr ""
 #: includes/ui/ui_controls.inc:645 includes/ui/ui_input.inc:229
 #: inventory/includes/item_adjustments_ui.inc:192
 #: inventory/includes/stock_transfers_ui.inc:152
-#: inventory/manage/items.php:545
+#: inventory/manage/items.php:546
 #: manufacturing/includes/work_order_issue_ui.inc:134
 #: purchasing/includes/ui/po_ui.inc:438
 #: sales/create_recurrent_invoices.php:190
@@ -2151,7 +2159,7 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: admin/security_roles.php:244 inventory/manage/items.php:545
+#: admin/security_roles.php:244 inventory/manage/items.php:546
 msgid "Cancel Edition"
 msgstr ""
 
@@ -2365,7 +2373,7 @@ msgstr ""
 #: admin/view_print_transaction.php:43 admin/view_print_transaction.php:45
 #: admin/view_print_transaction.php:129 includes/ui/ui_controls.inc:213
 #: purchasing/inquiry/po_search_completed.php:43
-#: purchasing/inquiry/po_search.php:94 sales/inquiry/customer_inquiry.php:176
+#: purchasing/inquiry/po_search.php:94 sales/inquiry/customer_inquiry.php:97
 #: sales/inquiry/sales_deliveries_view.php:148
 #: sales/inquiry/sales_orders_view.php:102
 msgid "Print"
@@ -2391,11 +2399,11 @@ msgstr ""
 #: purchasing/inquiry/po_search_completed.php:99
 #: purchasing/inquiry/po_search.php:78
 #: purchasing/inquiry/supplier_allocation_inquiry.php:57
-#: purchasing/inquiry/supplier_inquiry.php:56
+#: purchasing/inquiry/supplier_inquiry.php:147
 #: purchasing/inquiry/suppliers_list.php:42
 #: sales/inquiry/customer_allocation_inquiry.php:51
 #: sales/inquiry/customer_branches_list.php:38
-#: sales/inquiry/customer_inquiry.php:54 sales/inquiry/customers_list.php:42
+#: sales/inquiry/customer_inquiry.php:164 sales/inquiry/customers_list.php:42
 #: sales/inquiry/sales_deliveries_view.php:116
 #: sales/inquiry/sales_orders_view.php:236
 msgid "Search"
@@ -2438,7 +2446,7 @@ msgstr ""
 #: purchasing/includes/ui/invoice_ui.inc:114
 #: purchasing/includes/ui/po_ui.inc:312 purchasing/view/view_po.php:140
 #: purchasing/inquiry/supplier_allocation_inquiry.php:141
-#: purchasing/inquiry/supplier_inquiry.php:175
+#: purchasing/inquiry/supplier_inquiry.php:178
 #: purchasing/allocations/supplier_allocation_main.php:97
 #: reporting/rep101.php:132 reporting/rep107.php:203 reporting/rep201.php:107
 #: reporting/rep306.php:141 reporting/rep402.php:103 reporting/rep501.php:87
@@ -2448,11 +2456,11 @@ msgstr ""
 #: reporting/includes/doctext.inc:207 reporting/includes/doctext.inc:245
 #: reporting/includes/header2.inc:137 sales/customer_delivery.php:366
 #: sales/customer_invoice.php:485
-#: sales/allocations/customer_allocation_main.php:90
+#: sales/allocations/customer_allocation_main.php:95
 #: sales/view/view_credit.php:69 sales/view/view_sales_order.php:109
 #: sales/view/view_sales_order.php:142 sales/view/view_sales_order.php:179
 #: sales/inquiry/customer_allocation_inquiry.php:150
-#: sales/inquiry/customer_inquiry.php:196
+#: sales/inquiry/customer_inquiry.php:197
 msgid "Date"
 msgstr ""
 
@@ -3049,7 +3057,7 @@ msgstr ""
 msgid "&Units of Measure"
 msgstr ""
 
-#: applications/inventory.php:45 inventory/manage/items.php:591
+#: applications/inventory.php:45 inventory/manage/items.php:592
 msgid "&Reorder Levels"
 msgstr ""
 
@@ -3065,7 +3073,7 @@ msgstr ""
 msgid "Purchasing &Pricing"
 msgstr ""
 
-#: applications/inventory.php:53 inventory/manage/items.php:590
+#: applications/inventory.php:53 inventory/manage/items.php:591
 msgid "Standard &Costs"
 msgstr ""
 
@@ -3406,7 +3414,7 @@ msgid "Balance for this Dimension"
 msgstr ""
 
 #: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:104
-#: gl/inquiry/gl_account_inquiry.php:129 gl/inquiry/gl_trial_balance.php:184
+#: gl/inquiry/gl_account_inquiry.php:129 gl/inquiry/gl_trial_balance.php:215
 #: gl/manage/gl_quick_entries.php:248 gl/manage/gl_quick_entries.php:342
 #: includes/dashboard.inc:606 includes/sysnames.inc:179
 #: purchasing/includes/ui/invoice_ui.inc:278
@@ -3420,8 +3428,8 @@ msgstr ""
 #: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:112
 #: gl/bank_account_reconcile.php:234 gl/inquiry/bank_inquiry.php:72
 #: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
-#: gl/inquiry/gl_trial_balance.php:190 gl/inquiry/gl_trial_balance.php:192
-#: gl/inquiry/gl_trial_balance.php:194 gl/view/accrual_trans.php:60
+#: gl/inquiry/gl_trial_balance.php:221 gl/inquiry/gl_trial_balance.php:223
+#: gl/inquiry/gl_trial_balance.php:225 gl/view/accrual_trans.php:60
 #: gl/view/gl_trans_view.php:96 gl/view/gl_trans_view.php:99
 #: gl/view/gl_trans_view.php:102 gl/includes/ui/gl_journal_ui.inc:103
 #: gl/includes/ui/gl_journal_ui.inc:106 gl/includes/ui/gl_journal_ui.inc:109
@@ -3437,8 +3445,8 @@ msgstr ""
 #: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:112
 #: gl/bank_account_reconcile.php:235 gl/inquiry/bank_inquiry.php:72
 #: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
-#: gl/inquiry/gl_trial_balance.php:191 gl/inquiry/gl_trial_balance.php:193
-#: gl/inquiry/gl_trial_balance.php:195 gl/view/accrual_trans.php:60
+#: gl/inquiry/gl_trial_balance.php:222 gl/inquiry/gl_trial_balance.php:224
+#: gl/inquiry/gl_trial_balance.php:226 gl/view/accrual_trans.php:60
 #: gl/view/gl_trans_view.php:96 gl/view/gl_trans_view.php:99
 #: gl/view/gl_trans_view.php:102 gl/includes/ui/gl_journal_ui.inc:103
 #: gl/includes/ui/gl_journal_ui.inc:106 gl/includes/ui/gl_journal_ui.inc:109
@@ -3453,14 +3461,18 @@ msgstr ""
 
 #: dimensions/includes/dimensions_ui.inc:45
 #: dimensions/inquiry/search_dimensions.php:131 gl/inquiry/bank_inquiry.php:72
-#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_trial_balance.php:188
+#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_trial_balance.php:219
 #: includes/dashboard.inc:606
 #: purchasing/inquiry/supplier_allocation_inquiry.php:147
-#: reporting/rep101.php:136 reporting/rep201.php:111 reporting/rep203.php:89
-#: reporting/rep204.php:84 reporting/rep307.php:114 reporting/rep601.php:80
-#: reporting/rep602.php:81 reporting/rep701.php:110 reporting/rep704.php:83
-#: reporting/rep704.php:86 reporting/rep704.php:89 reporting/rep708.php:185
+#: purchasing/inquiry/supplier_inquiry.php:182
+#: purchasing/inquiry/supplier_inquiry.php:195 reporting/rep101.php:136
+#: reporting/rep201.php:111 reporting/rep203.php:89 reporting/rep204.php:84
+#: reporting/rep307.php:114 reporting/rep601.php:80 reporting/rep602.php:81
+#: reporting/rep701.php:110 reporting/rep704.php:83 reporting/rep704.php:86
+#: reporting/rep704.php:89 reporting/rep708.php:185
 #: sales/inquiry/customer_allocation_inquiry.php:157
+#: sales/inquiry/customer_inquiry.php:203
+#: sales/inquiry/customer_inquiry.php:216
 msgid "Balance"
 msgstr ""
 
@@ -3491,7 +3503,7 @@ msgid "Reference:"
 msgstr ""
 
 #: dimensions/inquiry/search_dimensions.php:74
-#: includes/ui/allocation_cart.inc:314 includes/ui/ui_lists.inc:2100
+#: includes/ui/allocation_cart.inc:314 includes/ui/ui_lists.inc:2115
 #: reporting/rep101.php:114 reporting/rep102.php:92 reporting/rep104.php:95
 #: reporting/rep104.php:99 reporting/rep105.php:95 reporting/rep105.php:99
 #: reporting/rep201.php:89 reporting/rep202.php:98 reporting/rep203.php:69
@@ -3508,21 +3520,21 @@ msgid "All"
 msgstr ""
 
 #: dimensions/inquiry/search_dimensions.php:75 gl/inquiry/bank_inquiry.php:50
-#: gl/inquiry/gl_trial_balance.php:54 gl/inquiry/journal_inquiry.php:48
+#: gl/inquiry/gl_trial_balance.php:55 gl/inquiry/journal_inquiry.php:48
 #: gl/inquiry/profit_loss.php:175 gl/includes/ui/gl_bank_ui.inc:52
 #: gl/includes/ui/gl_bank_ui.inc:114 inventory/inquiry/stock_movements.php:85
 #: purchasing/inquiry/supplier_allocation_inquiry.php:50
-#: purchasing/inquiry/supplier_inquiry.php:51
-#: sales/inquiry/customer_inquiry.php:46
+#: purchasing/inquiry/supplier_inquiry.php:143
+#: sales/inquiry/customer_inquiry.php:160
 msgid "From:"
 msgstr ""
 
 #: dimensions/inquiry/search_dimensions.php:76 gl/inquiry/bank_inquiry.php:51
-#: gl/inquiry/gl_trial_balance.php:55 gl/inquiry/journal_inquiry.php:49
+#: gl/inquiry/gl_trial_balance.php:56 gl/inquiry/journal_inquiry.php:49
 #: gl/inquiry/profit_loss.php:176 inventory/inquiry/stock_movements.php:86
 #: purchasing/inquiry/supplier_allocation_inquiry.php:51
-#: purchasing/inquiry/supplier_inquiry.php:52
-#: sales/inquiry/customer_inquiry.php:47
+#: purchasing/inquiry/supplier_inquiry.php:144
+#: sales/inquiry/customer_inquiry.php:161
 msgid "To:"
 msgstr ""
 
@@ -3543,7 +3555,7 @@ msgstr ""
 #: purchasing/view/view_supp_credit.php:48
 #: purchasing/view/view_supp_invoice.php:52
 #: purchasing/inquiry/supplier_allocation_inquiry.php:142
-#: purchasing/inquiry/supplier_inquiry.php:176 reporting/rep101.php:132
+#: purchasing/inquiry/supplier_inquiry.php:179 reporting/rep101.php:132
 #: reporting/rep201.php:107 reporting/rep203.php:88 reporting/rep501.php:87
 #: reporting/includes/doctext.inc:111 reporting/includes/doctext.inc:143
 #: reporting/includes/doctext.inc:164 reporting/includes/doctext.inc:166
@@ -3551,7 +3563,7 @@ msgstr ""
 #: sales/customer_invoice.php:492 sales/view/view_dispatch.php:97
 #: sales/view/view_invoice.php:96
 #: sales/inquiry/customer_allocation_inquiry.php:151
-#: sales/inquiry/customer_inquiry.php:197
+#: sales/inquiry/customer_inquiry.php:198
 #: sales/includes/ui/sales_order_ui.inc:588
 msgid "Due Date"
 msgstr ""
@@ -3625,8 +3637,8 @@ msgstr ""
 #: gl/gl_budget.php:75 gl/inquiry/balance_sheet.php:127
 #: gl/inquiry/balance_sheet.php:129 gl/inquiry/gl_account_inquiry.php:79
 #: gl/inquiry/gl_account_inquiry.php:81 gl/inquiry/gl_account_inquiry.php:134
-#: gl/inquiry/gl_account_inquiry.php:136 gl/inquiry/gl_trial_balance.php:57
-#: gl/inquiry/gl_trial_balance.php:59 gl/inquiry/profit_loss.php:184
+#: gl/inquiry/gl_account_inquiry.php:136 gl/inquiry/gl_trial_balance.php:58
+#: gl/inquiry/gl_trial_balance.php:60 gl/inquiry/profit_loss.php:184
 #: gl/inquiry/profit_loss.php:186 gl/manage/gl_quick_entries.php:268
 #: gl/manage/gl_quick_entries.php:270 gl/manage/gl_quick_entries.php:353
 #: gl/manage/gl_quick_entries.php:355 gl/view/accrual_trans.php:54
@@ -3743,19 +3755,19 @@ msgstr ""
 #: includes/dashboard.inc:189 includes/dashboard.inc:226
 #: includes/dashboard.inc:294 includes/dashboard.inc:336
 #: includes/dashboard.inc:448 includes/sysnames.inc:138
-#: includes/ui/allocation_cart.inc:290 includes/ui/ui_lists.inc:1349
+#: includes/ui/allocation_cart.inc:290 includes/ui/ui_lists.inc:1364
 #: manufacturing/includes/manufacturing_ui.inc:253
 #: purchasing/includes/ui/invoice_ui.inc:278
 #: purchasing/includes/ui/invoice_ui.inc:280
 #: purchasing/includes/ui/invoice_ui.inc:282
 #: purchasing/view/view_supp_payment.php:60
 #: purchasing/view/view_supp_payment.php:72
-#: purchasing/inquiry/supplier_inquiry.php:178 reporting/rep102.php:242
+#: purchasing/inquiry/supplier_inquiry.php:181 reporting/rep102.php:242
 #: reporting/rep107.php:205 reporting/rep107.php:270 reporting/rep109.php:197
 #: reporting/rep110.php:194 reporting/rep111.php:194 reporting/rep113.php:183
 #: reporting/rep202.php:250 reporting/rep209.php:199 reporting/rep706.php:308
-#: reporting/rep707.php:326 reporting/rep710.php:78
-#: sales/view/view_receipt.php:44 sales/inquiry/customer_inquiry.php:201
+#: reporting/rep707.php:328 reporting/rep710.php:78
+#: sales/view/view_receipt.php:44 sales/inquiry/customer_inquiry.php:202
 msgid "Amount"
 msgstr ""
 
@@ -4148,12 +4160,12 @@ msgstr ""
 
 #: gl/gl_budget.php:126 gl/inquiry/balance_sheet.php:98
 #: gl/inquiry/balance_sheet.php:202 gl/inquiry/balance_sheet.php:233
-#: gl/inquiry/gl_trial_balance.php:220 gl/inquiry/profit_loss.php:120
-#: gl/inquiry/profit_loss.php:287 gl/view/gl_deposit_view.php:137
-#: gl/view/gl_payment_view.php:136 gl/view/gl_trans_view.php:144
-#: gl/includes/ui/gl_bank_ui.inc:195 gl/includes/ui/gl_journal_ui.inc:169
-#: includes/dashboard.inc:487 includes/dashboard.inc:571
-#: inventory/includes/item_adjustments_ui.inc:60
+#: gl/inquiry/gl_trial_balance.php:174 gl/inquiry/gl_trial_balance.php:251
+#: gl/inquiry/profit_loss.php:120 gl/inquiry/profit_loss.php:287
+#: gl/view/gl_deposit_view.php:137 gl/view/gl_payment_view.php:136
+#: gl/view/gl_trans_view.php:144 gl/includes/ui/gl_bank_ui.inc:195
+#: gl/includes/ui/gl_journal_ui.inc:169 includes/dashboard.inc:487
+#: includes/dashboard.inc:571 inventory/includes/item_adjustments_ui.inc:60
 #: inventory/includes/item_adjustments_ui.inc:114
 #: manufacturing/includes/manufacturing_ui.inc:195
 #: purchasing/includes/ui/invoice_ui.inc:341
@@ -4161,7 +4173,7 @@ msgstr ""
 #: purchasing/includes/ui/invoice_ui.inc:575
 #: purchasing/po_receive_items.php:63 purchasing/view/view_po.php:140
 #: purchasing/allocations/supplier_allocation_main.php:100
-#: reporting/rep101.php:249 reporting/rep106.php:90 reporting/rep106.php:125
+#: reporting/rep101.php:255 reporting/rep106.php:90 reporting/rep106.php:125
 #: reporting/rep106.php:172 reporting/rep114.php:161 reporting/rep201.php:222
 #: reporting/rep203.php:89 reporting/rep203.php:166 reporting/rep204.php:113
 #: reporting/rep204.php:141 reporting/rep301.php:192 reporting/rep301.php:240
@@ -4173,11 +4185,11 @@ msgstr ""
 #: reporting/rep451.php:120 reporting/rep451.php:155 reporting/rep702.php:142
 #: reporting/rep705.php:152 reporting/rep705.php:312 reporting/rep706.php:106
 #: reporting/rep706.php:255 reporting/rep706.php:290 reporting/rep707.php:115
-#: reporting/rep707.php:297 reporting/rep708.php:253
+#: reporting/rep707.php:299 reporting/rep708.php:253
 #: reporting/includes/doctext.inc:32 reporting/includes/doctext.inc:191
 #: sales/customer_credit_invoice.php:276 sales/customer_delivery.php:421
 #: sales/customer_invoice.php:519 sales/customer_invoice.php:522
-#: sales/allocations/customer_allocation_main.php:93
+#: sales/allocations/customer_allocation_main.php:98
 #: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113
 #: sales/view/view_invoice.php:116 sales/view/view_sales_order.php:109
 #: sales/view/view_sales_order.php:142 sales/view/view_sales_order.php:179
@@ -4302,37 +4314,33 @@ msgstr ""
 msgid "Rows"
 msgstr ""
 
-#: gl/gl_journal.php:539
+#: gl/gl_journal.php:540
 msgid "Tax register record"
 msgstr ""
 
-#: gl/gl_journal.php:541
+#: gl/gl_journal.php:543
 msgid "VAT date:"
 msgstr ""
 
-#: gl/gl_journal.php:542
-msgid "Tax group:"
-msgstr ""
-
-#: gl/gl_journal.php:546 gl/inquiry/tax_inquiry.php:102
+#: gl/gl_journal.php:548 gl/inquiry/tax_inquiry.php:102
 #: reporting/rep709.php:189
 msgid "Input Tax"
 msgstr ""
 
-#: gl/gl_journal.php:546 gl/inquiry/tax_inquiry.php:96
+#: gl/gl_journal.php:548 gl/inquiry/tax_inquiry.php:96
 #: reporting/rep709.php:189
 msgid "Output Tax"
 msgstr ""
 
-#: gl/gl_journal.php:546
+#: gl/gl_journal.php:548
 msgid "Net amount"
 msgstr ""
 
-#: gl/gl_journal.php:561
+#: gl/gl_journal.php:563
 msgid "Process Journal Entry"
 msgstr ""
 
-#: gl/gl_journal.php:562
+#: gl/gl_journal.php:564
 msgid "Process journal entry only if debits equal to credits"
 msgstr ""
 
@@ -4341,7 +4349,7 @@ msgstr ""
 msgid "GL Accounts"
 msgstr ""
 
-#: gl/inquiry/accounts_list.php:40 includes/ui/ui_lists.inc:346
+#: gl/inquiry/accounts_list.php:40 includes/ui/ui_lists.inc:349
 msgid "Search GL accounts"
 msgstr ""
 
@@ -4377,8 +4385,8 @@ msgstr ""
 
 #: gl/inquiry/balance_sheet.php:225 gl/inquiry/profit_loss.php:298
 #: includes/dashboard.inc:394 reporting/rep705.php:322
-#: reporting/rep706.php:278 reporting/rep706.php:303 reporting/rep707.php:309
-#: reporting/rep707.php:315
+#: reporting/rep706.php:278 reporting/rep706.php:303 reporting/rep707.php:311
+#: reporting/rep707.php:317
 msgid "Calculated Return"
 msgstr ""
 
@@ -4405,7 +4413,7 @@ msgid "Opening Balance"
 msgstr ""
 
 #: gl/inquiry/bank_inquiry.php:130 gl/inquiry/gl_account_inquiry.php:213
-#: gl/inquiry/gl_trial_balance.php:230 reporting/rep601.php:157
+#: gl/inquiry/gl_trial_balance.php:261 reporting/rep601.php:157
 #: reporting/rep602.php:157 reporting/rep704.php:191 reporting/rep708.php:262
 msgid "Ending Balance"
 msgstr ""
@@ -4435,28 +4443,28 @@ msgstr ""
 msgid "Trial Balance"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:60
+#: gl/inquiry/gl_trial_balance.php:61
 msgid "No zero values"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:61 reporting/reports_main.php:406
+#: gl/inquiry/gl_trial_balance.php:62 reporting/reports_main.php:406
 #: reporting/reports_main.php:456 reporting/reports_main.php:501
 msgid "Only balances"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:93 gl/inquiry/gl_trial_balance.php:154
+#: gl/inquiry/gl_trial_balance.php:104 gl/inquiry/gl_trial_balance.php:165
 #: includes/dashboard.inc:526 reporting/rep706.php:307
-#: reporting/rep707.php:325 reporting/rep708.php:51 reporting/rep708.php:126
+#: reporting/rep707.php:327 reporting/rep708.php:51 reporting/rep708.php:126
 #: sales/create_recurrent_invoices.php:203
 #: sales/manage/recurrent_invoices.php:128
 msgid "Group"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:172
+#: gl/inquiry/gl_trial_balance.php:203
 msgid "The from date cannot be bigger than the fiscal year end."
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:185 gl/manage/bank_accounts.php:109
+#: gl/inquiry/gl_trial_balance.php:216 gl/manage/bank_accounts.php:109
 #: gl/view/gl_trans_view.php:95 gl/view/gl_trans_view.php:98
 #: gl/view/gl_trans_view.php:101 manufacturing/view/wo_costs_view.php:60
 #: reporting/rep701.php:110 reporting/rep702.php:53 reporting/rep705.php:235
@@ -4464,21 +4472,21 @@ msgstr ""
 msgid "Account Name"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:186 reporting/rep708.php:185
+#: gl/inquiry/gl_trial_balance.php:217 reporting/rep708.php:185
 msgid "Brought Forward"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:187 reporting/rep708.php:185
+#: gl/inquiry/gl_trial_balance.php:218 reporting/rep708.php:185
 msgid "This Period"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:206 gl/manage/gl_account_types.php:127
+#: gl/inquiry/gl_trial_balance.php:237 gl/manage/gl_account_types.php:127
 #: includes/dashboard.inc:147 includes/dashboard.inc:170
 #: reporting/rep451.php:80 reporting/rep451.php:86
 msgid "Class"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:238 reporting/rep708.php:283
+#: gl/inquiry/gl_trial_balance.php:269 reporting/rep708.php:283
 msgid ""
 "The Opening Balance is not in balance, probably due to a non closed Previous "
 "Fiscalyear."
@@ -4524,7 +4532,7 @@ msgstr ""
 #: purchasing/view/view_supp_invoice.php:48
 #: purchasing/inquiry/po_search_completed.php:114
 #: purchasing/inquiry/po_search.php:121
-#: purchasing/inquiry/supplier_inquiry.php:174
+#: purchasing/inquiry/supplier_inquiry.php:177
 #: reporting/includes/doctext.inc:163 reporting/includes/doctext.inc:186
 msgid "Supplier's Reference"
 msgstr ""
@@ -4543,7 +4551,7 @@ msgstr ""
 msgid "Accumulated"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:31 reporting/rep707.php:255
+#: gl/inquiry/profit_loss.php:31 reporting/rep707.php:257
 #: reporting/includes/reports_classes.inc:249
 msgid "Period Y-1"
 msgstr ""
@@ -4644,9 +4652,9 @@ msgstr ""
 #: purchasing/inquiry/po_search.php:123
 #: purchasing/inquiry/supplier_allocation_inquiry.php:143
 #: purchasing/inquiry/supplier_allocation_inquiry.php:153
-#: purchasing/inquiry/supplier_inquiry.php:74
-#: purchasing/inquiry/supplier_inquiry.php:177
-#: purchasing/inquiry/supplier_inquiry.php:188
+#: purchasing/inquiry/supplier_inquiry.php:50
+#: purchasing/inquiry/supplier_inquiry.php:180
+#: purchasing/inquiry/supplier_inquiry.php:192
 #: purchasing/allocations/supplier_allocation_main.php:99
 #: purchasing/allocations/supplier_allocation_main.php:107
 #: reporting/rep101.php:142 reporting/rep102.php:129 reporting/rep102.php:135
@@ -4654,15 +4662,15 @@ msgstr ""
 #: reporting/rep202.php:136 reporting/rep203.php:96 reporting/rep205.php:141
 #: sales/customer_credit_invoice.php:236 sales/customer_delivery.php:328
 #: sales/customer_invoice.php:455
-#: sales/allocations/customer_allocation_main.php:92
-#: sales/allocations/customer_allocation_main.php:100
+#: sales/allocations/customer_allocation_main.php:97
+#: sales/allocations/customer_allocation_main.php:105
 #: sales/view/view_credit.php:70 sales/view/view_dispatch.php:86
 #: sales/view/view_invoice.php:86
 #: sales/inquiry/customer_allocation_inquiry.php:153
 #: sales/inquiry/customer_allocation_inquiry.php:163
-#: sales/inquiry/customer_inquiry.php:76
-#: sales/inquiry/customer_inquiry.php:200
-#: sales/inquiry/customer_inquiry.php:212
+#: sales/inquiry/customer_inquiry.php:121
+#: sales/inquiry/customer_inquiry.php:201
+#: sales/inquiry/customer_inquiry.php:213
 #: sales/inquiry/sales_deliveries_view.php:178
 #: sales/inquiry/sales_orders_view.php:262
 #: sales/inquiry/sales_orders_view.php:276
@@ -5479,7 +5487,7 @@ msgstr ""
 #: manufacturing/work_order_add_finished.php:186
 #: manufacturing/work_order_costs.php:133
 #: purchasing/allocations/supplier_allocate.php:56
-#: sales/allocations/customer_allocate.php:54
+#: sales/allocations/customer_allocate.php:59
 #: sales/includes/ui/sales_credit_ui.inc:117
 msgid "Date:"
 msgstr ""
@@ -6289,13 +6297,13 @@ msgstr ""
 #: sales/create_recurrent_invoices.php:203
 #: sales/customer_credit_invoice.php:234 sales/customer_delivery.php:326
 #: sales/customer_invoice.php:431
-#: sales/allocations/customer_allocation_main.php:91
-#: sales/allocations/customer_allocation_main.php:99
+#: sales/allocations/customer_allocation_main.php:96
+#: sales/allocations/customer_allocation_main.php:104
 #: sales/manage/recurrent_invoices.php:128 sales/view/view_credit.php:47
 #: sales/inquiry/customer_allocation_inquiry.php:152
 #: sales/inquiry/customer_allocation_inquiry.php:162
-#: sales/inquiry/customer_inquiry.php:198
-#: sales/inquiry/customer_inquiry.php:211 sales/inquiry/customers_list.php:41
+#: sales/inquiry/customer_inquiry.php:199
+#: sales/inquiry/customer_inquiry.php:212 sales/inquiry/customers_list.php:41
 #: sales/inquiry/customers_list.php:54
 #: sales/inquiry/sales_deliveries_view.php:169
 #: sales/inquiry/sales_orders_view.php:254
@@ -6323,8 +6331,8 @@ msgstr ""
 #: purchasing/inquiry/po_search.php:119
 #: purchasing/inquiry/supplier_allocation_inquiry.php:139
 #: purchasing/inquiry/supplier_allocation_inquiry.php:152
-#: purchasing/inquiry/supplier_inquiry.php:173
-#: purchasing/inquiry/supplier_inquiry.php:187
+#: purchasing/inquiry/supplier_inquiry.php:176
+#: purchasing/inquiry/supplier_inquiry.php:191
 #: purchasing/inquiry/suppliers_list.php:41
 #: purchasing/inquiry/suppliers_list.php:53
 #: purchasing/allocations/supplier_allocation_main.php:98
@@ -6453,7 +6461,7 @@ msgstr ""
 #: sales/manage/customers.php:295 sales/manage/recurrent_invoices.php:128
 #: sales/view/view_credit.php:58 sales/inquiry/customer_branches_list.php:37
 #: sales/inquiry/customer_branches_list.php:49
-#: sales/inquiry/customer_inquiry.php:199
+#: sales/inquiry/customer_inquiry.php:200
 #: sales/inquiry/sales_deliveries_view.php:171
 #: sales/inquiry/sales_orders_view.php:255
 #: sales/inquiry/sales_orders_view.php:269
@@ -6466,17 +6474,18 @@ msgid "Remainder"
 msgstr ""
 
 #: includes/dashboard.inc:487 includes/dashboard.inc:572
-#: purchasing/inquiry/supplier_inquiry.php:68
-#: purchasing/inquiry/supplier_inquiry.php:69
-#: purchasing/inquiry/supplier_inquiry.php:70 reporting/rep102.php:116
+#: purchasing/inquiry/supplier_inquiry.php:44
+#: purchasing/inquiry/supplier_inquiry.php:45
+#: purchasing/inquiry/supplier_inquiry.php:46 reporting/rep102.php:116
 #: reporting/rep102.php:117 reporting/rep102.php:118 reporting/rep102.php:241
-#: reporting/rep108.php:150 reporting/rep108.php:151 reporting/rep108.php:152
+#: reporting/rep108.php:151 reporting/rep108.php:152 reporting/rep108.php:153
 #: reporting/rep202.php:122 reporting/rep202.php:123 reporting/rep202.php:124
 #: reporting/rep202.php:156 reporting/rep202.php:157 reporting/rep202.php:158
 #: reporting/rep202.php:249 sales/create_recurrent_invoices.php:203
 #: sales/manage/recurrent_invoices.php:128
-#: sales/inquiry/customer_inquiry.php:71 sales/inquiry/customer_inquiry.php:72
-#: sales/inquiry/customer_inquiry.php:73
+#: sales/inquiry/customer_inquiry.php:116
+#: sales/inquiry/customer_inquiry.php:117
+#: sales/inquiry/customer_inquiry.php:118
 msgid "Days"
 msgstr ""
 
@@ -6555,39 +6564,45 @@ msgstr ""
 msgid "Cannot download repo index file."
 msgstr ""
 
-#: includes/packages.inc:306 includes/packages.inc:343
+#: includes/packages.inc:303 includes/system_tests.inc:398
+msgid ""
+"OpenSSL have to be available on your server to use extension repository "
+"system."
+msgstr ""
+
+#: includes/packages.inc:310 includes/packages.inc:347
 #, php-format
 msgid "Cannot delete outdated '%s' file."
 msgstr ""
 
-#: includes/packages.inc:310
+#: includes/packages.inc:314
 msgid "Release file in repository is invalid, or public key is outdated."
 msgstr ""
 
-#: includes/packages.inc:327
+#: includes/packages.inc:331
 msgid "Repository version does not match application version."
 msgstr ""
 
-#: includes/packages.inc:335 includes/packages.inc:377
+#: includes/packages.inc:339 includes/packages.inc:381
 #, php-format
 msgid "Cannot download '%s' file."
 msgstr ""
 
-#: includes/packages.inc:347
+#: includes/packages.inc:351
 #, php-format
 msgid ""
 "Security alert: broken index file in repository '%s'. Please inform "
 "repository administrator about this issue."
 msgstr ""
 
-#: includes/packages.inc:383
+#: includes/packages.inc:387
 #, php-format
 msgid ""
 "Security alert: broken package '%s' in repository. Please inform repository "
 "administrator about this issue."
 msgstr ""
 
-#: includes/packages.inc:641 includes/packages.inc:696
+#: includes/packages.inc:645 includes/packages.inc:700
 #, php-format
 msgid "Package '%s' not found."
 msgstr ""
@@ -6764,7 +6779,7 @@ msgstr ""
 msgid "Sales Order"
 msgstr ""
 
-#: includes/sysnames.inc:41 sales/sales_order_entry.php:656
+#: includes/sysnames.inc:41 sales/sales_order_entry.php:655
 msgid "Sales Quotation"
 msgstr ""
 
@@ -7375,12 +7390,6 @@ msgid ""
 "OpenSSL PHP extension have to be enabled to use extension repository system."
 msgstr ""
 
-#: includes/system_tests.inc:398
-msgid ""
-"OpenSSL have to be available on your server to use extension repository "
-"system."
-msgstr ""
-
 #: includes/system_tests.inc:421
 msgid "Test"
 msgstr ""
@@ -7424,7 +7433,7 @@ msgstr ""
 #: reporting/reports_main.php:502 reporting/reports_main.php:510
 #: reporting/reports_main.php:518 reporting/includes/excel_report.inc:292
 #: reporting/includes/excel_report.inc:425
-#: reporting/includes/pdf_report.inc:347 reporting/includes/pdf_report.inc:608
+#: reporting/includes/pdf_report.inc:358 reporting/includes/pdf_report.inc:619
 #: sales/view/view_sales_order.php:98
 msgid "Comments"
 msgstr ""
@@ -7568,7 +7577,7 @@ msgstr ""
 
 #: includes/ui/allocation_cart.inc:290
 #: purchasing/allocations/supplier_allocation_main.php:94
-#: sales/allocations/customer_allocation_main.php:87
+#: sales/allocations/customer_allocation_main.php:92
 msgid "Transaction Type"
 msgstr ""
 
@@ -7596,7 +7605,7 @@ msgstr ""
 #: purchasing/allocations/supplier_allocation_main.php:101
 #: reporting/rep112.php:150 reporting/rep210.php:157
 #: reporting/includes/doctext.inc:166 reporting/includes/doctext.inc:207
-#: sales/allocations/customer_allocation_main.php:94
+#: sales/allocations/customer_allocation_main.php:99
 msgid "Left to Allocate"
 msgstr ""
 
@@ -7727,7 +7736,7 @@ msgstr ""
 msgid "You have to select at least one category."
 msgstr ""
 
-#: includes/ui/db_pager_view.inc:172 includes/ui/ui_input.inc:959
+#: includes/ui/db_pager_view.inc:172 includes/ui/ui_input.inc:957
 msgid "Show also Inactive"
 msgstr ""
 
@@ -7816,11 +7825,11 @@ msgid ""
 "Do you want to abandon changes?"
 msgstr ""
 
-#: includes/ui/ui_input.inc:656 reporting/includes/reports_classes.inc:223
+#: includes/ui/ui_input.inc:654 reporting/includes/reports_classes.inc:223
 msgid "Click Here to Pick up the date"
 msgstr ""
 
-#: includes/ui/ui_input.inc:971 includes/ui/ui_lists.inc:2330
+#: includes/ui/ui_input.inc:969 includes/ui/ui_lists.inc:2345
 #: reporting/rep301.php:224 reporting/rep302.php:168 reporting/rep303.php:178
 #: reporting/rep304.php:184 reporting/rep304.php:188 reporting/rep306.php:235
 #: reporting/rep306.php:242 reporting/rep451.php:143
@@ -7828,11 +7837,11 @@ msgstr ""
 msgid "Inactive"
 msgstr ""
 
-#: includes/ui/ui_input.inc:981 includes/ui/ui_input.inc:993
+#: includes/ui/ui_input.inc:979 includes/ui/ui_input.inc:991
 msgid "Current Credit:"
 msgstr ""
 
-#: includes/ui/ui_input.inc:1007
+#: includes/ui/ui_input.inc:1005
 msgid "Bank Balance:"
 msgstr ""
 
@@ -7852,176 +7861,179 @@ msgstr ""
 msgid "Enter description fragment to search or * for all"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:305 includes/ui/ui_lists.inc:309
-#: includes/ui/ui_lists.inc:313 includes/ui/ui_lists.inc:317
-#: includes/ui/ui_lists.inc:321 includes/ui/ui_lists.inc:326
-#: includes/ui/ui_lists.inc:330 inventory/inquiry/stock_list.php:42
+#: includes/ui/ui_lists.inc:308 includes/ui/ui_lists.inc:312
+#: includes/ui/ui_lists.inc:316 includes/ui/ui_lists.inc:320
+#: includes/ui/ui_lists.inc:324 includes/ui/ui_lists.inc:329
+#: includes/ui/ui_lists.inc:333 inventory/inquiry/stock_list.php:42
 msgid "Search items"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:334 sales/inquiry/customers_list.php:42
+#: includes/ui/ui_lists.inc:337 sales/inquiry/customers_list.php:42
 msgid "Search customers"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:338 sales/inquiry/customer_branches_list.php:38
+#: includes/ui/ui_lists.inc:341 sales/inquiry/customer_branches_list.php:38
 msgid "Search branches"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:342 purchasing/inquiry/suppliers_list.php:42
+#: includes/ui/ui_lists.inc:345 purchasing/inquiry/suppliers_list.php:42
 msgid "Search suppliers"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:526 includes/ui/ui_lists.inc:1528
+#: includes/ui/ui_lists.inc:538 includes/ui/ui_lists.inc:1543
 msgid "All Suppliers"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:530
+#: includes/ui/ui_lists.inc:542
 msgid "Press Space tab to filter by name fragment"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:531
+#: includes/ui/ui_lists.inc:543
 msgid "Select supplier"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:577
+#: includes/ui/ui_lists.inc:592
 msgid "All Customers"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:581
+#: includes/ui/ui_lists.inc:596
 msgid "Press Space tab to filter by name fragment; F2 - entry new customer"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:582
+#: includes/ui/ui_lists.inc:597
 msgid "Select customer"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:627
+#: includes/ui/ui_lists.inc:642
 msgid "All branches"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:630
+#: includes/ui/ui_lists.inc:645
 msgid "Select customer branch"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:666
+#: includes/ui/ui_lists.inc:681
 msgid "All Locations"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:823 includes/ui/ui_lists.inc:907
+#: includes/ui/ui_lists.inc:838 includes/ui/ui_lists.inc:922
 msgid "All Items"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1460
+#: includes/ui/ui_lists.inc:1475
 msgid "All Sales Types"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1807
+#: includes/ui/ui_lists.inc:1822
 msgid "Use Item Sales Accounts"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2116 includes/ui/ui_lists.inc:2132
-#: includes/ui/ui_lists.inc:2148
+#: includes/ui/ui_lists.inc:2131 includes/ui/ui_lists.inc:2147
+#: includes/ui/ui_lists.inc:2163
 msgid "All Types"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2117 sales/view/view_sales_order.php:140
+#: includes/ui/ui_lists.inc:2132 sales/view/view_sales_order.php:140
 msgid "Sales Invoices"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2118 includes/ui/ui_lists.inc:2134
-#: includes/ui/ui_lists.inc:2151
-msgid "Overdue Invoices"
+#: includes/ui/ui_lists.inc:2133 includes/ui/ui_lists.inc:2166
+msgid "Unsettled transactions"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2119 includes/ui/ui_lists.inc:2135
-#: includes/ui/ui_lists.inc:2152 includes/ui/ui_view.inc:609
+#: includes/ui/ui_lists.inc:2134 includes/ui/ui_lists.inc:2150
+#: includes/ui/ui_lists.inc:2167 includes/ui/ui_view.inc:609
 #: includes/ui/ui_view.inc:613
 msgid "Payments"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2120 includes/ui/ui_lists.inc:2136
-#: includes/ui/ui_lists.inc:2153 sales/view/view_sales_order.php:176
+#: includes/ui/ui_lists.inc:2135 includes/ui/ui_lists.inc:2151
+#: includes/ui/ui_lists.inc:2168 sales/view/view_sales_order.php:176
 msgid "Credit Notes"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2121 sales/view/view_sales_order.php:106
+#: includes/ui/ui_lists.inc:2136 sales/view/view_sales_order.php:106
 msgid "Delivery Notes"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2133 includes/ui/ui_lists.inc:2150
+#: includes/ui/ui_lists.inc:2148 includes/ui/ui_lists.inc:2165
 msgid "Invoices"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2137 includes/ui/ui_lists.inc:2154
+#: includes/ui/ui_lists.inc:2149
+msgid "Overdue Invoices"
+msgstr ""
+
+#: includes/ui/ui_lists.inc:2152 includes/ui/ui_lists.inc:2169
 msgid "Overdue Credit Notes"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2149
+#: includes/ui/ui_lists.inc:2164
 msgid "GRNs"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2167
+#: includes/ui/ui_lists.inc:2182
 msgid "Automatically put balance on back order"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2168
+#: includes/ui/ui_lists.inc:2183
 msgid "Cancel any quantites not delivered"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2185
+#: includes/ui/ui_lists.inc:2200
 msgid "Items Returned to Inventory Location"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2186
+#: includes/ui/ui_lists.inc:2201
 msgid "Items Written Off"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2355
+#: includes/ui/ui_lists.inc:2370
 msgid "New role"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2407
+#: includes/ui/ui_lists.inc:2422
 msgid "No tags defined."
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2407
+#: includes/ui/ui_lists.inc:2422
 msgid "No active tags defined."
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2445
+#: includes/ui/ui_lists.inc:2460
 #, php-format
 msgid "Activated for '%s'"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2448
+#: includes/ui/ui_lists.inc:2463
 msgid "Available and/or installed"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2518
+#: includes/ui/ui_lists.inc:2533
 msgid "Standard new company American COA (4 digit)"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2520
+#: includes/ui/ui_lists.inc:2535
 msgid "Standard American COA (4 digit) with demo data"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2541
+#: includes/ui/ui_lists.inc:2556
 msgid "No payment Link"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2661
+#: includes/ui/ui_lists.inc:2676
 msgid "Numeric"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2661
+#: includes/ui/ui_lists.inc:2676
 msgid "Alpha Numeric"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2661
+#: includes/ui/ui_lists.inc:2676
 msgid "ALPHA NUMERIC"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2677
+#: includes/ui/ui_lists.inc:2692
 msgid "All users"
 msgstr ""
 
@@ -8223,7 +8235,7 @@ msgid "The entered standard cost is negative or invalid."
 msgstr ""
 
 #: inventory/adjustments.php:228 inventory/cost_update.php:42
-#: inventory/transfers.php:216 sales/sales_order_entry.php:702
+#: inventory/transfers.php:216 sales/sales_order_entry.php:701
 msgid "There are no fixed assets defined in the system."
 msgstr ""
 
@@ -8714,9 +8726,9 @@ msgstr ""
 #: inventory/inquiry/stock_movements.php:88
 #: purchasing/includes/ui/invoice_ui.inc:483
 #: purchasing/inquiry/supplier_allocation_inquiry.php:57
-#: purchasing/inquiry/supplier_inquiry.php:56
+#: purchasing/inquiry/supplier_inquiry.php:147
 #: sales/inquiry/customer_allocation_inquiry.php:51
-#: sales/inquiry/customer_inquiry.php:54
+#: sales/inquiry/customer_inquiry.php:164
 msgid "Refresh Inquiry"
 msgstr ""
 
@@ -8879,7 +8891,7 @@ msgstr ""
 msgid "Foreign Item Codes"
 msgstr ""
 
-#: inventory/manage/item_codes.php:26 sales/sales_order_entry.php:704
+#: inventory/manage/item_codes.php:26 sales/sales_order_entry.php:703
 msgid "There are no inventory items defined in the system."
 msgstr ""
 
@@ -9085,50 +9097,50 @@ msgstr ""
 msgid "Insert New Item"
 msgstr ""
 
-#: inventory/manage/items.php:539
+#: inventory/manage/items.php:540
 msgid "Update Item"
 msgstr ""
 
-#: inventory/manage/items.php:542
+#: inventory/manage/items.php:543
 msgid "Select this items and return to document entry."
 msgstr ""
 
-#: inventory/manage/items.php:543
+#: inventory/manage/items.php:544
 msgid "Clone This Item"
 msgstr ""
 
-#: inventory/manage/items.php:544
+#: inventory/manage/items.php:545
 msgid "Delete This Item"
 msgstr ""
 
-#: inventory/manage/items.php:559
+#: inventory/manage/items.php:560
 msgid "Select an item:"
 msgstr ""
 
-#: inventory/manage/items.php:560
+#: inventory/manage/items.php:561
 msgid "New item"
 msgstr ""
 
-#: inventory/manage/items.php:584 inventory/manage/items.php:587
+#: inventory/manage/items.php:585 inventory/manage/items.php:588
 #: purchasing/manage/suppliers.php:309 sales/manage/customer_branches.php:310
 #: sales/manage/customers.php:350
 msgid "&General settings"
 msgstr ""
 
-#: inventory/manage/items.php:585 inventory/manage/items.php:593
+#: inventory/manage/items.php:586 inventory/manage/items.php:594
 #: purchasing/manage/suppliers.php:311 sales/manage/customers.php:352
 msgid "&Transactions"
 msgstr ""
 
-#: inventory/manage/items.php:588
+#: inventory/manage/items.php:589
 msgid "S&ales Pricing"
 msgstr ""
 
-#: inventory/manage/items.php:589
+#: inventory/manage/items.php:590
 msgid "&Purchasing Pricing"
 msgstr ""
 
-#: inventory/manage/items.php:594
+#: inventory/manage/items.php:595
 msgid "&Status"
 msgstr ""
 
@@ -9503,7 +9515,7 @@ msgstr ""
 
 #: manufacturing/work_order_add_finished.php:200
 #: purchasing/allocations/supplier_allocate.php:75
-#: sales/allocations/customer_allocate.php:73
+#: sales/allocations/customer_allocate.php:78
 msgid "Process"
 msgstr ""
 
@@ -10098,7 +10110,7 @@ msgstr ""
 msgid "Issue to"
 msgstr ""
 
-#: manufacturing/includes/db/work_order_produce_items_db.inc:94
+#: manufacturing/includes/db/work_order_produce_items_db.inc:95
 msgid "Production."
 msgstr ""
 
@@ -10350,15 +10362,15 @@ msgstr ""
 msgid "Credits can only be applied to invoiced items."
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:135 sales/sales_order_entry.php:728
+#: purchasing/includes/ui/po_ui.inc:135 sales/sales_order_entry.php:727
 msgid "Order Date:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:136 sales/sales_order_entry.php:715
+#: purchasing/includes/ui/po_ui.inc:136 sales/sales_order_entry.php:714
 msgid "Delivery Date:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:136 sales/sales_order_entry.php:709
+#: purchasing/includes/ui/po_ui.inc:136 sales/sales_order_entry.php:708
 msgid "Invoice Date:"
 msgstr ""
 
@@ -10425,7 +10437,7 @@ msgstr ""
 
 #: purchasing/includes/ui/po_ui.inc:283
 #: purchasing/allocations/supplier_allocate.php:74
-#: sales/allocations/customer_allocate.php:72
+#: sales/allocations/customer_allocate.php:77
 #: sales/includes/ui/sales_order_ui.inc:231
 msgid "Refresh"
 msgstr ""
@@ -10577,7 +10589,7 @@ msgstr ""
 msgid "Enter a new purchase order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:228 sales/sales_order_entry.php:519
+#: purchasing/po_entry_items.php:228 sales/sales_order_entry.php:518
 msgid "Item description cannot be empty."
 msgstr ""
 
@@ -10653,7 +10665,7 @@ msgstr ""
 msgid "Required prepayment is greater than total invoice value."
 msgstr ""
 
-#: purchasing/po_entry_items.php:491 sales/sales_order_entry.php:732
+#: purchasing/po_entry_items.php:491 sales/sales_order_entry.php:731
 msgid "Place Order"
 msgstr ""
 
@@ -10661,7 +10673,7 @@ msgstr ""
 msgid "Update Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:493 sales/sales_order_entry.php:731
+#: purchasing/po_entry_items.php:493 sales/sales_order_entry.php:730
 msgid "Cancel Order"
 msgstr ""
 
@@ -10685,7 +10697,7 @@ msgstr ""
 msgid "Update Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:502 sales/sales_order_entry.php:712
+#: purchasing/po_entry_items.php:502 sales/sales_order_entry.php:711
 msgid "Cancel Invoice"
 msgstr ""
 
@@ -11036,9 +11048,9 @@ msgstr ""
 
 #: purchasing/view/view_po.php:100
 #: purchasing/inquiry/supplier_allocation_inquiry.php:158
-#: purchasing/inquiry/supplier_inquiry.php:193
+#: purchasing/inquiry/supplier_inquiry.php:199
 #: sales/inquiry/customer_allocation_inquiry.php:167
-#: sales/inquiry/customer_inquiry.php:218
+#: sales/inquiry/customer_inquiry.php:219
 #: sales/inquiry/sales_deliveries_view.php:195
 #: sales/inquiry/sales_orders_view.php:311
 msgid "Marked items are overdue."
@@ -11092,7 +11104,7 @@ msgstr ""
 msgid "TOTAL INVOICE"
 msgstr ""
 
-#: purchasing/view/view_supp_invoice.php:77 sales/view/view_invoice.php:172
+#: purchasing/view/view_supp_invoice.php:77 sales/view/view_invoice.php:175
 msgid "This invoice has been voided."
 msgstr ""
 
@@ -11358,43 +11370,43 @@ msgstr ""
 msgid "Supplier Inquiry"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:49
-msgid "Select a supplier:"
-msgstr ""
-
-#: purchasing/inquiry/supplier_inquiry.php:70 reporting/rep102.php:118
-#: reporting/rep108.php:152 reporting/rep202.php:124 reporting/rep202.php:158
-#: sales/inquiry/customer_inquiry.php:73
+#: purchasing/inquiry/supplier_inquiry.php:46 reporting/rep102.php:118
+#: reporting/rep108.php:153 reporting/rep202.php:124 reporting/rep202.php:158
+#: sales/inquiry/customer_inquiry.php:118
 msgid "Over"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:74
-#: sales/inquiry/customer_inquiry.php:76
+#: purchasing/inquiry/supplier_inquiry.php:50
+#: sales/inquiry/customer_inquiry.php:121
 msgid "Terms"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:74 reporting/rep102.php:121
-#: reporting/rep102.php:239 reporting/rep108.php:154 reporting/rep202.php:128
+#: purchasing/inquiry/supplier_inquiry.php:50 reporting/rep102.php:121
+#: reporting/rep102.php:239 reporting/rep108.php:155 reporting/rep202.php:128
 #: reporting/rep202.php:247 reporting/rep451.php:80
-#: sales/inquiry/customer_inquiry.php:76
+#: sales/inquiry/customer_inquiry.php:121
 msgid "Current"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:75 reporting/rep102.php:122
-#: reporting/rep108.php:154 reporting/rep202.php:129
-#: sales/inquiry/customer_inquiry.php:77
+#: purchasing/inquiry/supplier_inquiry.php:51 reporting/rep102.php:122
+#: reporting/rep108.php:155 reporting/rep202.php:129
+#: sales/inquiry/customer_inquiry.php:122
 msgid "Total Balance"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:133
-#: sales/inquiry/customer_inquiry.php:153
+#: purchasing/inquiry/supplier_inquiry.php:94
+#: sales/inquiry/customer_inquiry.php:74
 msgid "Credit This"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:148
+#: purchasing/inquiry/supplier_inquiry.php:109
 msgid "Print Remittance"
 msgstr ""
 
+#: purchasing/inquiry/supplier_inquiry.php:137
+msgid "Select a supplier:"
+msgstr ""
+
 #: purchasing/inquiry/suppliers_list.php:53
 #: sales/inquiry/customers_list.php:54
 msgid "Tax ID"
@@ -11409,41 +11421,41 @@ msgid "Allocation of"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:58
-#: sales/allocations/customer_allocate.php:55
+#: sales/allocations/customer_allocate.php:60
 msgid "Total:"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:62
-#: sales/allocations/customer_allocate.php:59
+#: sales/allocations/customer_allocate.php:64
 msgid "Amount ot be settled:"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:74
-#: sales/allocations/customer_allocate.php:72
+#: sales/allocations/customer_allocate.php:77
 msgid "Start again allocation of selected amount"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:75
-#: sales/allocations/customer_allocate.php:73
+#: sales/allocations/customer_allocate.php:78
 msgid "Process allocations"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:76
 #: purchasing/allocations/supplier_allocate.php:82
-#: sales/allocations/customer_allocate.php:74
-#: sales/allocations/customer_allocate.php:80
+#: sales/allocations/customer_allocate.php:79
+#: sales/allocations/customer_allocate.php:85
 msgid "Back to Allocations"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:77
 #: purchasing/allocations/supplier_allocate.php:83
-#: sales/allocations/customer_allocate.php:74
-#: sales/allocations/customer_allocate.php:81
+#: sales/allocations/customer_allocate.php:79
+#: sales/allocations/customer_allocate.php:86
 msgid "Abandon allocations and return to selection of allocatable amounts"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:81
-#: sales/allocations/customer_allocate.php:78
+#: sales/allocations/customer_allocate.php:83
 msgid "There are no unsettled transactions to allocate."
 msgstr ""
 
@@ -11466,7 +11478,7 @@ msgid "Allocate"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocation_main.php:111
-#: sales/allocations/customer_allocation_main.php:104
+#: sales/allocations/customer_allocation_main.php:109
 msgid "Marked items are settled."
 msgstr ""
 
@@ -11503,7 +11515,7 @@ msgstr ""
 msgid "Customer Balances"
 msgstr ""
 
-#: reporting/rep101.php:256 reporting/rep102.php:226 reporting/rep106.php:181
+#: reporting/rep101.php:262 reporting/rep102.php:226 reporting/rep106.php:181
 #: reporting/rep201.php:232 reporting/rep202.php:233 reporting/rep203.php:176
 #: reporting/rep204.php:148 reporting/rep301.php:249 reporting/rep304.php:212
 #: reporting/rep305.php:193 reporting/rep306.php:293 reporting/rep309.php:157
@@ -11665,7 +11677,7 @@ msgstr ""
 
 #: reporting/rep105.php:109 reporting/rep204.php:84
 #: sales/inquiry/customer_allocation_inquiry.php:149
-#: sales/inquiry/customer_inquiry.php:194
+#: sales/inquiry/customer_inquiry.php:195
 msgid "Order"
 msgstr ""
 
@@ -11762,11 +11774,11 @@ msgstr ""
 msgid "Outstanding Transactions"
 msgstr ""
 
-#: reporting/rep108.php:169
+#: reporting/rep108.php:170
 msgid "Statement"
 msgstr ""
 
-#: reporting/rep108.php:169
+#: reporting/rep108.php:170
 msgid "as of"
 msgstr ""
 
@@ -12180,7 +12192,7 @@ msgstr ""
 msgid "Close Balance"
 msgstr ""
 
-#: reporting/rep707.php:258
+#: reporting/rep707.php:260
 msgid "Profit and Loss Statement"
 msgstr ""
 
@@ -12766,7 +12778,7 @@ msgstr ""
 msgid "DueDate"
 msgstr ""
 
-#: reporting/includes/doctext.inc:271 reporting/includes/pdf_report.inc:1006
+#: reporting/includes/doctext.inc:271 reporting/includes/pdf_report.inc:1017
 msgid "You can pay through"
 msgstr ""
 
@@ -12780,12 +12792,12 @@ msgid ""
 msgstr ""
 
 #: reporting/includes/excel_report.inc:259
-#: reporting/includes/pdf_report.inc:317
+#: reporting/includes/pdf_report.inc:328
 msgid "Print Out Date"
 msgstr ""
 
 #: reporting/includes/excel_report.inc:265
-#: reporting/includes/pdf_report.inc:326
+#: reporting/includes/pdf_report.inc:337
 msgid "Fiscal Year"
 msgstr ""
 
@@ -12794,12 +12806,12 @@ msgid "Report Date"
 msgstr ""
 
 #: reporting/includes/excel_report.inc:410
-#: reporting/includes/pdf_report.inc:590
+#: reporting/includes/pdf_report.inc:601
 msgid "Generated At"
 msgstr ""
 
 #: reporting/includes/excel_report.inc:416
-#: reporting/includes/pdf_report.inc:599
+#: reporting/includes/pdf_report.inc:610
 msgid "Generated By"
 msgstr ""
 
@@ -12811,47 +12823,47 @@ msgstr ""
 msgid "Domicile"
 msgstr ""
 
-#: reporting/includes/header2.inc:146 reporting/includes/pdf_report.inc:353
-#: reporting/includes/pdf_report.inc:491 reporting/includes/pdf_report.inc:618
+#: reporting/includes/header2.inc:146 reporting/includes/pdf_report.inc:364
+#: reporting/includes/pdf_report.inc:502 reporting/includes/pdf_report.inc:629
 msgid "Page"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:573
+#: reporting/includes/pdf_report.inc:584
 msgid "Report Period"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:973
-#: reporting/includes/pdf_report.inc:1021
+#: reporting/includes/pdf_report.inc:984
+#: reporting/includes/pdf_report.inc:1032
 #, php-format
 msgid "You have no email contact defined for this type of document for '%s'."
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:992
+#: reporting/includes/pdf_report.inc:1003
 msgid "Dear"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:993
+#: reporting/includes/pdf_report.inc:1004
 msgid "Attached you will find "
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1009
+#: reporting/includes/pdf_report.inc:1020
 msgid "Kindest regards"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1024
+#: reporting/includes/pdf_report.inc:1035
 msgid "Sending document by email failed"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1024
-#: reporting/includes/pdf_report.inc:1027
+#: reporting/includes/pdf_report.inc:1035
+#: reporting/includes/pdf_report.inc:1038
 msgid "Email:"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1027
+#: reporting/includes/pdf_report.inc:1038
 msgid "has been sent by email to destination."
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1056
+#: reporting/includes/pdf_report.inc:1067
 msgid "Report has been sent to network printer "
 msgstr ""
 
@@ -13081,7 +13093,7 @@ msgstr ""
 msgid "Modifying Customer Credit Note #%d"
 msgstr ""
 
-#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:706
+#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:705
 msgid ""
 "There are no customers, or there are no customers with branches. Please "
 "define customers and customer branches."
@@ -13438,7 +13450,7 @@ msgid "Process Dispatch"
 msgstr ""
 
 #: sales/customer_delivery.php:536 sales/customer_invoice.php:665
-#: sales/sales_order_entry.php:753
+#: sales/sales_order_entry.php:752
 msgid "Check entered data and save document"
 msgstr ""
 
@@ -13556,7 +13568,7 @@ msgstr ""
 msgid "Payment terms:"
 msgstr ""
 
-#: sales/customer_invoice.php:512 sales/sales_order_entry.php:729
+#: sales/customer_invoice.php:512 sales/sales_order_entry.php:728
 msgid "Sales Order Items"
 msgstr ""
 
@@ -13874,152 +13886,152 @@ msgstr ""
 msgid "You need to define a cash account for your Sales Point."
 msgstr ""
 
-#: sales/sales_order_entry.php:478
+#: sales/sales_order_entry.php:479
 msgid ""
 "The reference number field has been increased. Please save the document "
 "again."
 msgstr ""
 
-#: sales/sales_order_entry.php:524
+#: sales/sales_order_entry.php:523
 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:528
+#: sales/sales_order_entry.php:527
 msgid "Price for inventory item must be entered and can not be less than 0"
 msgstr ""
 
-#: sales/sales_order_entry.php:535
+#: sales/sales_order_entry.php:534
 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:553
+#: sales/sales_order_entry.php:552
 #, php-format
 msgid "Price %s is below Standard Cost %s"
 msgstr ""
 
-#: sales/sales_order_entry.php:578
+#: sales/sales_order_entry.php:577
 msgid ""
 "This item cannot be deleted because some of it has already been delivered."
 msgstr ""
 
-#: sales/sales_order_entry.php:607
+#: sales/sales_order_entry.php:606
 msgid "Direct delivery entry has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:608
+#: sales/sales_order_entry.php:607
 msgid "Enter a New Sales Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:610
+#: sales/sales_order_entry.php:609
 msgid "Direct invoice entry has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:611
+#: sales/sales_order_entry.php:610
 msgid "Enter a New Sales Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:616
+#: sales/sales_order_entry.php:615
 msgid "This sales quotation has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:617
+#: sales/sales_order_entry.php:616
 msgid "Enter a New Sales Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:624
+#: sales/sales_order_entry.php:623
 msgid "Undelivered part of order has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:625
+#: sales/sales_order_entry.php:624
 msgid "Select Another Sales Order for Edition"
 msgstr ""
 
-#: sales/sales_order_entry.php:629
+#: sales/sales_order_entry.php:628
 msgid "This sales order has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:630
+#: sales/sales_order_entry.php:629
 msgid "Enter a New Sales Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:710
+#: sales/sales_order_entry.php:709
 msgid "Sales Invoice Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:711
+#: sales/sales_order_entry.php:710
 msgid "Enter Delivery Details and Confirm Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:713
+#: sales/sales_order_entry.php:712
 msgid "Place Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:716
+#: sales/sales_order_entry.php:715
 msgid "Delivery Note Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:717
+#: sales/sales_order_entry.php:716
 msgid "Enter Delivery Details and Confirm Dispatch"
 msgstr ""
 
-#: sales/sales_order_entry.php:718
+#: sales/sales_order_entry.php:717
 msgid "Cancel Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:719
+#: sales/sales_order_entry.php:718
 msgid "Place Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:721
+#: sales/sales_order_entry.php:720
 msgid "Quotation Date:"
 msgstr ""
 
-#: sales/sales_order_entry.php:722
+#: sales/sales_order_entry.php:721
 msgid "Sales Quotation Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:723
+#: sales/sales_order_entry.php:722
 msgid "Enter Delivery Details and Confirm Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:724
+#: sales/sales_order_entry.php:723
 msgid "Cancel Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:725
+#: sales/sales_order_entry.php:724
 msgid "Place Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:726
+#: sales/sales_order_entry.php:725
 msgid "Commit Quotations Changes"
 msgstr ""
 
-#: sales/sales_order_entry.php:730
+#: sales/sales_order_entry.php:729
 msgid "Enter Delivery Details and Confirm Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:733
+#: sales/sales_order_entry.php:732
 msgid "Commit Order Changes"
 msgstr ""
 
-#: sales/sales_order_entry.php:755 sales/sales_order_entry.php:761
+#: sales/sales_order_entry.php:754 sales/sales_order_entry.php:760
 msgid ""
 "Cancels document entry or removes sales order when editing an old document"
 msgstr ""
 
-#: sales/sales_order_entry.php:756 sales/sales_order_entry.php:765
+#: sales/sales_order_entry.php:755 sales/sales_order_entry.php:764
 msgid "You are about to void this Document.\\nDo you want to continue?"
 msgstr ""
 
-#: sales/sales_order_entry.php:759
+#: sales/sales_order_entry.php:758
 msgid "Validate changes and update document"
 msgstr ""
 
-#: sales/sales_order_entry.php:763
+#: sales/sales_order_entry.php:762
 msgid ""
 "You are about to cancel undelivered part of this order.\\nDo you want to "
 "continue?"
@@ -14029,7 +14041,7 @@ msgstr ""
 msgid "Allocate Customer Payment or Credit Note"
 msgstr ""
 
-#: sales/allocations/customer_allocate.php:50
+#: sales/allocations/customer_allocate.php:55
 #, php-format
 msgid "Allocation of %s # %d"
 msgstr ""
@@ -14041,7 +14053,7 @@ msgstr ""
 #: sales/allocations/customer_allocation_main.php:32
 #: sales/manage/customer_branches.php:270 sales/manage/customers.php:329
 #: sales/inquiry/customer_allocation_inquiry.php:42
-#: sales/inquiry/customer_inquiry.php:44
+#: sales/inquiry/customer_inquiry.php:154
 #: sales/inquiry/sales_deliveries_view.php:114
 #: sales/inquiry/sales_orders_view.php:232
 msgid "Select a customer: "
@@ -14749,6 +14761,10 @@ msgstr ""
 msgid "There are no line items on this invoice."
 msgstr ""
 
+#: sales/view/view_invoice.php:171
+msgid "PREPAYMENT AMOUNT INVOICED"
+msgstr ""
+
 #: sales/view/view_receipt.php:24
 msgid "View Customer Payment"
 msgstr ""
@@ -14852,17 +14868,12 @@ msgstr ""
 msgid "Customer Transactions"
 msgstr ""
 
-#: sales/inquiry/customer_inquiry.php:68
-msgid "CUSTOMER ACCOUNT IS ON HOLD"
-msgstr ""
-
-#: sales/inquiry/customer_inquiry.php:172
+#: sales/inquiry/customer_inquiry.php:93
 msgid "Print Receipt"
 msgstr ""
 
-#: sales/inquiry/customer_inquiry.php:202
-#: sales/inquiry/customer_inquiry.php:215
-msgid "RB"
+#: sales/inquiry/customer_inquiry.php:113
+msgid "CUSTOMER ACCOUNT IS ON HOLD"
 msgstr ""
 
 #: sales/inquiry/sales_deliveries_view.php:29
@@ -14988,7 +14999,7 @@ msgid ""
 "browser tab. You cannot edit more than one sales document at once."
 msgstr ""
 
-#: sales/includes/db/custalloc_db.inc:381
+#: sales/includes/db/custalloc_db.inc:382
 msgid ""
 "Unsuspected overallocation happened due to sparse credit notes exists for "
 "this invoice.\n"
@@ -15367,7 +15378,7 @@ msgid "Upgrade from version 2.2 to 2.3"
 msgstr ""
 
 #: sql/alter2.4.php:23
-msgid "Upgrade from version 2.3 to 2.4RC1"
+msgid "Upgrade from version 2.3 to 2.4"
 msgstr ""
 
 #: sql/alter2.4.php:31 sql/alter2.4rc1.php:31
@@ -15378,22 +15389,22 @@ msgstr ""
 msgid "Text collation optimization:"
 msgstr ""
 
-#: sql/alter2.4.php:83
+#: sql/alter2.4.php:89
 msgid "Cannot update config_db.php file."
 msgstr ""
 
-#: sql/alter2.4.php:122
+#: sql/alter2.4.php:128
 #, php-format
 msgid ""
 "Cannot update work orders costs:\n"
 "%s"
 msgstr ""
 
-#: sql/alter2.4.php:215
+#: sql/alter2.4.php:221
 msgid "Convertion to utf8 done."
 msgstr ""
 
-#: sql/alter2.4.php:254
+#: sql/alter2.4.php:260
 #, php-format
 msgid "Cannot drop column in %s table: %s"
 msgstr ""
index d5dc75193d5dfe5b23c56d10026fb4efc55ba52f..7790798696ba0ab77b8a5491e1693bf8fd7fad89 100644 (file)
@@ -224,14 +224,16 @@ function get_sql_for_supplier_inquiry($filter, $after_date, $to_date, $supplier_
        trans.tran_date, 
                trans.due_date,
                supplier.curr_code, 
-       (trans.ov_amount + trans.ov_gst  + trans.ov_discount) AS TotalAmount, 
+       (trans.ov_amount + trans.ov_gst  + trans.ov_discount) AS TotalAmount,
+
+       IF (trans.type=".ST_SUPPINVOICE." OR trans.type=".ST_BANKDEPOSIT."
+       OR (trans.type=".ST_JOURNAL." AND (trans.ov_amount + trans.ov_gst + trans.ov_discount)>0), 1, -1)*
+               (ABS(trans.ov_amount + trans.ov_gst + trans.ov_discount) - trans.alloc) Balance,
                trans.alloc AS Allocated,
                ((trans.type = ".ST_SUPPINVOICE." OR trans.type = ".ST_SUPPCREDIT.") AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue,
        (ABS(trans.ov_amount + trans.ov_gst  + trans.ov_discount) - trans.alloc <= ".FLOAT_COMP_DELTA.") AS Settled
        FROM ".TB_PREF."supp_trans as trans, ".TB_PREF."suppliers as supplier
        WHERE supplier.supplier_id = trans.supplier_id
-       AND trans.tran_date >= '$date_after'
-       AND trans.tran_date <= '$date_to'
                AND trans.ov_amount != 0";      // exclude voided transactions
 
        $sql2 = "SELECT ".ST_SUPPRECEIVE." as type, 
@@ -242,15 +244,21 @@ function get_sql_for_supplier_inquiry($filter, $after_date, $to_date, $supplier_
        delivery_date as tran_date, 
                '' as due_date,
                supplier.curr_code, 
+               0 as Balance, 
        '' AS TotalAmount,
                '' AS Allocated,
                0 as OverDue,
        1 as Settled
        FROM ".TB_PREF."grn_batch as trans, ".TB_PREF."suppliers as supplier, ".TB_PREF."purch_orders as po
        WHERE supplier.supplier_id = trans.supplier_id
-       AND trans.purch_order_no = po.order_no
-       AND trans.delivery_date >= '$date_after'
-       AND trans.delivery_date <= '$date_to'";
+       AND trans.purch_order_no = po.order_no";
+
+       if ($filter == '2')
+               $sql .= " AND ABS(trans.ov_amount + trans.ov_gst + trans.ov_discount) - trans.alloc>".FLOAT_COMP_DELTA;
+       else {
+               $sql .= " AND trans.tran_date >= '$date_after'
+                       AND trans.tran_date <= '$date_to'";
+       }
 
        if ($supplier_id != ALL_TEXT) {
                $sql .= " AND trans.supplier_id = ".db_escape($supplier_id);
@@ -260,7 +268,7 @@ function get_sql_for_supplier_inquiry($filter, $after_date, $to_date, $supplier_
        {
                        $sql = $sql2;
        } 
-       elseif (!isset($filter) || $filter == ALL_TEXT || $filter == '6') {
+       elseif (!isset($filter) || $filter == ALL_TEXT) {
                $sql = "SELECT * FROM (($sql) UNION ($sql2)) as tr WHERE 1";
        }
 
@@ -270,10 +278,6 @@ function get_sql_for_supplier_inquiry($filter, $after_date, $to_date, $supplier_
                {
                        $sql .= " AND (trans.type = ".ST_SUPPINVOICE." OR trans.type = ".ST_BANKDEPOSIT.")";
                } 
-               elseif (($filter == '2')) 
-               {
-                       $sql .= " AND trans.type = ".ST_SUPPINVOICE." ";
-               } 
                elseif ($filter == '3') 
                {
                        $sql .= " AND (trans.type = ".ST_SUPPAYMENT." OR trans.type = ".ST_BANKPAYMENT.") ";
index e0a1515042ac1f8cf6262cb93715428e953fa137..c031cede6d186e36703592b81dce2819e7f8ef9b 100644 (file)
@@ -92,9 +92,9 @@ function get_supplier_details($supplier_id, $to=null, $all=true)
        $value = "(trans.ov_amount + trans.ov_gst + trans.ov_discount)";
     else       
        $value = "IF (trans.type=".ST_SUPPINVOICE." OR trans.type=".ST_BANKDEPOSIT."
-       OR (trans.type=".ST_JOURNAL." AND (trans.ov_amount + trans.ov_gst + trans.ov_discount)>0),
-               (trans.ov_amount + trans.ov_gst + trans.ov_discount - trans.alloc),
-               (trans.ov_amount + trans.ov_gst + trans.ov_discount + trans.alloc))";
+       OR (trans.type=".ST_JOURNAL." AND (trans.ov_amount + trans.ov_gst + trans.ov_discount)>0), 1, -1)*
+               ABS(trans.ov_amount + trans.ov_gst + trans.ov_discount) - trans.alloc)";
+
        $due = "IF (trans.type=".ST_SUPPINVOICE." OR trans.type=".ST_SUPPCREDIT.",trans.due_date,trans.tran_date)";
     $sql = "SELECT supp.supp_name, supp.curr_code, ".TB_PREF."payment_terms.terms,
 
index 72169cda3ecb79a7dd644f4d2e8a6f78e9284756..89cebb65e7fc39097660d8e45b5e7f7ba464346f 100644 (file)
@@ -37,30 +37,6 @@ if (isset($_GET['ToDate'])){
 
 //------------------------------------------------------------------------------------------------
 
-start_form();
-
-if (!isset($_POST['supplier_id']))
-       $_POST['supplier_id'] = get_global_supplier();
-
-start_table(TABLESTYLE_NOBORDER);
-start_row();
-
-if (!$page_nested)
-       supplier_list_cells(_("Select a supplier:"), 'supplier_id', null, true, false, false, true);
-
-date_cells(_("From:"), 'TransAfterDate', '', null, -user_transaction_days());
-date_cells(_("To:"), 'TransToDate');
-
-supp_transactions_list_cell("filterType", null, true);
-
-submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), 'default');
-
-end_row();
-end_table();
-set_global_supplier($_POST['supplier_id']);
-
-//------------------------------------------------------------------------------------------------
-
 function display_supplier_summary($supplier_record)
 {
        $past1 = get_company_pref('past_due_days');
@@ -86,21 +62,6 @@ function display_supplier_summary($supplier_record)
     end_row();
     end_table(1);
 }
-//------------------------------------------------------------------------------------------------
-
-div_start('totals_tbl');
-if (($_POST['supplier_id'] != "") && ($_POST['supplier_id'] != ALL_TEXT))
-{
-       $supplier_record = get_supplier_details($_POST['supplier_id'], $_POST['TransToDate']);
-    display_supplier_summary($supplier_record);
-}
-div_end();
-
-if(get_post('RefreshInquiry'))
-{
-       $Ajax->activate('totals_tbl');
-}
-
 //------------------------------------------------------------------------------------------------
 function systype_name($dummy, $type)
 {
@@ -164,6 +125,48 @@ function edit_link($row)
 }
 //------------------------------------------------------------------------------------------------
 
+start_form();
+
+if (!isset($_POST['supplier_id']))
+       $_POST['supplier_id'] = get_global_supplier();
+
+start_table(TABLESTYLE_NOBORDER);
+start_row();
+
+if (!$page_nested)
+       supplier_list_cells(_("Select a supplier:"), 'supplier_id', null, true, true, false, true);
+
+supp_transactions_list_cell("filterType", null, true);
+
+if ($_POST['filterType'] != '2')
+{
+       date_cells(_("From:"), 'TransAfterDate', '', null, -user_transaction_days());
+       date_cells(_("To:"), 'TransToDate');
+}
+
+submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), 'default');
+
+end_row();
+end_table();
+set_global_supplier($_POST['supplier_id']);
+
+//------------------------------------------------------------------------------------------------
+
+div_start('totals_tbl');
+if ($_POST['supplier_id'] != ALL_TEXT && $_POST['filterType'] == '2')
+{
+       $supplier_record = get_supplier_details(get_post('supplier_id'), get_post('TransToDate'));
+    display_supplier_summary($supplier_record);
+}
+div_end();
+
+if (get_post('RefreshInquiry') || list_updated('filterType'))
+{
+       $Ajax->activate('_page_body');
+}
+
+//------------------------------------------------------------------------------------------------
+
 $sql = get_sql_for_supplier_inquiry(get_post('filterType'), get_post('TransAfterDate'), get_post('TransToDate'), get_post('supplier_id'));
 
 $cols = array(
@@ -176,6 +179,7 @@ $cols = array(
                        _("Due Date") => array('type'=>'date', 'fun'=>'due_date'), 
                        _("Currency") => array('align'=>'center'),
                        _("Amount") => array('align'=>'right', 'fun'=>'fmt_amount'), 
+                       _("Balance") => array('align'=>'right', 'type'=>'amount'),
                        array('insert'=>true, 'fun'=>'gl_view'),
                        array('insert'=>true, 'fun'=>'credit_link'),
                        array('insert'=>true, 'fun'=>'prt_link'),
@@ -187,6 +191,8 @@ if ($_POST['supplier_id'] != ALL_TEXT)
        $cols[_("Supplier")] = 'skip';
        $cols[_("Currency")] = 'skip';
 }
+if ($_POST['filterType'] != '2')
+       $cols[_("Balance")] = 'skip';
 
 /*show a table of the transactions returned by the sql */
 $table =& new_db_pager('trans_tbl', $sql, $cols);
index 52fce9e2df8d243ae24eb4c281bb28061e506a98..74ff8f01f051f9ee2de1abde8943b3f794aaebba 100644 (file)
@@ -317,9 +317,8 @@ function get_sql_for_customer_inquiry($from, $to, $cust_id = ALL_TEXT, $filter =
                debtor.name, 
                branch.br_name,
                debtor.curr_code,
-               debtor.debtor_no,
                IF(prep_amount, prep_amount, trans.ov_amount + trans.ov_gst + trans.ov_freight 
-                       + trans.ov_freight_tax + trans.ov_discount)     AS TotalAmount, "; 
+                       + trans.ov_freight_tax + trans.ov_discount)     AS TotalAmount,"
 //     if ($filter != ALL_TEXT)
 //             $sql .= "@bal := @bal+IF(prep_amount, prep_amount, trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount), ";
 
@@ -327,6 +326,11 @@ function get_sql_for_customer_inquiry($from, $to, $cust_id = ALL_TEXT, $filter =
 //             $sql .= "IF(trans.type=".ST_CUSTDELIVERY.",'', IF(trans.type=".ST_SALESINVOICE." OR trans.type=".ST_BANKPAYMENT.",@bal := @bal+
 //                     (trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount), @bal := @bal-
 //                     (trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount))) , ";
+               . "IF(trans.type IN(".implode(',',  array(ST_CUSTCREDIT,ST_CUSTPAYMENT,ST_BANKDEPOSIT))."), -1, 1)
+                               *(IF(prep_amount, prep_amount, trans.ov_amount + trans.ov_gst + trans.ov_freight 
+                       + trans.ov_freight_tax + trans.ov_discount)-trans.alloc) Balance, 
+               debtor.debtor_no,";
+
                $sql .= "trans.alloc AS Allocated,
                ((trans.type = ".ST_SALESINVOICE." || trans.type = ".ST_JOURNAL.")
                        AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue ,
@@ -343,11 +347,16 @@ function get_sql_for_customer_inquiry($from, $to, $cust_id = ALL_TEXT, $filter =
                         LEFT JOIN ".TB_PREF."users as user ON (audit.user=user.id)
                        LEFT JOIN ".TB_PREF."cust_branch as branch ON trans.branch_code=branch.branch_code,"
                        .TB_PREF."debtors_master as debtor
-               WHERE debtor.debtor_no = trans.debtor_no
-                       AND trans.tran_date >= '$date_after'
-                       AND trans.tran_date <= '$date_to'"
-                       // exclude voided transactions and self-balancing (journal) transactions:
-       . " AND ISNULL(v.date_) AND (trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount) != 0";
+               WHERE debtor.debtor_no = trans.debtor_no" // exclude voided transactions and self-balancing (journal) transactions:
+               ." AND ISNULL(v.date_) AND (trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount) != 0";
+
+       if ($filter == '2')
+               $sql .= " AND ABS(IF(prep_amount, prep_amount, trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount)-trans.alloc)>"
+                       .FLOAT_COMP_DELTA;
+       else {
+               $sql .= " AND trans.tran_date >= '$date_after'
+                       AND trans.tran_date <= '$date_to'";
+       }
 
        if ($cust_id != ALL_TEXT)
                $sql .= " AND trans.debtor_no = ".db_escape($cust_id);
@@ -360,7 +369,7 @@ function get_sql_for_customer_inquiry($from, $to, $cust_id = ALL_TEXT, $filter =
                }
                elseif ($filter == '2')
                {
-                       $sql .= " AND (trans.type = ".ST_SALESINVOICE.") ";
+                       $sql .= " AND (trans.type <> ".ST_CUSTDELIVERY.") ";
                }
                elseif ($filter == '3')
                {
index bc1dcbd90f4cf93214570a9bce83f4176773fb4d..675e1b736c6e589cce25403e049e9bc72586e769 100644 (file)
@@ -60,6 +60,9 @@ function delete_customer($customer_id)
        commit_transaction();
 }
 
+/*
+       This function probably should be renamed to get_customer_summary
+*/
 function get_customer_details($customer_id, $to=null, $all=true)
 {
 
@@ -79,7 +82,7 @@ function get_customer_details($customer_id, $to=null, $all=true)
        $due = "IF (trans.type=".ST_SALESINVOICE.", trans.due_date, trans.tran_date)";
     $sql = "SELECT debtor.name, debtor.curr_code, terms.terms, debtor.credit_limit,
                        credit_status.dissallow_invoices, credit_status.reason_description,
-                               Sum(IFNULL($value,0)) AS Balance,
+                               Sum($value) AS Balance,
                                Sum(IF ((TO_DAYS('$todate') - TO_DAYS($due)) > 0,$value,0)) AS Due,
                                Sum(IF ((TO_DAYS('$todate') - TO_DAYS($due)) > $past1,$value,0)) AS Overdue1,
                                Sum(IF ((TO_DAYS('$todate') - TO_DAYS($due)) > $past2,$value,0)) AS Overdue2
@@ -89,8 +92,10 @@ function get_customer_details($customer_id, $to=null, $all=true)
                                 .TB_PREF."credit_status credit_status
                        WHERE
                                        debtor.payment_terms = terms.terms_indicator
-                               AND debtor.credit_status = credit_status.id
-                               AND debtor.debtor_no = ".db_escape($customer_id);
+                               AND debtor.credit_status = credit_status.id";
+        if ($customer_id)
+               $sql .= " AND debtor.debtor_no = ".db_escape($customer_id);
+
        if (!$all)
                $sql .= " AND ABS(trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount - trans.alloc) > ".FLOAT_COMP_DELTA;
        $sql .= " GROUP BY
index 184e7e3b21eb395f20c54ff0f58c88d9413667f6..d00a049fe310f9c031a1531de171c45623232dc6 100644 (file)
@@ -25,85 +25,6 @@ if (user_use_date_picker())
        $js .= get_js_date_picker();
 page(_($help_context = "Customer Transactions"), isset($_GET['customer_id']), false, "", $js);
 
-if (isset($_GET['customer_id']))
-{
-       $_POST['customer_id'] = $_GET['customer_id'];
-}
-
-//------------------------------------------------------------------------------------------------
-
-start_form();
-
-if (!isset($_POST['customer_id']))
-       $_POST['customer_id'] = get_global_customer();
-
-start_table(TABLESTYLE_NOBORDER);
-start_row();
-
-if (!$page_nested)
-       customer_list_cells(_("Select a customer: "), 'customer_id', null, true, false, false, true);
-
-date_cells(_("From:"), 'TransAfterDate', '', null, -user_transaction_days());
-date_cells(_("To:"), 'TransToDate', '', null);
-
-if (!isset($_POST['filterType']))
-       $_POST['filterType'] = 0;
-
-cust_allocations_list_cells(null, 'filterType', $_POST['filterType'], true);
-
-submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), 'default');
-end_row();
-end_table();
-
-set_global_customer($_POST['customer_id']);
-
-//------------------------------------------------------------------------------------------------
-
-function display_customer_summary($customer_record)
-{
-       $past1 = get_company_pref('past_due_days');
-       $past2 = 2 * $past1;
-    if ($customer_record["dissallow_invoices"] != 0)
-    {
-       echo "<center><font color=red size=4><b>" . _("CUSTOMER ACCOUNT IS ON HOLD") . "</font></b></center>";
-    }
-
-       $nowdue = "1-" . $past1 . " " . _('Days');
-       $pastdue1 = $past1 + 1 . "-" . $past2 . " " . _('Days');
-       $pastdue2 = _('Over') . " " . $past2 . " " . _('Days');
-
-    start_table(TABLESTYLE, "width='80%'");
-    $th = array(_("Currency"), _("Terms"), _("Current"), $nowdue,
-       $pastdue1, $pastdue2, _("Total Balance"));
-    table_header($th);
-
-       start_row();
-    label_cell($customer_record["curr_code"]);
-    label_cell($customer_record["terms"]);
-       amount_cell($customer_record["Balance"] - $customer_record["Due"]);
-       amount_cell($customer_record["Due"] - $customer_record["Overdue1"]);
-       amount_cell($customer_record["Overdue1"] - $customer_record["Overdue2"]);
-       amount_cell($customer_record["Overdue2"]);
-       amount_cell($customer_record["Balance"]);
-       end_row();
-
-       end_table();
-}
-//------------------------------------------------------------------------------------------------
-
-div_start('totals_tbl');
-if ($_POST['customer_id'] != "" && $_POST['customer_id'] != ALL_TEXT)
-{
-       $customer_record = get_customer_details($_POST['customer_id'], $_POST['TransToDate']);
-    display_customer_summary($customer_record);
-    echo "<br>";
-}
-div_end();
-
-if(get_post('RefreshInquiry'))
-{
-       $Ajax->activate('totals_tbl');
-}
 //------------------------------------------------------------------------------------------------
 
 function systype_name($dummy, $type)
@@ -182,6 +103,86 @@ function check_overdue($row)
                && floatcmp($row["TotalAmount"], $row["Allocated"]) != 0;
 }
 //------------------------------------------------------------------------------------------------
+
+function display_customer_summary($customer_record)
+{
+       $past1 = get_company_pref('past_due_days');
+       $past2 = 2 * $past1;
+    if ($customer_record["dissallow_invoices"] != 0)
+    {
+       echo "<center><font color=red size=4><b>" . _("CUSTOMER ACCOUNT IS ON HOLD") . "</font></b></center>";
+    }
+
+       $nowdue = "1-" . $past1 . " " . _('Days');
+       $pastdue1 = $past1 + 1 . "-" . $past2 . " " . _('Days');
+       $pastdue2 = _('Over') . " " . $past2 . " " . _('Days');
+
+    start_table(TABLESTYLE, "width='80%'");
+    $th = array(_("Currency"), _("Terms"), _("Current"), $nowdue,
+       $pastdue1, $pastdue2, _("Total Balance"));
+    table_header($th);
+
+       start_row();
+    label_cell($customer_record["curr_code"]);
+    label_cell($customer_record["terms"]);
+       amount_cell($customer_record["Balance"] - $customer_record["Due"]);
+       amount_cell($customer_record["Due"] - $customer_record["Overdue1"]);
+       amount_cell($customer_record["Overdue1"] - $customer_record["Overdue2"]);
+       amount_cell($customer_record["Overdue2"]);
+       amount_cell($customer_record["Balance"]);
+       end_row();
+
+       end_table();
+}
+
+if (isset($_GET['customer_id']))
+{
+       $_POST['customer_id'] = $_GET['customer_id'];
+}
+
+//------------------------------------------------------------------------------------------------
+
+start_form();
+
+if (!isset($_POST['customer_id']))
+       $_POST['customer_id'] = get_global_customer();
+
+start_table(TABLESTYLE_NOBORDER);
+start_row();
+
+if (!$page_nested)
+       customer_list_cells(_("Select a customer: "), 'customer_id', null, true, true, false, true);
+
+cust_allocations_list_cells(null, 'filterType', null, true, true);
+
+if ($_POST['filterType'] != '2')
+{
+       date_cells(_("From:"), 'TransAfterDate', '', null, -user_transaction_days());
+       date_cells(_("To:"), 'TransToDate', '', null);
+}
+
+submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), 'default');
+end_row();
+end_table();
+
+set_global_customer($_POST['customer_id']);
+
+//------------------------------------------------------------------------------------------------
+
+div_start('totals_tbl');
+if ($_POST['customer_id'] != ALL_TEXT && $_POST['filterType'] == '2')
+{
+       $customer_record = get_customer_details(get_post('customer_id'), get_post('TransToDate'));
+    display_customer_summary($customer_record);
+    echo "<br>";
+}
+div_end();
+
+if (get_post('RefreshInquiry') || list_updated('filterType'))
+{
+       $Ajax->activate('_page_body');
+}
+//------------------------------------------------------------------------------------------------
 $sql = get_sql_for_customer_inquiry(get_post('TransAfterDate'), get_post('TransToDate'),
        get_post('customer_id'), get_post('filterType'));
 
@@ -199,7 +200,7 @@ $cols = array(
        _("Branch") => array('ord'=>''), 
        _("Currency") => array('align'=>'center'),
        _("Amount") => array('align'=>'right', 'fun'=>'fmt_amount'), 
-//     _("RB") => array('align'=>'right', 'type'=>'amount'),
+       _("Balance") => array('align'=>'right', 'type'=>'amount'),
                array('insert'=>true, 'fun'=>'gl_view'),
                array('insert'=>true, 'fun'=>'credit_link'),
                array('insert'=>true, 'fun'=>'edit_link'),
@@ -211,8 +212,8 @@ if ($_POST['customer_id'] != ALL_TEXT) {
        $cols[_("Customer")] = 'skip';
        $cols[_("Currency")] = 'skip';
 }
-if ($_POST['filterType'] == ALL_TEXT)
-       $cols[_("RB")] = 'skip';
+if ($_POST['filterType'] != '2')
+       $cols[_("Balance")] = 'skip';
 
 $table =& new_db_pager('trans_tbl', $sql, $cols);
 $table->set_marker('check_overdue', _("Marked items are overdue."));