diff --git a/erpnext/accounts/search_criteria/accounts_payable/accounts_payable.sql b/erpnext/accounts/search_criteria/accounts_payable/accounts_payable.sql index 2054b1e7f0e..cc7c1996018 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 e6a68018ade..0a1da876a07 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 b6e3dab255e..4492ef8c1b7 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;iTrend Analyzer -
+ +
--> diff --git a/js/all-app.js b/js/all-app.js index cb5235fa494..8838d196e1d 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -1,19 +1,4 @@ -/* - * lib/js/lib/history/history.min.js - */ -/* - * jQuery hashchange event - v1.3 - 7/21/2010 - * http://benalman.com/projects/jquery-hashchange-plugin/ - * - * Copyright (c) 2010 "Cowboy" Ben Alman - * Dual licensed under the MIT and GPL licenses. - * http://benalman.com/about/license/ - */ -(function($,e,b){var c="hashchange",h=document,f,g=$.event.special,i=h.documentMode,d="on"+c in e&&(i===b||i>7);function a(j){j=j||location.href;return"#"+j.replace(/^[^#]*#?(.*)$/,"$1")}$.fn[c]=function(j){return j?this.bind(c,j):this.trigger(c)};$.fn[c].delay=50;g[c]=$.extend(g[c],{setup:function(){if(d){return false}$(f.start)},teardown:function(){if(d){return false}$(f.stop)}});f=(function(){var j={},p,m=a(),k=function(q){return q},l=k,o=k;j.start=function(){p||n()};j.stop=function(){p&&clearTimeout(p);p=b};function n(){var r=a(),q=o(m);if(r!==m){l(m=r,q);$(e).trigger(c)}else{if(q!==m){location.href=location.href.replace(/#.*/,"")+q}}p=setTimeout(n,$.fn[c].delay)}$.browser.msie&&!d&&(function(){var q,r;j.start=function(){if(!q){r=$.fn[c].src;r=r&&r+a();q=$('