From 0e7ca6ada79d0030cc032e1ffcdce6455e309597 Mon Sep 17 00:00:00 2001 From: Sahil Khan Date: Tue, 22 Oct 2019 17:23:12 +0550 Subject: [PATCH 1/6] bumped to version 11.1.67 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index aae6c4f199f..be77f546fec 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -5,7 +5,7 @@ import frappe from erpnext.hooks import regional_overrides from frappe.utils import getdate -__version__ = '11.1.66' +__version__ = '11.1.67' def get_default_company(user=None): '''Get default company for user''' From f8502317a94e519e9bccf18a8c683e97c929bacb Mon Sep 17 00:00:00 2001 From: Sahil Khan Date: Mon, 18 Nov 2019 18:29:02 +0550 Subject: [PATCH 2/6] bumped to version 11.1.68 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index be77f546fec..46cf3132c78 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -5,7 +5,7 @@ import frappe from erpnext.hooks import regional_overrides from frappe.utils import getdate -__version__ = '11.1.67' +__version__ = '11.1.68' def get_default_company(user=None): '''Get default company for user''' From 9965f443ee9709ea36a6dc800d6a847b3bc8bc43 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Tue, 19 Nov 2019 19:05:23 +0530 Subject: [PATCH 3/6] fix: not able to select item in sales order --- erpnext/controllers/queries.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py index f795f35ed33..6796d8541f3 100644 --- a/erpnext/controllers/queries.py +++ b/erpnext/controllers/queries.py @@ -159,8 +159,12 @@ def item_query(doctype, txt, searchfield, start, page_len, filters, as_dict=Fals if "description" in searchfields: searchfields.remove("description") - columns = [field for field in searchfields if not field in ["name", "item_group", "description"]] - columns = ", ".join(columns) + columns = '' + extra_searchfields = [field for field in searchfields + if not field in ["name", "item_group", "description"]] + + if extra_searchfields: + columns = ", " + ", ".join(extra_searchfields) searchfields = searchfields + [field for field in[searchfield or "name", "item_code", "item_group", "item_name"] if not field in searchfields] @@ -176,7 +180,7 @@ def item_query(doctype, txt, searchfield, start, page_len, filters, as_dict=Fals concat(substr(tabItem.item_name, 1, 40), "..."), item_name) as item_name, tabItem.item_group, if(length(tabItem.description) > 40, \ - concat(substr(tabItem.description, 1, 40), "..."), description) as description, + concat(substr(tabItem.description, 1, 40), "..."), description) as description {columns} from tabItem where tabItem.docstatus < 2 From 364332bcfec04a34bdc534ee0d5f645dc4b3b947 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 19 Nov 2019 19:26:31 +0530 Subject: [PATCH 4/6] Update queries.py --- erpnext/controllers/queries.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py index 6796d8541f3..af1dc53d6f5 100644 --- a/erpnext/controllers/queries.py +++ b/erpnext/controllers/queries.py @@ -161,7 +161,7 @@ def item_query(doctype, txt, searchfield, start, page_len, filters, as_dict=Fals columns = '' extra_searchfields = [field for field in searchfields - if not field in ["name", "item_group", "description"]] + if field not in ["name", "item_group", "description"]] if extra_searchfields: columns = ", " + ", ".join(extra_searchfields) From 3ad65ec57d8a18043df518a39677f710cf903d3c Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Tue, 19 Nov 2019 19:21:27 +0530 Subject: [PATCH 5/6] fix: code cleanup --- erpnext/controllers/sales_and_purchase_return.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/controllers/sales_and_purchase_return.py b/erpnext/controllers/sales_and_purchase_return.py index 859529204be..81fdbbefc35 100644 --- a/erpnext/controllers/sales_and_purchase_return.py +++ b/erpnext/controllers/sales_and_purchase_return.py @@ -72,7 +72,7 @@ def validate_returned_items(doc): items_returned = False for d in doc.get("items"): - if d.item_code and (flt(d.qty) < 0 or d.get('received_qty') < 0): + if d.item_code and (flt(d.qty) < 0 or flt(d.get('received_qty')) < 0): if d.item_code not in valid_items: frappe.throw(_("Row # {0}: Returned Item {1} does not exists in {2} {3}") .format(d.idx, d.item_code, doc.doctype, doc.return_against)) From 73d9d8fec91d4c17192a826672ac3cc611481813 Mon Sep 17 00:00:00 2001 From: thefalconx33 Date: Mon, 9 Dec 2019 13:59:50 +0530 Subject: [PATCH 6/6] fix: tax templates from all companies fetching in receipt --- erpnext/stock/doctype/purchase_receipt/purchase_receipt.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js index c6f5d1fdc04..736005bed9d 100644 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js @@ -27,6 +27,12 @@ frappe.ui.form.on("Purchase Receipt", { } }); + frm.set_query("taxes_and_charges", function() { + return { + filters: {'company': frm.doc.company } + } + }); + }, onload: function(frm) { erpnext.queries.setup_queries(frm, "Warehouse", function() {