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

feat: validate on hold sales order

Browse Source
This commit is contained in:
Mangesh-Khairnar 2019-03-01 16:37:49 +05:30
parent 602223dd55
commit 1c276e9828
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/stock/doctype/delivery_note/delivery_note.js
View File

@ -140,7 +140,7 @@ erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend(
},
get_query_filters: {
docstatus: 1,
status: ["!=", "Closed"],
status: ["not in", ["Closed", "On Hold"]],
per_delivered: ["<", 99.99],
company: me.frm.doc.company,
project: me.frm.doc.project || undefined,

4
erpnext/stock/doctype/delivery_note/delivery_note.py
View File

@ -103,7 +103,7 @@ class DeliveryNote(SellingController):
self.set_status()
self.so_required()
self.validate_proj_cust()
self.check_close_sales_order("against_sales_order")
self.check_sales_order_on_hold_or_close("against_sales_order")
self.validate_for_items()
self.validate_warehouse()
self.validate_uom_is_integer("stock_uom", "stock_qty")
@ -223,7 +223,7 @@ class DeliveryNote(SellingController):
self.make_gl_entries()
def on_cancel(self):
self.check_close_sales_order("against_sales_order")
self.check_sales_order_on_hold_or_close("against_sales_order")
self.check_next_docstatus()
self.update_prevdoc_status()