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

Merge pull request #39532 from GursheenK/type-error-in-transaction-js

Browse Source 
fix: type error in transaction.js
This commit is contained in:
Deepesh Garg 2024-01-26 09:30:53 +05:30 committed by GitHub
commit f7a3af7473
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -790,7 +790,8 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
if (me.frm.doc.price_list_currency == company_currency) { if (me.frm.doc.price_list_currency == company_currency) {
me.frm.set_value('plc_conversion_rate', 1.0); me.frm.set_value('plc_conversion_rate', 1.0);
} }
if (company_doc && company_doc.default_letter_head) { if (company_doc){
if (company_doc.default_letter_head) {
if(me.frm.fields_dict.letter_head) { if(me.frm.fields_dict.letter_head) {
me.frm.set_value("letter_head", company_doc.default_letter_head); me.frm.set_value("letter_head", company_doc.default_letter_head);
} }
@ -807,7 +808,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
buying_doctypes_for_tc.indexOf(me.frm.doc.doctype) != -1) { buying_doctypes_for_tc.indexOf(me.frm.doc.doctype) != -1) {
me.frm.set_value("tc_name", company_doc.default_buying_terms); me.frm.set_value("tc_name", company_doc.default_buying_terms);
} }
}
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(),