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: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2024-11-26 13:48:00 +05:30
parent cde19066fe
commit bc93de682b
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -388,13 +388,8 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends (
} }
if (doc.status != "Closed") { if (doc.status != "Closed") {
if (doc.status != "On Hold") { 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) { if (flt(doc.per_received, precision("per_received")) < 100 && allow_receipt) {
this.frm.add_custom_button( this.frm.add_custom_button(
>>>>>>> 1a1e2c7e01 (fix: use field precision instead of hardcoded precision in so and po)
__("Purchase Receipt"), __("Purchase Receipt"),
this.make_purchase_receipt, this.make_purchase_receipt,
__("Create") __("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 // Please do not add precision in the below flt function
if (flt(doc.per_billed, precision("per_billed")) < 100) if (flt(doc.per_billed, precision("per_billed")) < 100)
this.frm.add_custom_button( this.frm.add_custom_button(
>>>>>>> 1a1e2c7e01 (fix: use field precision instead of hardcoded precision in so and po)
__("Purchase Invoice"), __("Purchase Invoice"),
this.make_purchase_invoice, this.make_purchase_invoice,
__("Create") __("Create")