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

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2024-04-16 16:38:32 +05:30
parent c2b6b64e2e
commit ee06448f0d
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/selling/doctype/sales_order/sales_order.js
View File

@@ -89,11 +89,6 @@ frappe.ui.form.on("Sales Order", {
}, __('Get Items From')); }, __('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 // When multiple companies are set up. in case company name is changed set default company address
company: function (frm) { company: function (frm) {
if (frm.doc.company) { if (frm.doc.company) {
@@ -115,10 +110,9 @@ frappe.ui.form.on("Sales Order", {
} }
}, },
onload: function (frm) { onload: function(frm) {
if (!frm.doc.transaction_date) { if (!frm.doc.transaction_date){
frm.set_value("transaction_date", frappe.datetime.get_today()); frm.set_value('transaction_date', frappe.datetime.get_today())
>>>>>>> c6cf1bec76 (fix: get address if multiple companies)
} }
erpnext.queries.setup_queries(frm, "Warehouse", function() { erpnext.queries.setup_queries(frm, "Warehouse", function() {
return { return {