From 83bce785ff84f58ec60a34830ccd734effb62f3e Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Thu, 30 Jan 2025 17:29:31 +0530 Subject: [PATCH] fix: bind this to function (cherry picked from commit 41649cf52de0fb50b6370d915ea41b7ad8fc9971) # Conflicts: # erpnext/buying/doctype/purchase_order/purchase_order.js --- erpnext/buying/doctype/purchase_order/purchase_order.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js index d6fd53dc778..2de1546a1ba 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.js +++ b/erpnext/buying/doctype/purchase_order/purchase_order.js @@ -205,9 +205,18 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends e } } +<<<<<<< HEAD if(is_drop_ship && doc.status!="Delivered") { this.frm.add_custom_button(__('Delivered'), this.delivered_by_supplier, __("Status")); +======= + if (is_drop_ship && doc.status != "Delivered") { + this.frm.add_custom_button( + __("Delivered"), + this.delivered_by_supplier.bind(this), + __("Status") + ); +>>>>>>> 41649cf52d (fix: bind this to function) this.frm.page.set_inner_btn_group_as_primary(__("Status")); }