Merge pull request #12585 from rohitwaghchaure/sales_income_account_issue
[Fix] Income account can not be group
diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py
index cd74fb5..53f9ecb 100644
--- a/erpnext/controllers/queries.py
+++ b/erpnext/controllers/queries.py
@@ -152,7 +152,7 @@
def item_query(doctype, txt, searchfield, start, page_len, filters, as_dict=False):
conditions = []
- return frappe.db.sql("""select tabItem.name, tabItem.item_group, tabItem.image,
+ return frappe.db.sql("""select tabItem.name, tabItem.item_group,
if(length(tabItem.item_name) > 40,
concat(substr(tabItem.item_name, 1, 40), "..."), item_name) as item_name,
if(length(tabItem.description) > 40, \
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 9ee82d2..d290c92 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -648,6 +648,9 @@
}
}).fail(() => this.frm.set_value('shipping_rule', ''));
}
+ else {
+ me.calculate_taxes_and_totals();
+ }
},
set_actual_charges_based_on_currency: function() {