From 4ae221946b67ba1406c43c34fc66c390c7eedf85 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Mon, 25 Mar 2019 22:25:38 +0530 Subject: [PATCH] renamed report --- erpnext/patches.txt | 2 +- ...ove_target_distribution_from_parent_to_child.py | 6 +++++- .../__init__.py | 0 .../item_group_wise_sales_target_variance.py | 2 +- ...partner_target_variance_based_on_item_group.js} | 7 ++++--- ...rtner_target_variance_based_on_item_group.json} | 14 ++++++++------ ...partner_target_variance_based_on_item_group.py} | 2 +- .../__init__.py | 0 .../sales_partner_transaction_summary.js} | 2 +- .../sales_partner_transaction_summary.json} | 8 ++++---- .../sales_partner_transaction_summary.py} | 0 .../__init__.py | 0 ..._person_target_variance_based_on_item_group.js} | 7 ++++--- ...erson_target_variance_based_on_item_group.json} | 14 ++++++++------ ..._person_target_variance_based_on_item_group.py} | 5 ++--- .../__init__.py | 0 ...rritory_target_variance_based_on_item_group.js} | 2 +- ...itory_target_variance_based_on_item_group.json} | 8 ++++---- ...rritory_target_variance_based_on_item_group.py} | 3 +-- .../setup/doctype/sales_partner/sales_partner.js | 2 +- erpnext/setup/doctype/sales_person/sales_person.js | 2 +- erpnext/setup/doctype/territory/territory.js | 4 ++-- 22 files changed, 49 insertions(+), 41 deletions(-) rename erpnext/selling/report/{sales_partner_target_variance_item_group_wise => sales_partner_target_variance_based_on_item_group}/__init__.py (100%) rename erpnext/selling/report/{sales_partner_target_variance_item_group_wise => sales_partner_target_variance_based_on_item_group}/item_group_wise_sales_target_variance.py (99%) rename erpnext/selling/report/{territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.js => sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js} (82%) rename erpnext/selling/report/{territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.json => sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.json} (57%) rename erpnext/selling/report/{sales_partner_target_variance_item_group_wise/sales_partner_target_variance_item_group_wise.py => sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.py} (66%) rename erpnext/selling/report/{sales_partner_wise_transaction_summary => sales_partner_transaction_summary}/__init__.py (100%) rename erpnext/selling/report/{sales_partner_wise_transaction_summary/sales_partner_wise_transaction_summary.js => sales_partner_transaction_summary/sales_partner_transaction_summary.js} (95%) rename erpnext/selling/report/{sales_partner_wise_transaction_summary/sales_partner_wise_transaction_summary.json => sales_partner_transaction_summary/sales_partner_transaction_summary.json} (73%) rename erpnext/selling/report/{sales_partner_wise_transaction_summary/sales_partner_wise_transaction_summary.py => sales_partner_transaction_summary/sales_partner_transaction_summary.py} (100%) rename erpnext/selling/report/{sales_person_target_variance_item_group_wise => sales_person_target_variance_based_on_item_group}/__init__.py (100%) rename erpnext/selling/report/{sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js => sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js} (82%) rename erpnext/selling/report/{sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.json => sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.json} (57%) rename erpnext/selling/report/{sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py => sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.py} (54%) rename erpnext/selling/report/{territory_target_variance_item_group_wise => territory_target_variance_based_on_item_group}/__init__.py (100%) rename erpnext/selling/report/{sales_partner_target_variance_item_group_wise/sales_partner_target_variance_item_group_wise.js => territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js} (93%) rename erpnext/selling/report/{sales_partner_target_variance_item_group_wise/sales_partner_target_variance_item_group_wise.json => territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.json} (72%) rename erpnext/selling/report/{territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py => territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.py} (65%) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index f345cf80df..f082dd1ddf 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -591,4 +591,4 @@ erpnext.patches.v12_0.add_item_name_in_work_orders erpnext.patches.v12_0.update_pricing_rule_fields erpnext.patches.v11_1.make_job_card_time_logs erpnext.patches.v12_0.rename_pricing_rule_child_doctypes -erpnext.patches.v12_0.move_target_distribution_from_parent_to_child +erpnext.patches.v12_0.move_target_distribution_from_parent_to_child #wmnfb diff --git a/erpnext/patches/v12_0/move_target_distribution_from_parent_to_child.py b/erpnext/patches/v12_0/move_target_distribution_from_parent_to_child.py index e8e08505fe..548c1a4717 100644 --- a/erpnext/patches/v12_0/move_target_distribution_from_parent_to_child.py +++ b/erpnext/patches/v12_0/move_target_distribution_from_parent_to_child.py @@ -15,4 +15,8 @@ def execute(): WHERE `tab{child_doc}`.parent = `tab{parent_doc}`.name and `tab{parent_doc}`.distribution_id is not null and `tab{parent_doc}`.distribution_id != '' - """.format(parent_doc = d, child_doc = "Target Detail")) \ No newline at end of file + """.format(parent_doc = d, child_doc = "Target Detail")) + + frappe.delete_doc("Report", "Sales Partner-wise Transaction Summary") + frappe.delete_doc("Report", "Sales Person Target Variance Item Group-Wise") + frappe.delete_doc("Report", "Territory Target Variance Item Group-Wise") \ No newline at end of file diff --git a/erpnext/selling/report/sales_partner_target_variance_item_group_wise/__init__.py b/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/__init__.py similarity index 100% rename from erpnext/selling/report/sales_partner_target_variance_item_group_wise/__init__.py rename to erpnext/selling/report/sales_partner_target_variance_based_on_item_group/__init__.py diff --git a/erpnext/selling/report/sales_partner_target_variance_item_group_wise/item_group_wise_sales_target_variance.py b/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py similarity index 99% rename from erpnext/selling/report/sales_partner_target_variance_item_group_wise/item_group_wise_sales_target_variance.py rename to erpnext/selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py index 034dc792fa..d7ebafc217 100644 --- a/erpnext/selling/report/sales_partner_target_variance_item_group_wise/item_group_wise_sales_target_variance.py +++ b/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py @@ -195,7 +195,7 @@ def get_actual_data(filters, item_groups, sales_users_or_territory_data, date_fi parent_doc = filters.get("doctype"), child_doc = filters.get("doctype") + ' Item', item_groups = ','.join(['%s'] * len(item_groups)) - ), tuple(sales_users_or_territory_data + item_groups + dates), as_dict=1, debug=1) + ), tuple(sales_users_or_territory_data + item_groups + dates), as_dict=1) def get_parents_data(filters, partner_doctype): filters_dict = {'parenttype': partner_doctype} diff --git a/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.js b/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js similarity index 82% rename from erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.js rename to erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js index bac8178af7..f99f68c524 100644 --- a/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.js +++ b/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js @@ -1,7 +1,8 @@ -// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -// License: GNU General Public License v3. See license.txt +// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors +// For license information, please see license.txt +/* eslint-disable */ -frappe.query_reports["Territory Target Variance Item Group-Wise"] = { +frappe.query_reports["Sales Partner Target Variance based on Item Group"] = { "filters": [ { fieldname:"company", diff --git a/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.json b/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.json similarity index 57% rename from erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.json rename to erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.json index 2cb548fc45..1cc7e961d3 100644 --- a/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.json +++ b/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.json @@ -1,19 +1,21 @@ { "add_total_row": 0, - "apply_user_permissions": 1, - "creation": "2013-06-21 12:15:00", + "creation": "2019-03-25 18:22:37.323995", + "disable_prepared_report": 0, "disabled": 0, "docstatus": 0, "doctype": "Report", - "idx": 3, + "idx": 0, "is_standard": "Yes", - "modified": "2017-02-24 20:13:29.705321", + "letter_head": "Gadgets International", + "modified": "2019-03-25 18:22:37.323995", "modified_by": "Administrator", "module": "Selling", - "name": "Territory Target Variance Item Group-Wise", + "name": "Sales Partner Target Variance based on Item Group", "owner": "Administrator", + "prepared_report": 0, "ref_doctype": "Sales Order", - "report_name": "Territory Target Variance Item Group-Wise", + "report_name": "Sales Partner Target Variance based on Item Group", "report_type": "Script Report", "roles": [ { diff --git a/erpnext/selling/report/sales_partner_target_variance_item_group_wise/sales_partner_target_variance_item_group_wise.py b/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.py similarity index 66% rename from erpnext/selling/report/sales_partner_target_variance_item_group_wise/sales_partner_target_variance_item_group_wise.py rename to erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.py index 70bb7549d0..e41011fba2 100644 --- a/erpnext/selling/report/sales_partner_target_variance_item_group_wise/sales_partner_target_variance_item_group_wise.py +++ b/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals import frappe -from erpnext.selling.report.sales_partner_target_variance_item_group_wise.item_group_wise_sales_target_variance import get_data_column +from erpnext.selling.report.sales_partner_target_variance_based_on_item_group.item_group_wise_sales_target_variance import get_data_column def execute(filters=None): data = [] diff --git a/erpnext/selling/report/sales_partner_wise_transaction_summary/__init__.py b/erpnext/selling/report/sales_partner_transaction_summary/__init__.py similarity index 100% rename from erpnext/selling/report/sales_partner_wise_transaction_summary/__init__.py rename to erpnext/selling/report/sales_partner_transaction_summary/__init__.py diff --git a/erpnext/selling/report/sales_partner_wise_transaction_summary/sales_partner_wise_transaction_summary.js b/erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js similarity index 95% rename from erpnext/selling/report/sales_partner_wise_transaction_summary/sales_partner_wise_transaction_summary.js rename to erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js index 7e99dd4da6..e404233953 100644 --- a/erpnext/selling/report/sales_partner_wise_transaction_summary/sales_partner_wise_transaction_summary.js +++ b/erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js @@ -2,7 +2,7 @@ // For license information, please see license.txt /* eslint-disable */ -frappe.query_reports["Sales Partner-wise Transaction Summary"] = { +frappe.query_reports["Sales Partner Transaction Summary"] = { "filters": [ { fieldname: "sales_partner", diff --git a/erpnext/selling/report/sales_partner_wise_transaction_summary/sales_partner_wise_transaction_summary.json b/erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.json similarity index 73% rename from erpnext/selling/report/sales_partner_wise_transaction_summary/sales_partner_wise_transaction_summary.json rename to erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.json index 9384bfb23d..b518b42be3 100644 --- a/erpnext/selling/report/sales_partner_wise_transaction_summary/sales_partner_wise_transaction_summary.json +++ b/erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.json @@ -1,6 +1,6 @@ { "add_total_row": 1, - "creation": "2019-03-15 16:21:16.088831", + "creation": "2019-03-25 18:15:09.920739", "disable_prepared_report": 0, "disabled": 0, "docstatus": 0, @@ -8,14 +8,14 @@ "idx": 0, "is_standard": "Yes", "letter_head": "Gadgets International", - "modified": "2019-03-15 16:21:16.088831", + "modified": "2019-03-25 18:15:09.920739", "modified_by": "Administrator", "module": "Selling", - "name": "Sales Partner-wise Transaction Summary", + "name": "Sales Partner Transaction Summary", "owner": "Administrator", "prepared_report": 0, "ref_doctype": "Sales Order", - "report_name": "Sales Partner-wise Transaction Summary", + "report_name": "Sales Partner Transaction Summary", "report_type": "Script Report", "roles": [ { diff --git a/erpnext/selling/report/sales_partner_wise_transaction_summary/sales_partner_wise_transaction_summary.py b/erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py similarity index 100% rename from erpnext/selling/report/sales_partner_wise_transaction_summary/sales_partner_wise_transaction_summary.py rename to erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py diff --git a/erpnext/selling/report/sales_person_target_variance_item_group_wise/__init__.py b/erpnext/selling/report/sales_person_target_variance_based_on_item_group/__init__.py similarity index 100% rename from erpnext/selling/report/sales_person_target_variance_item_group_wise/__init__.py rename to erpnext/selling/report/sales_person_target_variance_based_on_item_group/__init__.py diff --git a/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js b/erpnext/selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js similarity index 82% rename from erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js rename to erpnext/selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js index 13103df812..9f6bfc41df 100644 --- a/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +++ b/erpnext/selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js @@ -1,7 +1,8 @@ -// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -// License: GNU General Public License v3. See license.txt +// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors +// For license information, please see license.txt +/* eslint-disable */ -frappe.query_reports["Sales Person Target Variance Item Group-Wise"] = { +frappe.query_reports["Sales Person Target Variance Based On Item Group"] = { "filters": [ { fieldname:"company", diff --git a/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.json b/erpnext/selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.json similarity index 57% rename from erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.json rename to erpnext/selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.json index 452caf9d46..84cd27eb34 100644 --- a/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.json +++ b/erpnext/selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.json @@ -1,19 +1,21 @@ { "add_total_row": 0, - "apply_user_permissions": 1, - "creation": "2013-06-21 12:14:15", + "creation": "2019-03-25 22:16:49.040998", + "disable_prepared_report": 0, "disabled": 0, "docstatus": 0, "doctype": "Report", - "idx": 3, + "idx": 0, "is_standard": "Yes", - "modified": "2017-02-24 20:14:50.589149", + "letter_head": "Gadgets International", + "modified": "2019-03-25 22:16:49.040998", "modified_by": "Administrator", "module": "Selling", - "name": "Sales Person Target Variance Item Group-Wise", + "name": "Sales Person Target Variance Based On Item Group", "owner": "Administrator", + "prepared_report": 0, "ref_doctype": "Sales Order", - "report_name": "Sales Person Target Variance Item Group-Wise", + "report_name": "Sales Person Target Variance Based On Item Group", "report_type": "Script Report", "roles": [ { diff --git a/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py b/erpnext/selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.py similarity index 54% rename from erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py rename to erpnext/selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.py index 3c525b3477..5166cc808e 100644 --- a/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +++ b/erpnext/selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.py @@ -3,10 +3,9 @@ from __future__ import unicode_literals import frappe -from erpnext.selling.report.sales_partner_target_variance_item_group_wise.item_group_wise_sales_target_variance import get_data_column +from erpnext.selling.report.sales_partner_target_variance_based_on_item_group.item_group_wise_sales_target_variance import get_data_column def execute(filters=None): data = [] - return get_data_column(filters, "Sales Person") - + return get_data_column(filters, "Sales Person") \ No newline at end of file diff --git a/erpnext/selling/report/territory_target_variance_item_group_wise/__init__.py b/erpnext/selling/report/territory_target_variance_based_on_item_group/__init__.py similarity index 100% rename from erpnext/selling/report/territory_target_variance_item_group_wise/__init__.py rename to erpnext/selling/report/territory_target_variance_based_on_item_group/__init__.py diff --git a/erpnext/selling/report/sales_partner_target_variance_item_group_wise/sales_partner_target_variance_item_group_wise.js b/erpnext/selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js similarity index 93% rename from erpnext/selling/report/sales_partner_target_variance_item_group_wise/sales_partner_target_variance_item_group_wise.js rename to erpnext/selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js index 9e0a984a47..dd9607ffbd 100644 --- a/erpnext/selling/report/sales_partner_target_variance_item_group_wise/sales_partner_target_variance_item_group_wise.js +++ b/erpnext/selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js @@ -2,7 +2,7 @@ // For license information, please see license.txt /* eslint-disable */ -frappe.query_reports["Sales Partner Target Variance Item Group-Wise"] = { +frappe.query_reports["Territory Target Variance Based On Item Group"] = { "filters": [ { fieldname:"company", diff --git a/erpnext/selling/report/sales_partner_target_variance_item_group_wise/sales_partner_target_variance_item_group_wise.json b/erpnext/selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.json similarity index 72% rename from erpnext/selling/report/sales_partner_target_variance_item_group_wise/sales_partner_target_variance_item_group_wise.json rename to erpnext/selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.json index 45f79c7e26..d3b05ba57d 100644 --- a/erpnext/selling/report/sales_partner_target_variance_item_group_wise/sales_partner_target_variance_item_group_wise.json +++ b/erpnext/selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.json @@ -1,6 +1,6 @@ { "add_total_row": 0, - "creation": "2019-03-15 17:42:00.631020", + "creation": "2019-03-25 22:20:59.033199", "disable_prepared_report": 0, "disabled": 0, "docstatus": 0, @@ -8,14 +8,14 @@ "idx": 0, "is_standard": "Yes", "letter_head": "Gadgets International", - "modified": "2019-03-15 17:42:00.631020", + "modified": "2019-03-25 22:20:59.033199", "modified_by": "Administrator", "module": "Selling", - "name": "Sales Partner Target Variance Item Group-Wise", + "name": "Territory Target Variance Based On Item Group", "owner": "Administrator", "prepared_report": 0, "ref_doctype": "Sales Order", - "report_name": "Sales Partner Target Variance Item Group-Wise", + "report_name": "Territory Target Variance Based On Item Group", "report_type": "Script Report", "roles": [ { diff --git a/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py b/erpnext/selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.py similarity index 65% rename from erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py rename to erpnext/selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.py index 0843d6286b..b1d89cc3fb 100644 --- a/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +++ b/erpnext/selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.py @@ -3,10 +3,9 @@ from __future__ import unicode_literals import frappe -from erpnext.selling.report.sales_partner_target_variance_item_group_wise.item_group_wise_sales_target_variance import get_data_column +from erpnext.selling.report.sales_partner_target_variance_based_on_item_group.item_group_wise_sales_target_variance import get_data_column def execute(filters=None): data = [] return get_data_column(filters, "Territory") - diff --git a/erpnext/setup/doctype/sales_partner/sales_partner.js b/erpnext/setup/doctype/sales_partner/sales_partner.js index 1497eda746..7164add495 100644 --- a/erpnext/setup/doctype/sales_partner/sales_partner.js +++ b/erpnext/setup/doctype/sales_partner/sales_partner.js @@ -23,6 +23,6 @@ frappe.ui.form.on('Sales Partner', { 'fiscal_year': row.fiscal_year } } - } + }; } }); diff --git a/erpnext/setup/doctype/sales_person/sales_person.js b/erpnext/setup/doctype/sales_person/sales_person.js index 0d7deac2af..9ff37fa4e8 100644 --- a/erpnext/setup/doctype/sales_person/sales_person.js +++ b/erpnext/setup/doctype/sales_person/sales_person.js @@ -18,7 +18,7 @@ frappe.ui.form.on('Sales Person', { 'fiscal_year': row.fiscal_year } } - } + }; } }); diff --git a/erpnext/setup/doctype/territory/territory.js b/erpnext/setup/doctype/territory/territory.js index 370a89d497..1eb9958ce7 100644 --- a/erpnext/setup/doctype/territory/territory.js +++ b/erpnext/setup/doctype/territory/territory.js @@ -10,9 +10,9 @@ frappe.ui.form.on("Territory", { 'fiscal_year': row.fiscal_year } } - } + }; } -}) +}); cur_frm.cscript.refresh = function(doc, cdt, cdn) { cur_frm.cscript.set_root_readonly(doc);