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

fix: Expense Account filter in Sales Invoice (#35944)

Browse Source
This commit is contained in:
Deepesh Garg 2023-06-30 20:02:46 +05:30 committed by GitHub
parent be5cb1aa17
commit d54f52474a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -674,19 +674,6 @@ frappe.ui.form.on('Sales Invoice', {
} }
} }
// expense account
frm.fields_dict['items'].grid.get_field('expense_account').get_query = function(doc) {
if (erpnext.is_perpetual_inventory_enabled(doc.company)) {
return {
filters: {
'report_type': 'Profit and Loss',
'company': doc.company,
"is_group": 0
}
}
}
}
// discount account // discount account
frm.fields_dict['items'].grid.get_field('discount_account').get_query = function(doc) { frm.fields_dict['items'].grid.get_field('discount_account').get_query = function(doc) {
return { return {

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

@ -193,7 +193,9 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
this.frm.set_query("expense_account", "items", function(doc) { this.frm.set_query("expense_account", "items", function(doc) {
return { return {
filters: { filters: {
"company": doc.company "company": doc.company,
"report_type": "Profit and Loss",
"is_group": 0
} }
}; };
}); });