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

Merge pull request #20009 from nextchamp-saqib/pi-payable-filter

Browse Source 
fix: bad credit to filter in purchase invoice
This commit is contained in:
Deepesh Garg 2019-12-23 14:50:56 +05:30 committed by GitHub
commit 06e7cf3caa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
View File

@ -382,21 +382,11 @@ cur_frm.fields_dict['items'].grid.get_field("item_code").get_query = function(do
cur_frm.fields_dict['credit_to'].get_query = function(doc) { cur_frm.fields_dict['credit_to'].get_query = function(doc) {
// filter on Account // filter on Account
if (doc.supplier) { return {
return { filters: {
filters: { 'account_type': 'Payable',
'account_type': 'Payable', 'is_group': 0,
'is_group': 0, 'company': doc.company
'company': doc.company
}
}
} else {
return {
filters: {
'report_type': 'Balance Sheet',
'is_group': 0,
'company': doc.company
}
} }
} }
} }

21
erpnext/accounts/doctype/sales_invoice/sales_invoice.js
View File

@ -556,22 +556,11 @@ cur_frm.cscript.cost_center = function(doc, cdt, cdn) {
} }
cur_frm.set_query("debit_to", function(doc) { cur_frm.set_query("debit_to", function(doc) {
// filter on Account return {
if (doc.customer) { filters: {
return { 'account_type': 'Receivable',
filters: { 'is_group': 0,
'account_type': 'Receivable', 'company': doc.company
'is_group': 0,
'company': doc.company
}
}
} else {
return {
filters: {
'report_type': 'Balance Sheet',
'is_group': 0,
'company': doc.company
}
} }
} }
}); });