diff --git a/erpnext/accounts/search_criteria/accounts_payable/accounts_payable.sql b/erpnext/accounts/search_criteria/accounts_payable/accounts_payable.sql index 2054b1e7f0..cc7c199601 100644 --- a/erpnext/accounts/search_criteria/accounts_payable/accounts_payable.sql +++ b/erpnext/accounts/search_criteria/accounts_payable/accounts_payable.sql @@ -4,7 +4,7 @@ WHERE `tabGL Entry`.`posting_date`>= '%(posting_date)s' AND `tabGL Entry`.`posting_date`<= '%(posting_date1)s' AND `tabGL Entry`.`account` LIKE '%(account)s%%' AND `tabGL Entry`.`company` LIKE '%(company)s%%' - AND ((ifnull(`tabGL Entry`.voucher_type,'') = 'Payable Voucher' and `tabGL Entry`.credit>0) OR `tabGL Entry`.voucher_type = 'Journal Voucher') + AND ((ifnull(`tabGL Entry`.voucher_type,'') = 'Purchase Invoice' and `tabGL Entry`.credit>0) OR `tabGL Entry`.voucher_type = 'Journal Voucher') AND `tabGL Entry`.`is_cancelled` = 'No' AND `tabAccount`.master_type = 'Supplier' AND `tabAccount`.name = `tabGL Entry`.account diff --git a/erpnext/accounts/search_criteria/accounts_receivable/accounts_receivable.sql b/erpnext/accounts/search_criteria/accounts_receivable/accounts_receivable.sql index e6a68018ad..0a1da876a0 100644 --- a/erpnext/accounts/search_criteria/accounts_receivable/accounts_receivable.sql +++ b/erpnext/accounts/search_criteria/accounts_receivable/accounts_receivable.sql @@ -4,7 +4,7 @@ WHERE `tabGL Entry`.`posting_date`>= '%(posting_date)s' AND `tabGL Entry`.`posting_date`<= '%(posting_date1)s' AND `tabGL Entry`.`account` LIKE '%(account)s%%' AND `tabGL Entry`.`company` LIKE '%(company)s%%' - AND ((`tabGL Entry`.voucher_type = 'Receivable Voucher' and `tabGL Entry`.debit>0) OR `tabGL Entry`.voucher_type = 'Journal Voucher') + AND ((`tabGL Entry`.voucher_type = 'Sales Invoice' and `tabGL Entry`.debit>0) OR `tabGL Entry`.voucher_type = 'Journal Voucher') AND `tabGL Entry`.`is_cancelled` = 'No' AND `tabAccount`.master_type = 'Customer' AND `tabAccount`.name = `tabGL Entry`.account diff --git a/erpnext/accounts/search_criteria/itemwise_sales_register/itemwise_sales_register.js b/erpnext/accounts/search_criteria/itemwise_sales_register/itemwise_sales_register.js index b6e3dab255..4492ef8c1b 100755 --- a/erpnext/accounts/search_criteria/itemwise_sales_register/itemwise_sales_register.js +++ b/erpnext/accounts/search_criteria/itemwise_sales_register/itemwise_sales_register.js @@ -18,7 +18,7 @@ report.customize_filters = function() { this.hide_all_filters(); filter_list = ['Debit To', 'From Posting Date', 'To Posting Date'] for(var i=0;i