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

Minor code cleanups in stock balance report

Browse Source
This commit is contained in:
Nabin Hait 2017-11-15 14:43:06 +05:30
parent b9e44217a2
commit 78ab8235f6
2 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/stock/report/stock_balance/stock_balance.js
View File

@ -41,8 +41,8 @@ frappe.query_reports["Stock Balance"] = {
"options": "Warehouse" "options": "Warehouse"
}, },
{ {
"fieldname": "show_variants", "fieldname": "show_variant_attributes",
"label": __("Show Variants"), "label": __("Show Variant Attributes"),
"fieldtype": "Check" "fieldtype": "Check"
}, },
] ]

53
erpnext/stock/report/stock_balance/stock_balance.py
View File

@ -37,17 +37,18 @@ def execute(filters=None):
qty_dict.bal_val, qty_dict.val_rate, qty_dict.bal_val, qty_dict.val_rate,
item_reorder_level, item_reorder_level,
item_reorder_qty, item_reorder_qty,
company, company
] ]
if filters.get('show_variants',0) == 1: if filters.get('show_variant_attributes', 0) == 1:
variants_attributes = get_variants_attributes() variants_attributes = get_variants_attributes()
report_data += [item_map[item][i] for i in variants_attributes] report_data += [item_map[item].get(i) for i in variants_attributes]
data.append(report_data) data.append(report_data)
if filters.get('show_variants',0) == 1: if filters.get('show_variant_attributes', 0) == 1:
columns += ["{}:Data:100".format(i) for i in get_variants_attributes()] columns += ["{}:Data:100".format(i) for i in get_variants_attributes()]
return columns, data return columns, data
def get_columns(): def get_columns():
@ -72,8 +73,7 @@ def get_columns():
_("Valuation Rate")+":Float:90", _("Valuation Rate")+":Float:90",
_("Reorder Level")+":Float:80", _("Reorder Level")+":Float:80",
_("Reorder Qty")+":Float:80", _("Reorder Qty")+":Float:80",
_("Company")+":Link/Company:100", _("Company")+":Link/Company:100"
] ]
return columns return columns
@ -198,12 +198,18 @@ def get_item_details(filters):
condition = "where item_code=%s" condition = "where item_code=%s"
value = (filters.get("item_code"),) value = (filters.get("item_code"),)
items = frappe.db.sql("""select name, item_name, stock_uom, item_group, brand, description items = frappe.db.sql("""
from tabItem {condition}""".format(condition=condition), value, as_dict=1) select name, item_name, stock_uom, item_group, brand, description
from tabItem
{condition}
""".format(condition=condition), value, as_dict=1)
item_details = dict((d.name , d) for d in items) item_details = dict((d.name , d) for d in items)
if filters.get('show_variants',0) == 1:
variant_values = get_variant_values_for_(item_details.keys()) if filters.get('show_variant_attributes', 0) == 1:
item_details = {k:v.update(variant_values[k]) for k,v in item_details.iteritems()} variant_values = get_variant_values_for(item_details.keys())
item_details = {k: v.update(variant_values.get(k, {})) for k, v in item_details.iteritems()}
return item_details return item_details
def get_item_reorder_details(filters): def get_item_reorder_details(filters):
@ -213,8 +219,11 @@ def get_item_reorder_details(filters):
condition = "where parent=%s" condition = "where parent=%s"
value = (filters.get("item_code"),) value = (filters.get("item_code"),)
item_reorder_details = frappe.db.sql("""select parent,warehouse,warehouse_reorder_qty,warehouse_reorder_level item_reorder_details = frappe.db.sql("""
from `tabItem Reorder` {condition}""".format(condition=condition), value, as_dict=1) select parent, warehouse, warehouse_reorder_qty, warehouse_reorder_level
from `tabItem Reorder`
{condition}
""".format(condition=condition), value, as_dict=1)
return dict((d.parent + d.warehouse, d) for d in item_reorder_details) return dict((d.parent + d.warehouse, d) for d in item_reorder_details)
@ -230,13 +239,13 @@ def get_variants_attributes():
return [i.name for i in frappe.get_all('Item Attribute')] return [i.name for i in frappe.get_all('Item Attribute')]
def get_variant_values_for_(items): def get_variant_values_for(items):
'''Returns variant values for items.''' '''Returns variant values for items.'''
attribute_map = {} attribute_map = {}
for attr in frappe.db.sql('''select parent, attribute, for attr in frappe.db.sql('''select parent, attribute, attribute_value
attribute_value from `tabItem Variant Attribute` from `tabItem Variant Attribute` where parent in (%s)
where parent in (%s); ''' % ", ".join(["%s"] * len(items)), tuple(items), as_dict=1):
''' % ", ".join(["%s"] * len(items)), tuple(items), as_dict=1): attribute_map.setdefault(attr['parent'], {})
attribute_map.setdefault(attr['parent'], {}) attribute_map[attr['parent']].update({attr['attribute']: attr['attribute_value']})
attribute_map[attr['parent']].update({attr['attribute']:attr['attribute_value']})
return attribute_map return attribute_map