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

Merge branch 'develop' of https://github.com/frappe/erpnext into hub-multiuser

Browse Source
This commit is contained in:
Prateeksha Singh 2018-09-02 19:46:30 +05:30
commit 2cf52e53dd
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/manufacturing/doctype/bom/bom.py
View File

@ -535,7 +535,7 @@ def get_list_context(context):
context.title = _("Bill of Materials") context.title = _("Bill of Materials")
# context.introduction = _('Boms') # context.introduction = _('Boms')
def get_bom_items_as_dict(bom, company, qty=1, fetch_exploded=1, fetch_scrap_items=0): def get_bom_items_as_dict(bom, company, qty=1, fetch_exploded=1, fetch_scrap_items=0, include_non_stock_items=False):
item_dict = {} item_dict = {}
# Did not use qty_consumed_per_unit in the query, as it leads to rounding loss # Did not use qty_consumed_per_unit in the query, as it leads to rounding loss
@ -561,22 +561,25 @@ def get_bom_items_as_dict(bom, company, qty=1, fetch_exploded=1, fetch_scrap_ite
where where
bom_item.docstatus < 2 bom_item.docstatus < 2
and bom.name = %(bom)s and bom.name = %(bom)s
and item.is_stock_item in (1, {is_stock_item})
{where_conditions} {where_conditions}
group by item_code, stock_uom group by item_code, stock_uom
order by idx""" order by idx"""
is_stock_item = 0 if include_non_stock_items else 1
if cint(fetch_exploded): if cint(fetch_exploded):
query = query.format(table="BOM Explosion Item", query = query.format(table="BOM Explosion Item",
where_conditions="", where_conditions="",
is_stock_item=is_stock_item,
select_columns = """, bom_item.source_warehouse, bom_item.allow_transfer_for_manufacture, select_columns = """, bom_item.source_warehouse, bom_item.allow_transfer_for_manufacture,
(Select idx from `tabBOM Item` where item_code = bom_item.item_code and parent = %(parent)s ) as idx""") (Select idx from `tabBOM Item` where item_code = bom_item.item_code and parent = %(parent)s ) as idx""")
items = frappe.db.sql(query, { "parent": bom, "qty": qty, "bom": bom, "company": company }, as_dict=True) items = frappe.db.sql(query, { "parent": bom, "qty": qty, "bom": bom, "company": company }, as_dict=True)
elif fetch_scrap_items: elif fetch_scrap_items:
query = query.format(table="BOM Scrap Item", where_conditions="", select_columns=", bom_item.idx") query = query.format(table="BOM Scrap Item", where_conditions="", select_columns=", bom_item.idx", is_stock_item=is_stock_item)
items = frappe.db.sql(query, { "qty": qty, "bom": bom, "company": company }, as_dict=True) items = frappe.db.sql(query, { "qty": qty, "bom": bom, "company": company }, as_dict=True)
else: else:
query = query.format(table="BOM Item", where_conditions="", query = query.format(table="BOM Item", where_conditions="", is_stock_item=is_stock_item,
select_columns = ", bom_item.source_warehouse, bom_item.idx, bom_item.allow_transfer_for_manufacture") select_columns = ", bom_item.source_warehouse, bom_item.idx, bom_item.allow_transfer_for_manufacture")
items = frappe.db.sql(query, { "qty": qty, "bom": bom, "company": company }, as_dict=True) items = frappe.db.sql(query, { "qty": qty, "bom": bom, "company": company }, as_dict=True)
@ -597,7 +600,7 @@ def get_bom_items_as_dict(bom, company, qty=1, fetch_exploded=1, fetch_scrap_ite
@frappe.whitelist() @frappe.whitelist()
def get_bom_items(bom, company, qty=1, fetch_exploded=1): def get_bom_items(bom, company, qty=1, fetch_exploded=1):
items = get_bom_items_as_dict(bom, company, qty, fetch_exploded).values() items = get_bom_items_as_dict(bom, company, qty, fetch_exploded, include_non_stock_items=True).values()
items = list(items) items = list(items)
items.sort(key = functools.cmp_to_key(lambda a, b: a.item_code > b.item_code and 1 or -1)) items.sort(key = functools.cmp_to_key(lambda a, b: a.item_code > b.item_code and 1 or -1))
return items return items

2
erpnext/tests/test_woocommerce.py
View File

@ -2,7 +2,7 @@ import unittest, frappe, requests, os, time, erpnext
from erpnext.erpnext_integrations.connectors.woocommerce_connection import order from erpnext.erpnext_integrations.connectors.woocommerce_connection import order
class TestWoocommerce(unittest.TestCase): class TestWoocommerce(unittest.TestCase):
def setup(self): def setUp(self):
if not frappe.db.exists('Company', 'Woocommerce'): if not frappe.db.exists('Company', 'Woocommerce'):
company = frappe.new_doc("Company") company = frappe.new_doc("Company")
company.company_name = "Woocommerce" company.company_name = "Woocommerce"