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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Ameya Shenoy 2018-05-24 08:45:14 +00:00
commit 95e60927b4
No known key found for this signature in database
GPG Key ID: AC016A555657D0A3
3 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -5,7 +5,7 @@ import frappe
from erpnext.hooks import regional_overrides from erpnext.hooks import regional_overrides
from frappe.utils import getdate from frappe.utils import getdate
__version__ = '10.1.34' __version__ = '10.1.35'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

13
erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js
View File

@ -14,6 +14,19 @@ frappe.query_reports["Itemwise Recommended Reorder Level"] = {
"label": __("To Date"), "label": __("To Date"),
"fieldtype": "Date", "fieldtype": "Date",
"default": frappe.datetime.get_today() "default": frappe.datetime.get_today()
},
{
"fieldname":"item_group",
"label": __("Item Group"),
"fieldtype": "Link",
"options": "Item Group",
"reqd": 1
},
{
"fieldname":"brand",
"label": __("Brand"),
"fieldtype": "Link",
"options": "Brand"
} }
] ]
} }

24
erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py
View File

@ -18,7 +18,7 @@ def execute(filters=None):
frappe.throw(_("'From Date' must be after 'To Date'")) frappe.throw(_("'From Date' must be after 'To Date'"))
columns = get_columns() columns = get_columns()
items = get_item_info() items = get_item_info(filters)
consumed_item_map = get_consumed_items(condition) consumed_item_map = get_consumed_items(condition)
delivered_item_map = get_delivered_items(condition) delivered_item_map = get_delivered_items(condition)
@ -28,23 +28,31 @@ def execute(filters=None):
avg_daily_outgoing = flt(total_outgoing / diff, float_preceision) avg_daily_outgoing = flt(total_outgoing / diff, float_preceision)
reorder_level = (avg_daily_outgoing * flt(item.lead_time_days)) + flt(item.safety_stock) reorder_level = (avg_daily_outgoing * flt(item.lead_time_days)) + flt(item.safety_stock)
data.append([item.name, item.item_name, item.description, item.safety_stock, item.lead_time_days, data.append([item.name, item.item_name, item.item_group, item.brand, item.description,
consumed_item_map.get(item.name, 0), delivered_item_map.get(item.name,0), total_outgoing, item.safety_stock, item.lead_time_days, consumed_item_map.get(item.name, 0),
avg_daily_outgoing, reorder_level]) delivered_item_map.get(item.name,0), total_outgoing, avg_daily_outgoing, reorder_level])
return columns , data return columns , data
def get_columns(): def get_columns():
return[ return[
_("Item") + ":Link/Item:120", _("Item Name") + ":Data:120", _("Description") + "::160", _("Item") + ":Link/Item:120", _("Item Name") + ":Data:120", _("Item Group") + ":Link/Item Group:100",
_("Brand") + ":Link/Brand:100", _("Description") + "::160",
_("Safety Stock") + ":Float:160", _("Lead Time Days") + ":Float:120", _("Consumed") + ":Float:120", _("Safety Stock") + ":Float:160", _("Lead Time Days") + ":Float:120", _("Consumed") + ":Float:120",
_("Delivered") + ":Float:120", _("Total Outgoing") + ":Float:120", _("Avg Daily Outgoing") + ":Float:160", _("Delivered") + ":Float:120", _("Total Outgoing") + ":Float:120", _("Avg Daily Outgoing") + ":Float:160",
_("Reorder Level") + ":Float:120" _("Reorder Level") + ":Float:120"
] ]
def get_item_info(): def get_item_info(filters):
return frappe.db.sql("""select name, item_name, description, safety_stock, from erpnext.stock.report.stock_ledger.stock_ledger import get_item_group_condition
lead_time_days from tabItem""", as_dict=1) conditions = [get_item_group_condition(filters.get("item_group"))]
if filters.get("brand"):
conditions.append("item.brand=%(brand)s")
return frappe.db.sql("""select name, item_name, description, brand, item_group,
safety_stock, lead_time_days from `tabItem` item where {}"""
.format(" and ".join(conditions)), filters, as_dict=1)
def get_consumed_items(condition): def get_consumed_items(condition):
cn_items = frappe.db.sql("""select se_item.item_code, cn_items = frappe.db.sql("""select se_item.item_code,