nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-04 12:49:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: sales order reqd only checks for stock items (#19865)

Browse Source
This commit is contained in:
Saqib
2019-12-09 17:23:19 +05:30
committed by Nabin Hait
parent 4350846f1e
commit 7e958da6d6
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
View File

@@ -535,10 +535,8 @@ class SalesInvoice(SellingController):
for i in dic: for i in dic:
if frappe.db.get_single_value('Selling Settings', dic[i][0]) == 'Yes': if frappe.db.get_single_value('Selling Settings', dic[i][0]) == 'Yes':
for d in self.get('items'): for d in self.get('items'):
is_stock_item = frappe.get_cached_value('Item', d.item_code, 'is_stock_item') if (d.item_code and not d.get(i.lower().replace(' ','_')) and not self.get(dic[i][1])):
if (d.item_code and is_stock_item == 1\ msgprint(_("{0} is mandatory for Item {1}").format(i,d.item_code), raise_exception=1)
and not d.get(i.lower().replace(' ','_')) and not self.get(dic[i][1])):
msgprint(_("{0} is mandatory for Stock Item {1}").format(i,d.item_code), raise_exception=1)
def validate_proj_cust(self): def validate_proj_cust(self):

3
erpnext/selling/doctype/selling_settings/selling_settings.json
View File

@@ -77,7 +77,6 @@
"fieldtype": "Column Break" "fieldtype": "Column Break"
}, },
{ {
"description": "Only for Stock Items",
"fieldname": "so_required", "fieldname": "so_required",
"fieldtype": "Select", "fieldtype": "Select",
"label": "Sales Order Required", "label": "Sales Order Required",
@@ -138,7 +137,7 @@
"icon": "fa fa-cog", "icon": "fa fa-cog",
"idx": 1, "idx": 1,
"issingle": 1, "issingle": 1,
"modified": "2019-11-25 18:35:51.472653", "modified": "2019-12-09 13:38:36.486298",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Selling Settings", "name": "Selling Settings",