Merge branch 'develop' into fix-call-popup
diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js
index 0e73012..2173e7d 100755
--- a/erpnext/accounts/page/pos/pos.js
+++ b/erpnext/accounts/page/pos/pos.js
@@ -1118,7 +1118,8 @@
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]
@@ -1126,7 +1127,8 @@
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())) ||
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
index 88e4227..b2bf3f9 100755
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
@@ -492,7 +492,7 @@
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 @@
'datasets': rows
},
"type": 'percentage'
- }
\ No newline at end of file
+ }