Merge pull request #14092 from rohitwaghchaure/enterprise_develop_asset_fixes_for_perpetual
[Fix] Asset gl entry not creating for non perpetual
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js
index afa1ffe..6ad1df5 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.js
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js
@@ -17,7 +17,8 @@
"from_date": frm.doc.posting_date,
"to_date": frm.doc.posting_date,
"company": frm.doc.company,
- group_by_voucher: 0
+ "finance_book": frm.doc.finance_book,
+ "group_by_voucher": 0
};
frappe.set_route("query-report", "General Ledger");
}, "fa fa-table");
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.js b/erpnext/accounts/report/general_ledger/general_ledger.js
index 9a774ce..e3d6151 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.js
+++ b/erpnext/accounts/report/general_ledger/general_ledger.js
@@ -84,9 +84,7 @@
var party_type = frappe.query_report_filters_by_name.party_type.get_value();
var parties = frappe.query_report_filters_by_name.party.get_value();
- if(!party_type) {
- frappe.throw(__("Please select Party Type first"));
- }
+ if(!party_type) return;
const values = parties.split(/\s*,\s*/).filter(d => d);
const txt = parties.match(/[^,\s*]*$/)[0] || '';
diff --git a/erpnext/config/hr.py b/erpnext/config/hr.py
index ef28ee8..9e893c0 100644
--- a/erpnext/config/hr.py
+++ b/erpnext/config/hr.py
@@ -142,7 +142,7 @@
]
},
{
- "label": _("Expense Claim"),
+ "label": _("Travel and Expense Claim"),
"items": [
{
"type": "doctype",
@@ -156,6 +156,10 @@
"type": "doctype",
"name": "Expense Claim Type",
},
+ {
+ "type": "doctype",
+ "name": "Travel Request",
+ },
]
},
{
diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py
index 83e7916..4a358a4 100644
--- a/erpnext/controllers/selling_controller.py
+++ b/erpnext/controllers/selling_controller.py
@@ -343,17 +343,16 @@
item = frappe.db.sql("""select i.docstatus, id.income_account
from `tabItem` i, `tabItem Default` id
where i.name=%s and id.parent=i.name and id.company=%s""",
- (d.item_code,obj.company), as_dict=True)[0]
+ (d.item_code, obj.company), as_dict=True)
- income_account_set = False
- if getattr(d, "income_account", None) and not item.income_account:
+ if getattr(d, "income_account", None):
doc = frappe.get_doc("Item", d.item_code)
- for default in doc.item_defaults:
- if default.company == obj.company:
- default.income_account = d.income_account
- income_account_set = True
- break
- if not income_account_set:
+ if item and not item[0].income_account:
+ for default in doc.item_defaults:
+ if default.company == obj.company:
+ default.income_account = d.income_account
+ break
+ elif not item:
doc.append("item_defaults", {
"company": obj.company,
"income_account": d.income_account
diff --git a/erpnext/hr/doctype/travel_request/travel_request.json b/erpnext/hr/doctype/travel_request/travel_request.json
index 2f22bbc..fffb50a 100644
--- a/erpnext/hr/doctype/travel_request/travel_request.json
+++ b/erpnext/hr/doctype/travel_request/travel_request.json
@@ -151,7 +151,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
- "in_list_view": 0,
+ "in_list_view": 1,
"in_standard_filter": 0,
"label": "Purpose of Travel",
"length": 0,
@@ -307,7 +307,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
- "in_list_view": 0,
+ "in_list_view": 1,
"in_standard_filter": 0,
"label": "Employee",
"length": 0,
@@ -871,7 +871,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2018-05-16 04:35:56.819570",
+ "modified": "2018-05-16 08:38:22.543808",
"modified_by": "Administrator",
"module": "HR",
"name": "Travel Request",