nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 08:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-02-03 11:58:10 +05:30
committed by GitHub
parent 83bce785ff
commit 7b3c35c167
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/buying/doctype/purchase_order/purchase_order.js
View File

@@ -205,18 +205,12 @@ 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") { if (is_drop_ship && doc.status != "Delivered") {
this.frm.add_custom_button( this.frm.add_custom_button(
__("Delivered"), __("Delivered"),
this.delivered_by_supplier.bind(this), this.delivered_by_supplier.bind(this),
__("Status") __("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"));
} }
@@ -591,4 +585,4 @@ frappe.ui.form.on("Purchase Order", "is_subcontracted", function(frm) {
if (frm.doc.is_old_subcontracting_flow) { if (frm.doc.is_old_subcontracting_flow) {
erpnext.buying.get_default_bom(frm); erpnext.buying.get_default_bom(frm);
} }
}); });