nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 03:09:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove unused func, sider fixes

Browse Source
This commit is contained in:
18alantom
2021-06-25 16:11:17 +05:30
parent 6f79c4c348
commit 98c9b0e9ed
2 changed files with 15 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
erpnext/stock/report/cogs_by_item_group/cogs_by_item_group.js
View File

@@ -11,24 +11,8 @@ frappe.query_reports["COGS By Item Group"] = {
fieldtype: "Link", fieldtype: "Link",
options: "Company", options: "Company",
mandatory: true, mandatory: true,
default: frappe.defaults.get_user_default("Company"), default: frappe.defaults.get_user_default("Company"),
}, },
// {
// label: __("Account"),
// fieldname: "account",
// fieldtype: "Link",
// options: "Account",
// mandatory: true,
// get_query() {
// const company = frappe.query_report.get_filter_value('company');
// return {
// "doctype": "Account",
// "filters": {
// "company": company,
// }
// }
// },
// },
{ {
label: __("From Date"), label: __("From Date"),
fieldname: "from_date", fieldname: "from_date",

30
erpnext/stock/report/cogs_by_item_group/cogs_by_item_group.py
View File

@@ -52,13 +52,13 @@ def get_data(filters):
assign_agg_values(leveled_dict) assign_agg_values(leveled_dict)
data = [] data = []
for _, i in leveled_dict.items(): for item in leveled_dict.items():
i = item[1]
if i['agg_value'] == 0: if i['agg_value'] == 0:
continue continue
data.append(get_row(i['name'], i['agg_value'], i['is_group'], i['level'])) data.append(get_row(i['name'], i['agg_value'], i['is_group'], i['level']))
if i['self_value'] < i['agg_value'] and i['self_value'] > 0: if i['self_value'] < i['agg_value'] and i['self_value'] > 0:
data.append(get_row(i['name'], i['self_value'], 0, i['level'] + 1)) data.append(get_row(i['name'], i['self_value'], 0, i['level'] + 1))
# append_blank()
return data return data
@@ -76,9 +76,10 @@ def get_filtered_entries(filters):
def get_stock_value_difference_list(filtered_entries): def get_stock_value_difference_list(filtered_entries):
voucher_nos = [fe.get('voucher_no') for fe in filtered_entries] voucher_nos = [fe.get('voucher_no') for fe in filtered_entries]
svd_list = frappe.get_list('Stock Ledger Entry', svd_list = frappe.get_list(
fields=['item_code','stock_value_difference'], 'Stock Ledger Entry', fields=['item_code','stock_value_difference'],
filters=[('voucher_no', 'in', voucher_nos)]) filters=[('voucher_no', 'in', voucher_nos)]
)
assign_item_groups_to_svd_list(svd_list) assign_item_groups_to_svd_list(svd_list)
return svd_list return svd_list
@@ -155,22 +156,19 @@ def assign_item_groups_to_svd_list(svd_list):
def get_item_groups_map(svd_list): def get_item_groups_map(svd_list):
# for items in svd_list: [{'item_code':'item_group'}] # for items in svd_list: [{'item_code':'item_group'}]
item_codes = set([i['item_code'] for i in svd_list]) item_codes = set([i['item_code'] for i in svd_list])
ig_list = frappe.get_list('Item', ig_list = frappe.get_list(
fields=['item_code','item_group'], 'Item', fields=['item_code','item_group'],
filters=[('item_code', 'in', item_codes)]) filters=[('item_code', 'in', item_codes)]
)
return {i['item_code']:i['item_group'] for i in ig_list} return {i['item_code']:i['item_group'] for i in ig_list}
def append_blank(data):
if len(data) == 0:
data.append(get_row("", 0, 0, 0))
def get_item_groups_dict(): def get_item_groups_dict():
item_groups_list = frappe.get_all("Item Group", fields=("name", "is_group", "lft", "rgt")) item_groups_list = frappe.get_all("Item Group", fields=("name", "is_group", "lft", "rgt"))
return { (i['lft'],i['rgt']):{'name':i['name'], 'is_group':i['is_group']} return {(i['lft'],i['rgt']):{'name':i['name'], 'is_group':i['is_group']}
for i in item_groups_list } for i in item_groups_list}
def update_leveled_dict(leveled_dict): def update_leveled_dict(leveled_dict):
for k in leveled_dict: leveled_dict[k].update({'self_value':0, 'agg_value':0}) for k in leveled_dict:
leveled_dict[k].update({'self_value':0, 'agg_value':0})