From ee06448f0d7f726461f2a9a95537755a2bb0b68c Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 16 Apr 2024 16:38:32 +0530 Subject: [PATCH] chore: resolve conflict --- erpnext/selling/doctype/sales_order/sales_order.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index e622cd5346d..2995a1e99bc 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -89,11 +89,6 @@ frappe.ui.form.on("Sales Order", { }, __('Get Items From')); }, -<<<<<<< HEAD - onload: function(frm) { - if (!frm.doc.transaction_date){ - frm.set_value('transaction_date', frappe.datetime.get_today()) -======= // When multiple companies are set up. in case company name is changed set default company address company: function (frm) { if (frm.doc.company) { @@ -115,10 +110,9 @@ frappe.ui.form.on("Sales Order", { } }, - onload: function (frm) { - if (!frm.doc.transaction_date) { - frm.set_value("transaction_date", frappe.datetime.get_today()); ->>>>>>> c6cf1bec76 (fix: get address if multiple companies) + onload: function(frm) { + if (!frm.doc.transaction_date){ + frm.set_value('transaction_date', frappe.datetime.get_today()) } erpnext.queries.setup_queries(frm, "Warehouse", function() { return {