minor fixes
diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py
index a7fdcd0..90ab919 100644
--- a/erpnext/controllers/selling_controller.py
+++ b/erpnext/controllers/selling_controller.py
@@ -372,10 +372,10 @@
for d in obj.doclist.get({"parentfield": obj.fname}):
if d.item_code:
item = webnotes.conn.sql("""select docstatus, is_sales_item,
- is_service_item, default_income_account from tabItem where name = %s""",
+ is_service_item, income_account from tabItem where name = %s""",
d.item_code, as_dict=True)[0]
if item.is_sales_item == 'No' and item.is_service_item == 'No':
webnotes.throw(_("Item is neither Sales nor Service Item") + ": " + d.item_code)
- if d.income_account and not item.default_income_account:
- webnotes.conn.set_value("Item", d.item_code, "default_income_account",
+ if d.income_account and not item.income_account:
+ webnotes.conn.set_value("Item", d.item_code, "income_account",
d.income_account)
diff --git a/erpnext/patches/4_0/fields_to_be_renamed.py b/erpnext/patches/4_0/fields_to_be_renamed.py
index 6bacd19..e973cdd 100644
--- a/erpnext/patches/4_0/fields_to_be_renamed.py
+++ b/erpnext/patches/4_0/fields_to_be_renamed.py
@@ -93,7 +93,8 @@
"Item": [
["purchase_account", "expense_account"],
["default_sales_cost_center", "selling_cost_center"],
- ["cost_center", "buying_cost_center"]
+ ["cost_center", "buying_cost_center"],
+ ["default_income_account", "income_account"],
],
"Item Price": [
["ref_rate", "price_list_rate"]
diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js
index bc29758..3a3129c 100644
--- a/erpnext/stock/doctype/item/item.js
+++ b/erpnext/stock/doctype/item/item.js
@@ -63,7 +63,7 @@
// Income Account
// --------------------------------
-cur_frm.fields_dict['default_income_account'].get_query = function(doc) {
+cur_frm.fields_dict['income_account'].get_query = function(doc) {
return {
filters: {
'debit_or_credit': "Credit",
diff --git a/erpnext/stock/doctype/item/test_item.py b/erpnext/stock/doctype/item/test_item.py
index 6142ac4..39b77df 100644
--- a/erpnext/stock/doctype/item/test_item.py
+++ b/erpnext/stock/doctype/item/test_item.py
@@ -78,7 +78,7 @@
"is_pro_applicable": "Yes",
"is_sub_contracted_item": "No",
"stock_uom": "_Test UOM",
- "default_income_account": "Sales - _TC",
+ "income_account": "Sales - _TC",
"default_warehouse": "_Test Warehouse - _TC",
"expense_account": "_Test Account Cost for Goods Sold - _TC",
"selling_cost_center": "_Test Cost Center - _TC",
@@ -108,7 +108,7 @@
"is_pro_applicable": "Yes",
"is_sub_contracted_item": "No",
"stock_uom": "_Test UOM",
- "default_income_account": "Sales - _TC",
+ "income_account": "Sales - _TC",
"default_warehouse": "_Test Warehouse - _TC",
"expense_account": "_Test Account Cost for Goods Sold - _TC"
}],
@@ -119,7 +119,7 @@
"description": "_Test Item Home Desktop 100",
"item_group": "_Test Item Group Desktops",
"default_warehouse": "_Test Warehouse - _TC",
- "default_income_account": "Sales - _TC",
+ "income_account": "Sales - _TC",
"expense_account": "_Test Account Cost for Goods Sold - _TC",
"is_stock_item": "Yes",
"is_asset_item": "No",
@@ -146,7 +146,7 @@
"description": "_Test Item Home Desktop 200",
"item_group": "_Test Item Group Desktops",
"default_warehouse": "_Test Warehouse - _TC",
- "default_income_account": "Sales - _TC",
+ "income_account": "Sales - _TC",
"expense_account": "_Test Account Cost for Goods Sold - _TC",
"is_stock_item": "Yes",
"is_asset_item": "No",
@@ -167,7 +167,7 @@
"item_name": "_Test Sales BOM Item",
"description": "_Test Sales BOM Item",
"item_group": "_Test Item Group Desktops",
- "default_income_account": "Sales - _TC",
+ "income_account": "Sales - _TC",
"expense_account": "_Test Account Cost for Goods Sold - _TC",
"is_stock_item": "No",
"is_asset_item": "No",
@@ -189,7 +189,7 @@
"item_group": "_Test Item Group Desktops",
"is_stock_item": "Yes",
"default_warehouse": "_Test Warehouse - _TC",
- "default_income_account": "Sales - _TC",
+ "income_account": "Sales - _TC",
"expense_account": "_Test Account Cost for Goods Sold - _TC",
"is_asset_item": "No",
"has_batch_no": "No",
@@ -266,7 +266,7 @@
"description": "_Test Item Home Desktop Manufactured",
"item_group": "_Test Item Group Desktops",
"default_warehouse": "_Test Warehouse - _TC",
- "default_income_account": "Sales - _TC",
+ "income_account": "Sales - _TC",
"expense_account": "_Test Account Cost for Goods Sold - _TC",
"is_stock_item": "Yes",
"is_asset_item": "No",
@@ -289,7 +289,7 @@
"item_group": "_Test Item Group Desktops",
"is_stock_item": "Yes",
"default_warehouse": "_Test Warehouse - _TC",
- "default_income_account": "Sales - _TC",
+ "income_account": "Sales - _TC",
"expense_account": "_Test Account Cost for Goods Sold - _TC",
"is_asset_item": "No",
"has_batch_no": "No",
diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index 6f9cd4f..5de856d 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -127,7 +127,7 @@
"item_name": item.item_name,
"description": item.description_html or item.description,
"warehouse": user_default_warehouse or args.warehouse or item.default_warehouse,
- "income_account": item.default_income_account or args.income_account \
+ "income_account": item.income_account or args.income_account \
or webnotes.conn.get_value("Company", args.company, "default_income_account"),
"expense_account": item.expense_account or args.expense_account \
or webnotes.conn.get_value("Company", args.company, "default_expense_account"),