From 742da8cfceacd14b1dc6deb9f81f773d1106dc57 Mon Sep 17 00:00:00 2001 From: matmyers <30908754+matmyers@users.noreply.github.com> Date: Tue, 17 Apr 2018 02:50:57 -0400 Subject: [PATCH] removed duplicate keys (#13675) --- erpnext/accounts/report/gross_profit/gross_profit.py | 2 -- .../buying/doctype/purchase_order/purchase_order.py | 1 - erpnext/config/desktop.py | 8 -------- erpnext/startup/report_data_map.py | 11 ----------- 4 files changed, 22 deletions(-) diff --git a/erpnext/accounts/report/gross_profit/gross_profit.py b/erpnext/accounts/report/gross_profit/gross_profit.py index fe3bb8cd4cc..772d4f88710 100644 --- a/erpnext/accounts/report/gross_profit/gross_profit.py +++ b/erpnext/accounts/report/gross_profit/gross_profit.py @@ -25,8 +25,6 @@ def execute(filters=None): "buying_rate", "base_amount", "buying_amount", "gross_profit", "gross_profit_percent"], "warehouse": ["warehouse", "qty", "base_rate", "buying_rate", "base_amount", "buying_amount", "gross_profit", "gross_profit_percent"], - "territory": ["territory", "qty", "base_rate", "buying_rate", "base_amount", "buying_amount", - "gross_profit", "gross_profit_percent"], "brand": ["brand", "qty", "base_rate", "buying_rate", "base_amount", "buying_amount", "gross_profit", "gross_profit_percent"], "item_group": ["item_group", "qty", "base_rate", "buying_rate", "base_amount", "buying_amount", diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py index 14fb0e0c207..cce5d194119 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.py +++ b/erpnext/buying/doctype/purchase_order/purchase_order.py @@ -249,7 +249,6 @@ class PurchaseOrder(BuyingController): 'target_parent_dt': 'Sales Order', 'target_parent_field': '', 'join_field': 'sales_order_item', - 'source_dt': 'Purchase Order Item', 'target_ref_field': 'stock_qty', 'source_field': 'stock_qty' }) diff --git a/erpnext/config/desktop.py b/erpnext/config/desktop.py index b0af397e89a..13f9348ecf2 100644 --- a/erpnext/config/desktop.py +++ b/erpnext/config/desktop.py @@ -56,7 +56,6 @@ def get_data(): { "module_name": "Lead", "icon": "octicon octicon-broadcast", - "type": "module", "_doctype": "Lead", "type": "link", "link": "List/Lead" @@ -81,7 +80,6 @@ def get_data(): { "module_name": "Stock", "color": "#f39c12", - "icon": "fa fa-truck", "icon": "octicon octicon-package", "type": "module", "hidden": 1 @@ -96,7 +94,6 @@ def get_data(): { "module_name": "Selling", "color": "#1abc9c", - "icon": "fa fa-tag", "icon": "octicon octicon-tag", "type": "module", "hidden": 1 @@ -104,7 +101,6 @@ def get_data(): { "module_name": "Buying", "color": "#c0392b", - "icon": "fa fa-shopping-cart", "icon": "octicon octicon-briefcase", "type": "module", "hidden": 1 @@ -112,7 +108,6 @@ def get_data(): { "module_name": "HR", "color": "#2ecc71", - "icon": "fa fa-group", "icon": "octicon octicon-organization", "label": _("Human Resources"), "type": "module", @@ -121,7 +116,6 @@ def get_data(): { "module_name": "Manufacturing", "color": "#7f8c8d", - "icon": "fa fa-cogs", "icon": "octicon octicon-tools", "type": "module", "hidden": 1 @@ -145,7 +139,6 @@ def get_data(): { "module_name": "Projects", "color": "#8e44ad", - "icon": "fa fa-puzzle-piece", "icon": "octicon octicon-rocket", "type": "module", "hidden": 1 @@ -153,7 +146,6 @@ def get_data(): { "module_name": "Support", "color": "#2c3e50", - "icon": "fa fa-phone", "icon": "octicon octicon-issue-opened", "type": "module", "hidden": 1 diff --git a/erpnext/startup/report_data_map.py b/erpnext/startup/report_data_map.py index d127065f66f..daf6fdd3bd5 100644 --- a/erpnext/startup/report_data_map.py +++ b/erpnext/startup/report_data_map.py @@ -97,17 +97,6 @@ data_map = { "conditions": ["docstatus=1"], "order_by": "posting_date, posting_time, name", }, - "Work Order": { - "columns": ["name", "production_item as item_code", - "(qty - produced_qty) as qty", - "fg_warehouse as warehouse"], - "conditions": ["docstatus=1", "status != 'Stopped'", "ifnull(fg_warehouse, '')!=''", - "qty > produced_qty"], - "links": { - "item_code": ["Item", "name"], - "warehouse": ["Warehouse", "name"] - }, - }, "Material Request Item": { "columns": ["item.name as name", "item_code", "warehouse", "(qty - ordered_qty) as qty"],