Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

renamed report

Browse Source
This commit is contained in:
Rohit Waghchaure 2019-03-25 22:25:38 +05:30
parent 1c1d0bb1c7
commit 4ae221946b
22 changed files with 49 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/patches.txt
View File

@ -591,4 +591,4 @@ erpnext.patches.v12_0.add_item_name_in_work_orders
erpnext.patches.v12_0.update_pricing_rule_fields erpnext.patches.v12_0.update_pricing_rule_fields
erpnext.patches.v11_1.make_job_card_time_logs erpnext.patches.v11_1.make_job_card_time_logs
erpnext.patches.v12_0.rename_pricing_rule_child_doctypes 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

6
erpnext/patches/v12_0/move_target_distribution_from_parent_to_child.py
View File

@ -15,4 +15,8 @@ def execute():
WHERE WHERE
`tab{child_doc}`.parent = `tab{parent_doc}`.name `tab{child_doc}`.parent = `tab{parent_doc}`.name
and `tab{parent_doc}`.distribution_id is not null and `tab{parent_doc}`.distribution_id != '' and `tab{parent_doc}`.distribution_id is not null and `tab{parent_doc}`.distribution_id != ''
""".format(parent_doc = d, child_doc = "Target Detail")) """.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")

0
erpnext/selling/report/sales_partner_target_variance_item_group_wise/__init__.py → erpnext/selling/report/sales_partner_target_variance_based_on_item_group/__init__.py
View File

2
erpnext/selling/report/sales_partner_target_variance_item_group_wise/item_group_wise_sales_target_variance.py → erpnext/selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py
View File

@ -195,7 +195,7 @@ def get_actual_data(filters, item_groups, sales_users_or_territory_data, date_fi
parent_doc = filters.get("doctype"), parent_doc = filters.get("doctype"),
child_doc = filters.get("doctype") + ' Item', child_doc = filters.get("doctype") + ' Item',
item_groups = ','.join(['%s'] * len(item_groups)) 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): def get_parents_data(filters, partner_doctype):
filters_dict = {'parenttype': partner_doctype} filters_dict = {'parenttype': partner_doctype}

7
erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.js → erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js
View File

