nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-24 07:29:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolved merge conflict

Browse Source
This commit is contained in:
Saurabh
2018-06-20 15:23:25 +05:30
parent c1030a3958 e6498996fa
commit 59798b4e88
11 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/controllers/buying_controller.py
View File

@@ -664,6 +664,7 @@ class BuyingController(StockController):
def validate_items(self):
# validate items to see if they have is_purchase_item or is_subcontracted_item enabled
if self.doctype=="Material Request": return
if hasattr(self, "is_subcontracted") and self.is_subcontracted == 'Yes':
validate_item_type(self, "is_sub_contracted_item", "subcontracted")