From 82b46f2bfe47cc95015f821fac3d451e22dc48a4 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Fri, 21 Apr 2023 17:52:11 +0530 Subject: [PATCH] chore: fix conflicts --- erpnext/accounts/doctype/sales_invoice/sales_invoice.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js index 92c9b850579..451b405e00c 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js @@ -315,12 +315,8 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte } }, -<<<<<<< HEAD make_inter_company_invoice: function() { -======= - make_inter_company_invoice() { let me = this; ->>>>>>> 19911b48fd (fix: validation for internal transfer entry) frappe.model.open_mapped_doc({ method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.make_inter_company_purchase_invoice", frm: me.frm