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

removed duplicate keys (#13675)

Browse Source
This commit is contained in:
matmyers 2018-04-17 02:50:57 -04:00 committed by Nabin Hait
parent 46743d00d6
commit 742da8cfce
4 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/report/gross_profit/gross_profit.py
View File

@ -25,8 +25,6 @@ def execute(filters=None):
"buying_rate", "base_amount", "buying_amount", "gross_profit", "gross_profit_percent"], "buying_rate", "base_amount", "buying_amount", "gross_profit", "gross_profit_percent"],
"warehouse": ["warehouse", "qty", "base_rate", "buying_rate", "base_amount", "buying_amount", "warehouse": ["warehouse", "qty", "base_rate", "buying_rate", "base_amount", "buying_amount",
"gross_profit", "gross_profit_percent"], "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", "brand": ["brand", "qty", "base_rate", "buying_rate", "base_amount", "buying_amount",
"gross_profit", "gross_profit_percent"], "gross_profit", "gross_profit_percent"],
"item_group": ["item_group", "qty", "base_rate", "buying_rate", "base_amount", "buying_amount", "item_group": ["item_group", "qty", "base_rate", "buying_rate", "base_amount", "buying_amount",

1
erpnext/buying/doctype/purchase_order/purchase_order.py
View File

@ -249,7 +249,6 @@ class PurchaseOrder(BuyingController):
'target_parent_dt': 'Sales Order', 'target_parent_dt': 'Sales Order',
'target_parent_field': '', 'target_parent_field': '',
'join_field': 'sales_order_item', 'join_field': 'sales_order_item',
'source_dt': 'Purchase Order Item',
'target_ref_field': 'stock_qty', 'target_ref_field': 'stock_qty',
'source_field': 'stock_qty' 'source_field': 'stock_qty'
}) })

8
erpnext/config/desktop.py
View File

@ -56,7 +56,6 @@ def get_data():
{ {
"module_name": "Lead", "module_name": "Lead",
"icon": "octicon octicon-broadcast", "icon": "octicon octicon-broadcast",
"type": "module",
"_doctype": "Lead", "_doctype": "Lead",
"type": "link", "type": "link",
"link": "List/Lead" "link": "List/Lead"
@ -81,7 +80,6 @@ def get_data():
{ {
"module_name": "Stock", "module_name": "Stock",
"color": "#f39c12", "color": "#f39c12",
"icon": "fa fa-truck",
"icon": "octicon octicon-package", "icon": "octicon octicon-package",
"type": "module", "type": "module",
"hidden": 1 "hidden": 1
@ -96,7 +94,6 @@ def get_data():
{ {
"module_name": "Selling", "module_name": "Selling",
"color": "#1abc9c", "color": "#1abc9c",
"icon": "fa fa-tag",
"icon": "octicon octicon-tag", "icon": "octicon octicon-tag",
"type": "module", "type": "module",
"hidden": 1 "hidden": 1
@ -104,7 +101,6 @@ def get_data():
{ {
"module_name": "Buying", "module_name": "Buying",
"color": "#c0392b", "color": "#c0392b",
"icon": "fa fa-shopping-cart",
"icon": "octicon octicon-briefcase", "icon": "octicon octicon-briefcase",
"type": "module", "type": "module",
"hidden": 1 "hidden": 1
@ -112,7 +108,6 @@ def get_data():
{ {
"module_name": "HR", "module_name": "HR",
"color": "#2ecc71", "color": "#2ecc71",
"icon": "fa fa-group",
"icon": "octicon octicon-organization", "icon": "octicon octicon-organization",
"label": _("Human Resources"), "label": _("Human Resources"),
"type": "module", "type": "module",
@ -121,7 +116,6 @@ def get_data():
{ {
"module_name": "Manufacturing", "module_name": "Manufacturing",
"color": "#7f8c8d", "color": "#7f8c8d",
"icon": "fa fa-cogs",
"icon": "octicon octicon-tools", "icon": "octicon octicon-tools",
"type": "module", "type": "module",
"hidden": 1 "hidden": 1
@ -145,7 +139,6 @@ def get_data():
{ {
"module_name": "Projects", "module_name": "Projects",
"color": "#8e44ad", "color": "#8e44ad",
"icon": "fa fa-puzzle-piece",
"icon": "octicon octicon-rocket", "icon": "octicon octicon-rocket",
"type": "module", "type": "module",
"hidden": 1 "hidden": 1
@ -153,7 +146,6 @@ def get_data():
{ {
"module_name": "Support", "module_name": "Support",
"color": "#2c3e50", "color": "#2c3e50",
"icon": "fa fa-phone",
"icon": "octicon octicon-issue-opened", "icon": "octicon octicon-issue-opened",
"type": "module", "type": "module",
"hidden": 1 "hidden": 1

11
erpnext/startup/report_data_map.py
View File

@ -97,17 +97,6 @@ data_map = {
"conditions": ["docstatus=1"], "conditions": ["docstatus=1"],
"order_by": "posting_date, posting_time, name", "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": { "Material Request Item": {
"columns": ["item.name as name", "item_code", "warehouse", "columns": ["item.name as name", "item_code", "warehouse",
"(qty - ordered_qty) as qty"], "(qty - ordered_qty) as qty"],