@ -1,7 +1,8 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// License: GNU General Public License v3. See license.txt // 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": [ "filters": [
{ {
fieldname:"company", fieldname:"company",

14
erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.json → erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.json
View File

@ -1,19 +1,21 @@
{ {
"add_total_row": 0, "add_total_row": 0,
"apply_user_permissions": 1, "creation": "2019-03-25 18:22:37.323995",
"creation": "2013-06-21 12:15:00", "disable_prepared_report": 0,
"disabled": 0, "disabled": 0,
"docstatus": 0, "docstatus": 0,
"doctype": "Report", "doctype": "Report",
"idx": 3, "idx": 0,
"is_standard": "Yes", "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", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Territory Target Variance Item Group-Wise", "name": "Sales Partner Target Variance based on Item Group",
"owner": "Administrator", "owner": "Administrator",
"prepared_report": 0,
"ref_doctype": "Sales Order", "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", "report_type": "Script Report",
"roles": [ "roles": [
{ {

2
erpnext/selling/report/sales_partner_target_variance_item_group_wise/sales_partner_target_variance_item_group_wise.py → erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.py
View File

@ -3,7 +3,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe 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): def execute(filters=None):
data = [] data = []

0
erpnext/selling/report/sales_partner_wise_transaction_summary/__init__.py → erpnext/selling/report/sales_partner_transaction_summary/__init__.py
View File

2
erpnext/selling/report/sales_partner_wise_transaction_summary/sales_partner_wise_transaction_summary.js → erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js
View File

@ -2,7 +2,7 @@
// For license information, please see license.txt // For license information, please see license.txt
/* eslint-disable */ /* eslint-disable */
frappe.query_reports["Sales Partner-wise Transaction Summary"] = { frappe.query_reports["Sales Partner Transaction Summary"] = {
"filters": [ "filters": [
{ {
fieldname: "sales_partner", fieldname: "sales_partner",

8
erpnext/selling/report/sales_partner_wise_transaction_summary/sales_partner_wise_transaction_summary.json → erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.json
View File

@ -1,6 +1,6 @@
{ {
"add_total_row": 1, "add_total_row": 1,
"creation": "2019-03-15 16:21:16.088831", "creation": "2019-03-25 18:15:09.920739",
"disable_prepared_report": 0, "disable_prepared_report": 0,
"disabled": 0, "disabled": 0,
"docstatus": 0, "docstatus": 0,
@ -8,14 +8,14 @@
"idx": 0, "idx": 0,
"is_standard": "Yes", "is_standard": "Yes",
"letter_head": "Gadgets International", "letter_head": "Gadgets International",
"modified": "2019-03-15 16:21:16.088831", "modified": "2019-03-25 18:15:09.920739",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Sales Partner-wise Transaction Summary", "name": "Sales Partner Transaction Summary",
"owner": "Administrator", "owner": "Administrator",
"prepared_report": 0, "prepared_report": 0,
"ref_doctype": "Sales Order", "ref_doctype": "Sales Order",
"report_name": "Sales Partner-wise Transaction Summary", "report_name": "Sales Partner Transaction Summary",
"report_type": "Script Report", "report_type": "Script Report",
"roles": [ "roles": [
{ {

0
erpnext/selling/report/sales_partner_wise_transaction_summary/sales_partner_wise_transaction_summary.py → erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py
View File

0
erpnext/selling/report/sales_person_target_variance_item_group_wise/__init__.py → erpnext/selling/report/sales_person_target_variance_based_on_item_group/__init__.py
View File

7
erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js → erpnext/selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js
View File

@ -1,7 +1,8 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// License: GNU General Public License v3. See license.txt // 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": [ "filters": [
{ {
fieldname:"company", fieldname:"company",

14
erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.json → erpnext/selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.json
View File

@ -1,19 +1,21 @@
{ {
"add_total_row": 0, "add_total_row": 0,
"apply_user_permissions": 1, "creation": "2019-03-25 22:16:49.040998",
"creation": "2013-06-21 12:14:15", "disable_prepared_report": 0,
"disabled": 0, "disabled": 0,
"docstatus": 0, "docstatus": 0,
"doctype": "Report", "doctype": "Report",
"idx": 3, "idx": 0,
"is_standard": "Yes", "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", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Sales Person Target Variance Item Group-Wise", "name": "Sales Person Target Variance Based On Item Group",
"owner": "Administrator", "owner": "Administrator",
"prepared_report": 0,
"ref_doctype": "Sales Order", "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", "report_type": "Script Report",
"roles": [ "roles": [
{ {

5
erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py → erpnext/selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.py
View File

@ -3,10 +3,9 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe 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): def execute(filters=None):
data = [] data = []
return get_data_column(filters, "Sales Person") return get_data_column(filters, "Sales Person")

0
erpnext/selling/report/territory_target_variance_item_group_wise/__init__.py → erpnext/selling/report/territory_target_variance_based_on_item_group/__init__.py
View File

2
erpnext/selling/report/sales_partner_target_variance_item_group_wise/sales_partner_target_variance_item_group_wise.js → erpnext/selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js
View File

@ -2,7 +2,7 @@
// For license information, please see license.txt // For license information, please see license.txt
/* eslint-disable */ /* eslint-disable */
frappe.query_reports["Sales Partner Target Variance Item Group-Wise"] = { frappe.query_reports["Territory Target Variance Based On Item Group"] = {
"filters": [ "filters": [
{ {
fieldname:"company", fieldname:"company",

8
erpnext/selling/report/sales_partner_target_variance_item_group_wise/sales_partner_target_variance_item_group_wise.json → erpnext/selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.json
View File

@ -1,6 +1,6 @@
{ {
"add_total_row": 0, "add_total_row": 0,
"creation": "2019-03-15 17:42:00.631020", "creation": "2019-03-25 22:20:59.033199",
"disable_prepared_report": 0, "disable_prepared_report": 0,
"disabled": 0, "disabled": 0,
"docstatus": 0, "docstatus": 0,
@ -8,14 +8,14 @@
"idx": 0, "idx": 0,
"is_standard": "Yes", "is_standard": "Yes",
"letter_head": "Gadgets International", "letter_head": "Gadgets International",
"modified": "2019-03-15 17:42:00.631020", "modified": "2019-03-25 22:20:59.033199",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Sales Partner Target Variance Item Group-Wise", "name": "Territory Target Variance Based On Item Group",
"owner": "Administrator", "owner": "Administrator",
"prepared_report": 0, "prepared_report": 0,
"ref_doctype": "Sales Order", "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", "report_type": "Script Report",
"roles": [ "roles": [
{ {

3
erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py → erpnext/selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.py
View File

@ -3,10 +3,9 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe 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): def execute(filters=None):
data = [] data = []
return get_data_column(filters, "Territory") return get_data_column(filters, "Territory")

2
erpnext/setup/doctype/sales_partner/sales_partner.js
View File

@ -23,6 +23,6 @@ frappe.ui.form.on('Sales Partner', {
'fiscal_year': row.fiscal_year 'fiscal_year': row.fiscal_year
} }
} }
} };
} }
}); });

2
erpnext/setup/doctype/sales_person/sales_person.js
View File

@ -18,7 +18,7 @@ frappe.ui.form.on('Sales Person', {
'fiscal_year': row.fiscal_year 'fiscal_year': row.fiscal_year
} }
} }
} };
} }
}); });

4
erpnext/setup/doctype/territory/territory.js
View File

@ -10,9 +10,9 @@ frappe.ui.form.on("Territory", {
'fiscal_year': row.fiscal_year 'fiscal_year': row.fiscal_year
} }
} }
} };
} }
}) });
cur_frm.cscript.refresh = function(doc, cdt, cdn) { cur_frm.cscript.refresh = function(doc, cdt, cdn) {
cur_frm.cscript.set_root_readonly(doc); cur_frm.cscript.set_root_readonly(doc);