nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-19 01:25:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: don't overwrite existing terms in transaction

Browse Source 
(cherry picked from commit 77b044f1a6)

# Conflicts:
#	erpnext/public/js/controllers/transaction.js
This commit is contained in:
barredterra
2024-01-24 01:48:10 +01:00
committed by Mergify
parent d785c6ce3e
commit dcdd3e8cc4
1 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
erpnext/public/js/controllers/transaction.js
View File

@@ -809,6 +809,40 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
me.frm.set_value("tc_name", company_doc.default_buying_terms); me.frm.set_value("tc_name", company_doc.default_buying_terms);
} }
} }
<<<<<<< HEAD
=======
if (
company_doc.default_selling_terms &&
frappe.meta.has_field(me.frm.doc.doctype, "tc_name") &&
[
"Sales Invoice",
"Quotation",
"Sales Order",
"Delivery Note",
].includes(me.frm.doc.doctype) &&
!me.frm.doc.tc_name
) {
me.frm.set_value("tc_name", company_doc.default_selling_terms);
}
if (
company_doc.default_buying_terms &&
frappe.meta.has_field(me.frm.doc.doctype, "tc_name") &&
[
"Request for Quotation",
"Supplier Quotation",
"Purchase Order",
// Purchase Invoice is excluded as per issue #3345
"Material Request",
"Purchase Receipt",
].includes(me.frm.doc.doctype) &&
!me.frm.doc.tc_name
) {
me.frm.set_value("tc_name", company_doc.default_buying_terms);
}
>>>>>>> 77b044f1a6 (fix: don't overwrite existing terms in transaction)
frappe.run_serially([ frappe.run_serially([
() => me.frm.script_manager.trigger("currency"), () => me.frm.script_manager.trigger("currency"),
() => me.update_item_tax_map(), () => me.update_item_tax_map(),