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

fix: alternative item not working for subcontract (#22386)

Browse Source 
(cherry picked from commit 171699537c3e7d7632f45123c6d30012c8de7281)

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
This commit is contained in:
mergify[bot] 2020-06-23 10:42:32 +05:30 committed by GitHub
parent 3dee5273d6
commit ca8894b0fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@ -574,9 +574,7 @@ class StockEntry(StockController):
{"parent": self.purchase_order, "item_code": se_item.subcontracted_item}, {"parent": self.purchase_order, "item_code": se_item.subcontracted_item},
"bom") "bom")
allow_alternative_item = frappe.get_value("BOM", bom_no, "allow_alternative_item") if se_item.allow_alternative_item:
if allow_alternative_item:
original_item_code = frappe.get_value("Item Alternative", {"alternative_item_code": item_code}, "item_code") original_item_code = frappe.get_value("Item Alternative", {"alternative_item_code": item_code}, "item_code")
required_qty = sum([flt(d.required_qty) for d in purchase_order.supplied_items \ required_qty = sum([flt(d.required_qty) for d in purchase_order.supplied_items \
@ -743,7 +741,7 @@ class StockEntry(StockController):
def get_item_details(self, args=None, for_update=False): def get_item_details(self, args=None, for_update=False):
item = frappe.db.sql("""select i.name, i.stock_uom, i.description, i.image, i.item_name, i.item_group, item = frappe.db.sql("""select i.name, i.stock_uom, i.description, i.image, i.item_name, i.item_group,
i.has_batch_no, i.sample_quantity, i.has_serial_no, i.has_batch_no, i.sample_quantity, i.has_serial_no, i.allow_alternative_item,
id.expense_account, id.buying_cost_center id.expense_account, id.buying_cost_center
from `tabItem` i LEFT JOIN `tabItem Default` id ON i.name=id.parent and id.company=%s from `tabItem` i LEFT JOIN `tabItem Default` id ON i.name=id.parent and id.company=%s
where i.name=%s where i.name=%s
@ -778,6 +776,9 @@ class StockEntry(StockController):
'expense_account' : item.expense_account 'expense_account' : item.expense_account
}) })
if self.purpose == 'Send to Subcontractor':
ret["allow_alternative_item"] = item.allow_alternative_item
# update uom # update uom
if args.get("uom") and for_update: if args.get("uom") and for_update:
ret.update(get_uom_details(args.get('item_code'), args.get('uom'), args.get('qty'))) ret.update(get_uom_details(args.get('item_code'), args.get('uom'), args.get('qty')))