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

[minor] remove letter head / terms from purchase invoice, fixes #3328, #3345

Browse Source
This commit is contained in:
Rushabh Mehta 2015-05-27 12:29:57 +05:30
parent e7b37af525
commit c185734bf3
2 changed files with 831 additions and 838 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
View File

@ -778,15 +778,6 @@
"permlevel": 0, "permlevel": 0,
"read_only": 0 "read_only": 0
}, },
{
"allow_on_submit": 1,
"fieldname": "letter_head",
"fieldtype": "Link",
"label": "Letter Head",
"options": "Letter Head",
"permlevel": 0,
"print_hide": 1
},
{ {
"fieldname": "fiscal_year", "fieldname": "fiscal_year",
"fieldtype": "Link", "fieldtype": "Link",
@ -939,7 +930,7 @@
"icon": "icon-file-text", "icon": "icon-file-text",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2015-05-27 02:48:01.662340", "modified": "2015-05-27 02:54:48.668118",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Invoice", "name": "Purchase Invoice",

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

@ -209,9 +209,11 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
me.frm.set_value('plc_conversion_rate', 1.0); me.frm.set_value('plc_conversion_rate', 1.0);
} }
if (company_doc.default_letter_head) { if (company_doc.default_letter_head) {
me.frm.set_value("letter_head", company_doc.default_letter_head); if(me.frm.fields_dict.letter_head) {
me.frm.set_value("letter_head", company_doc.default_letter_head);
}
} }
if (company_doc.default_terms) { if (company_doc.default_terms && me.frm.doc.doctype != "Purchase Invoice") {
me.frm.set_value("tc_name", company_doc.default_terms); me.frm.set_value("tc_name", company_doc.default_terms);
} }