Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
barredterra 2024-01-31 13:19:19 +01:00
parent dcdd3e8cc4
commit ba55d0ede7
1 changed files with 2 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -798,51 +798,17 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
} }
let selling_doctypes_for_tc = ["Sales Invoice", "Quotation", "Sales Order", "Delivery Note"]; let selling_doctypes_for_tc = ["Sales Invoice", "Quotation", "Sales Order", "Delivery Note"];
if (company_doc.default_selling_terms && frappe.meta.has_field(me.frm.doc.doctype, "tc_name") && if (company_doc.default_selling_terms && frappe.meta.has_field(me.frm.doc.doctype, "tc_name") &&
selling_doctypes_for_tc.indexOf(me.frm.doc.doctype) != -1) { selling_doctypes_for_tc.includes(me.frm.doc.doctype) && !me.frm.doc.tc_name) {
me.frm.set_value("tc_name", company_doc.default_selling_terms); me.frm.set_value("tc_name", company_doc.default_selling_terms);
} }
let buying_doctypes_for_tc = ["Request for Quotation", "Supplier Quotation", "Purchase Order", let buying_doctypes_for_tc = ["Request for Quotation", "Supplier Quotation", "Purchase Order",
"Material Request", "Purchase Receipt"]; "Material Request", "Purchase Receipt"];
// Purchase Invoice is excluded as per issue #3345 // Purchase Invoice is excluded as per issue #3345
if (company_doc.default_buying_terms && frappe.meta.has_field(me.frm.doc.doctype, "tc_name") && if (company_doc.default_buying_terms && frappe.meta.has_field(me.frm.doc.doctype, "tc_name") &&
buying_doctypes_for_tc.indexOf(me.frm.doc.doctype) != -1) { buying_doctypes_for_tc.includes(me.frm.doc.doctype) && !me.frm.doc.tc_name) {
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(),