fix: bind this to function
(cherry picked from commit 41649cf52d)
# Conflicts:
# erpnext/buying/doctype/purchase_order/purchase_order.js
This commit is contained in:
@@ -205,9 +205,18 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends e
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
if(is_drop_ship && doc.status!="Delivered") {
|
if(is_drop_ship && doc.status!="Delivered") {
|
||||||
this.frm.add_custom_button(__('Delivered'),
|
this.frm.add_custom_button(__('Delivered'),
|
||||||
this.delivered_by_supplier, __("Status"));
|
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"));
|
this.frm.page.set_inner_btn_group_as_primary(__("Status"));
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user