nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 10:49:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2024-10-17 10:11:27 +05:30
committed by GitHub
parent 4987fd043b
commit 1c1e4fa30b
1 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -218,17 +218,8 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends e
} }
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) { if(flt(doc.per_received) < 100 && allow_receipt) {
cur_frm.add_custom_button(__('Purchase Receipt'), this.make_purchase_receipt, __('Create')); cur_frm.add_custom_button(__('Purchase Receipt'), this.make_purchase_receipt, __('Create'));
=======
if (flt(doc.per_received) < 100 && allow_receipt) {
cur_frm.add_custom_button(
__("Purchase Receipt"),
this.make_purchase_receipt,
__("Create")
);
>>>>>>> a33d5535a7 (fix: list view and form status not same for purchase order (backport #43690) (#43692))
if (doc.is_subcontracted) { if (doc.is_subcontracted) {
if (doc.is_old_subcontracting_flow) { if (doc.is_old_subcontracting_flow) {
if (me.has_unsupplied_items()) { if (me.has_unsupplied_items()) {
@@ -240,18 +231,9 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends e
} }
} }
} }
<<<<<<< HEAD
if(flt(doc.per_billed) < 100) if(flt(doc.per_billed) < 100)
cur_frm.add_custom_button(__('Purchase Invoice'), cur_frm.add_custom_button(__('Purchase Invoice'),
this.make_purchase_invoice, __('Create')); this.make_purchase_invoice, __('Create'));
=======
if (flt(doc.per_billed) < 100)
cur_frm.add_custom_button(
__("Purchase Invoice"),
this.make_purchase_invoice,
__("Create")
);
>>>>>>> a33d5535a7 (fix: list view and form status not same for purchase order (backport #43690) (#43692))
if(flt(doc.per_billed) < 100 && doc.status != "Delivered") { if(flt(doc.per_billed) < 100 && doc.status != "Delivered") {
this.frm.add_custom_button( this.frm.add_custom_button(
@@ -600,4 +582,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);
} }
}); });