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

fix: Allow return if delivery note or sales order is required in selling settings(v12) (#17631)

Browse Source 
* fix: Allow retrun if delivery note or sales order is required in selling settings

* fix: combined condition

* style: refactor
This commit is contained in:
Anurag Mishra 2019-05-18 13:03:08 +05:30 committed by Nabin Hait
parent 249d47cd1c
commit fc86df6453
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -501,12 +501,15 @@ class SalesInvoice(SellingController):
def so_dn_required(self): def so_dn_required(self):
"""check in manage account if sales order / delivery note required or not.""" """check in manage account if sales order / delivery note required or not."""
if self.is_return:
return
dic = {'Sales Order':['so_required', 'is_pos'],'Delivery Note':['dn_required', 'update_stock']} dic = {'Sales Order':['so_required', 'is_pos'],'Delivery Note':['dn_required', 'update_stock']}
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'):
if (d.item_code and frappe.get_cached_value('Item', d.item_code, 'is_stock_item') == 1 is_stock_item = frappe.get_cached_value('Item', d.item_code, 'is_stock_item')
and not d.get(i.lower().replace(' ','_')) and not self.get(dic[i][1])): if d.item_code and is_stock_item == 1\
and not d.get(i.lower().replace(' ','_')) and not self.get(dic[i][1]):
msgprint(_("{0} is mandatory for Item {1}").format(i,d.item_code), raise_exception=1) msgprint(_("{0} is mandatory for Item {1}").format(i,d.item_code), raise_exception=1)