nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-06 21:59:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added finance book in trial balance and fixed cost center not working issue in trial balance

Browse Source
This commit is contained in:
Rohit Waghchaure
2019-01-15 15:52:52 +05:30
parent df7215dcb2
commit bdee57ca8d
2 changed files with 41 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
erpnext/accounts/report/trial_balance/trial_balance.js
View File

@@ -12,21 +12,6 @@ frappe.require("assets/erpnext/js/financial_statements.js", function() {
"default": frappe.defaults.get_user_default("Company"),
"reqd": 1
},
{
"fieldname":"cost_center",
"label": __("Cost Center"),
"fieldtype": "Link",
"options": "Cost Center",
"get_query": function() {
var company = frappe.query_report.get_filter_value('company');
return {
"doctype": "Cost Center",
"filters": {
"company": company,
}
}
}
},
{
"fieldname": "fiscal_year",
"label": __("Fiscal Year"),
@@ -60,6 +45,27 @@ frappe.require("assets/erpnext/js/financial_statements.js", function() {
"fieldtype": "Date",
"default": frappe.defaults.get_user_default("year_end_date"),
},
{
"fieldname":"cost_center",
"label": __("Cost Center"),
"fieldtype": "Link",
"options": "Cost Center",
"get_query": function() {
var company = frappe.query_report.get_filter_value('company');
return {
"doctype": "Cost Center",
"filters": {
"company": company,
}
}
}
},
{
"fieldname":"finance_book",
"label": __("Finance Book"),
"fieldtype": "Link",
"options": "Finance Book",
},
{
"fieldname": "with_period_closing_entry",
"label": __("Period Closing Entry"),
@@ -75,6 +81,11 @@ frappe.require("assets/erpnext/js/financial_statements.js", function() {
"fieldname": "show_unclosed_fy_pl_balances",
"label": __("Show unclosed fiscal year's P&L balances"),
"fieldtype": "Check"
},
{
"fieldname": "include_non_finance_book_entries",
"label": __("Include Non Finance Book Entries"),
"fieldtype": "Check"
}
],
"formatter": erpnext.financial_statements.formatter,