nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-14 17:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into fixes_12829

Browse Source
This commit is contained in:
rohitwaghchaure
2018-02-09 12:01:41 +05:30
committed by GitHub
parent 081f40c1bf 05bf8abab0
commit 7e75165826
22 changed files with 1551 additions and 1207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -458,7 +458,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
}
var party = me.frm.doc[frappe.model.scrub(party_type)];
if(party) {
if(party && me.frm.doc.company) {
return frappe.call({
method: "erpnext.accounts.party.get_party_account",
args: {