From 93bad51659454eebf0d2443fd5a0d2b9a752c63b Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Tue, 3 Sep 2019 23:29:41 +0530 Subject: [PATCH 1/2] fix: offline pos item search not working --- erpnext/accounts/page/pos/pos.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js index b5a02d0e49..8d57c71a32 100755 --- a/erpnext/accounts/page/pos/pos.js +++ b/erpnext/accounts/page/pos/pos.js @@ -1121,7 +1121,8 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({ if (key) { return $.grep(this.items_list, function (item) { if (search_status) { - if (in_list(me.batch_no_data[item.item_code], me.search_item.$input.val())) { + if (me.batch_no_data[item.item_code] && + in_list(me.batch_no_data[item.item_code], me.search_item.$input.val())) { search_status = false; return me.item_batch_no[item.item_code] = me.search_item.$input.val() } else if (me.serial_no_data[item.item_code] @@ -1129,7 +1130,8 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({ search_status = false; me.item_serial_no[item.item_code] = [me.search_item.$input.val(), me.serial_no_data[item.item_code][me.search_item.$input.val()]] return true - } else if (in_list(me.barcode_data[item.item_code], me.search_item.$input.val())) { + } else if (me.barcode_data[item.item_code] && + in_list(me.barcode_data[item.item_code], me.search_item.$input.val())) { search_status = false; return true; } else if (reg.test(item.item_code.toLowerCase()) || (item.description && reg.test(item.description.toLowerCase())) || From 561a2e966e76832977bffe7edf79a2acc05de59c Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 4 Sep 2019 11:02:48 +0530 Subject: [PATCH 2/2] Update accounts_receivable.py --- .../report/accounts_receivable/accounts_receivable.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py index 88e4227837..b2bf3f90a7 100755 --- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py @@ -492,7 +492,7 @@ class ReceivablePayableReport(object): elif party_type_field=="supplier": self.add_supplier_filters(conditions, values) - self.add_accounting_dimensions_filters() + self.add_accounting_dimensions_filters(conditions, values) return " and ".join(conditions), values @@ -697,4 +697,4 @@ class ReceivablePayableReport(object): 'datasets': rows }, "type": 'percentage' - } \ No newline at end of file + }