fix: payment entry can be created against on hold PI (#20270)
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
index 643de7d..c5c5483 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
@@ -167,9 +167,16 @@
make_comment_dialog_and_block_invoice: function(){
const me = this;
- const title = __('Add Comment');
+ const title = __('Block Invoice');
const fields = [
{
+ fieldname: 'release_date',
+ read_only: 0,
+ fieldtype:'Date',
+ label: __('Release Date'),
+ default: me.frm.doc.release_date
+ },
+ {
fieldname: 'hold_comment',
read_only: 0,
fieldtype:'Small Text',
@@ -187,7 +194,11 @@
const dialog_data = me.dialog.get_values();
frappe.call({
'method': 'erpnext.accounts.doctype.purchase_invoice.purchase_invoice.block_invoice',
- 'args': {'name': me.frm.doc.name, 'hold_comment': dialog_data.hold_comment},
+ 'args': {
+ 'name': me.frm.doc.name,
+ 'hold_comment': dialog_data.hold_comment,
+ 'release_date': dialog_data.release_date
+ },
'callback': (r) => me.frm.reload_doc()
});
me.dialog.hide();
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
index 917acba..1a14a2a 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
@@ -927,9 +927,10 @@
def on_recurring(self, reference_doc, auto_repeat_doc):
self.due_date = None
- def block_invoice(self, hold_comment=None):
+ def block_invoice(self, hold_comment=None, release_date=None):
self.db_set('on_hold', 1)
self.db_set('hold_comment', cstr(hold_comment))
+ self.db_set('release_date', release_date)
def unblock_invoice(self):
self.db_set('on_hold', 0)
@@ -1013,10 +1014,10 @@
@frappe.whitelist()
-def block_invoice(name, hold_comment):
+def block_invoice(name, hold_comment, release_date):
if frappe.db.exists('Purchase Invoice', name):
pi = frappe.get_doc('Purchase Invoice', name)
- pi.block_invoice(hold_comment)
+ pi.block_invoice(hold_comment, release_date)
@frappe.whitelist()
def make_inter_company_sales_invoice(source_name, target_doc=None):