Merge pull request #17244 from hrwX/delivery_note_fix_v12
fix(Delivery Note): show get items even if note has been amended
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js
index 0ac53c5..78bc06a 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.js
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.js
@@ -101,6 +101,30 @@
refresh: function(doc, dt, dn) {
var me = this;
this._super();
+
+ if ((!doc.is_return) && (doc.status!="Closed" || doc.is_new())) {
+ if (this.frm.doc.docstatus===0) {
+ this.frm.add_custom_button(__('Sales Order'),
+ function() {
+ erpnext.utils.map_current_doc({
+ method: "erpnext.selling.doctype.sales_order.sales_order.make_delivery_note",
+ source_doctype: "Sales Order",
+ target: me.frm,
+ setters: {
+ customer: me.frm.doc.customer || undefined,
+ },
+ get_query_filters: {
+ docstatus: 1,
+ status: ["not in", ["Closed", "On Hold"]],
+ per_delivered: ["<", 99.99],
+ company: me.frm.doc.company,
+ project: me.frm.doc.project || undefined,
+ }
+ })
+ }, __("Get items from"));
+ }
+ }
+
if (!doc.is_return && doc.status!="Closed") {
if(flt(doc.per_installed, 2) < 100 && doc.docstatus==1)
this.frm.add_custom_button(__('Installation Note'), function() {
@@ -127,27 +151,6 @@
if (!doc.__islocal && doc.docstatus==1) {
this.frm.page.set_inner_btn_group_as_primary(__('Create'));
}
-
- if (this.frm.doc.docstatus===0) {
- this.frm.add_custom_button(__('Sales Order'),
- function() {
- erpnext.utils.map_current_doc({
- method: "erpnext.selling.doctype.sales_order.sales_order.make_delivery_note",
- source_doctype: "Sales Order",
- target: me.frm,
- setters: {
- customer: me.frm.doc.customer || undefined,
- },
- get_query_filters: {
- docstatus: 1,
- status: ["not in", ["Closed", "On Hold"]],
- per_delivered: ["<", 99.99],
- company: me.frm.doc.company,
- project: me.frm.doc.project || undefined,
- }
- })
- }, __("Get items from"));
- }
}
if (doc.docstatus==1) {