From bc93de682b6de2cec6474c1067dd461fbc193732 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 26 Nov 2024 13:48:00 +0530 Subject: [PATCH] chore: resolve conflict --- .../buying/doctype/purchase_order/purchase_order.js | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js index cb0aea0eb15..9718ab19b19 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.js +++ b/erpnext/buying/doctype/purchase_order/purchase_order.js @@ -388,13 +388,8 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends ( } if (doc.status != "Closed") { if (doc.status != "On Hold") { -<<<<<<< HEAD - if (flt(doc.per_received) < 100 && allow_receipt) { - cur_frm.add_custom_button( -======= if (flt(doc.per_received, precision("per_received")) < 100 && allow_receipt) { this.frm.add_custom_button( ->>>>>>> 1a1e2c7e01 (fix: use field precision instead of hardcoded precision in so and po) __("Purchase Receipt"), this.make_purchase_receipt, __("Create") @@ -419,14 +414,9 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends ( } } } -<<<<<<< HEAD - if (flt(doc.per_billed) < 100) - cur_frm.add_custom_button( -======= // Please do not add precision in the below flt function if (flt(doc.per_billed, precision("per_billed")) < 100) this.frm.add_custom_button( ->>>>>>> 1a1e2c7e01 (fix: use field precision instead of hardcoded precision in so and po) __("Purchase Invoice"), this.make_purchase_invoice, __("Create")