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

Merge pull request #3355 from rmehta/purchase-invoice-fixes

Browse Source 
[minor] remove letter head / terms from purchase invoice, fixes #3328, #3345
This commit is contained in:
Nabin Hait 2015-05-28 11:19:22 +05:30
commit 86e479f908
2 changed files with 831 additions and 838 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

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);
}
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);
}