From 377511165e24bd58461c369b5b83a58397ee9d19 Mon Sep 17 00:00:00 2001 From: Pawan Mehta Date: Mon, 10 Dec 2018 21:55:01 +0530 Subject: [PATCH 1/2] Simple Trial Balance (#16060) --- .../trial_balance_simple.json | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 erpnext/accounts/report/trial_balance_simple/trial_balance_simple.json diff --git a/erpnext/accounts/report/trial_balance_simple/trial_balance_simple.json b/erpnext/accounts/report/trial_balance_simple/trial_balance_simple.json new file mode 100644 index 0000000000..ea5a97b106 --- /dev/null +++ b/erpnext/accounts/report/trial_balance_simple/trial_balance_simple.json @@ -0,0 +1,30 @@ +{ + "add_total_row": 1, + "creation": "2018-11-22 16:53:19.167935", + "disabled": 0, + "docstatus": 0, + "doctype": "Report", + "idx": 0, + "is_standard": "Yes", + "modified": "2018-11-22 17:40:11.317567", + "modified_by": "Administrator", + "module": "Accounts", + "name": "Trial Balance (Simple)", + "owner": "Administrator", + "prepared_report": 0, + "query": "select fiscal_year as \"Fiscal Year:Data:80\",\n\tcompany as \"Company:Data:220\",\n\tposting_date as \"Posting Date:Date:100\",\n\taccount as \"Account:Data:380\",\n\tsum(debit) as \"Debit:Currency:140\",\n\tsum(credit) as \"Credit:Currency:140\"\nfrom `tabGL Entry`\ngroup by fiscal_year, company, posting_date, account\norder by fiscal_year, company, posting_date, account", + "ref_doctype": "GL Entry", + "report_name": "Trial Balance (Simple)", + "report_type": "Query Report", + "roles": [ + { + "role": "Accounts User" + }, + { + "role": "Accounts Manager" + }, + { + "role": "Auditor" + } + ] +} \ No newline at end of file From caed845f3e5d7d2d39184f1b50df57895b57b3b0 Mon Sep 17 00:00:00 2001 From: Frappe Bot Date: Tue, 11 Dec 2018 09:55:01 +0000 Subject: [PATCH 2/2] bumped to version 11.0.3-beta.29 --- erpnext/hooks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 74afbf449a..bed29868f3 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -12,7 +12,7 @@ app_license = "GNU General Public License (v3)" source_link = "https://github.com/frappe/erpnext" develop_version = '12.x.x-develop' -staging_version = '11.0.3-beta.28' +staging_version = '11.0.3-beta.29' error_report_email = "support@erpnext.com"