nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-08 23:52:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fix] [minor] expense head get_query fixed in purchase invoice

Browse Source
This commit is contained in:
Nabin Hait
2013-08-05 13:00:20 +05:30
parent 4b7a79c2b3
commit 7e405e26b6
3 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
accounts/doctype/purchase_invoice/purchase_invoice.js
View File

@@ -172,16 +172,13 @@ return{
} }
} }
cur_frm.fields_dict['entries'].grid.get_field("expense_head").get_query = function(doc) { cur_frm.set_query("expense_head", "entries", function(doc) {
return{ return{
filters:{ query: "accounts.doctype.purchase_invoice.purchase_invoice.get_expense_account",
'debit_or_credit':'Debit', filters: {'company': doc.company}
'account_type': 'Expense Account',
'group_or_ledger': 'Ledger',
'company': doc.company
}
} }
} });
cur_frm.cscript.expense_head = function(doc, cdt, cdn){ cur_frm.cscript.expense_head = function(doc, cdt, cdn){
var d = locals[cdt][cdn]; var d = locals[cdt][cdn];
if(d.idx == 1 && d.expense_head){ if(d.idx == 1 && d.expense_head){

14
accounts/doctype/purchase_invoice/purchase_invoice.py
View File

@@ -458,3 +458,17 @@ class DocType(BuyingController):
"conversion_factor")) or 1 "conversion_factor")) or 1
d.rm_supp_cost = rm_cost * flt(d.qty) * flt(d.conversion_factor) d.rm_supp_cost = rm_cost * flt(d.qty) * flt(d.conversion_factor)
@webnotes.whitelist()
def get_expense_account(doctype, txt, searchfield, start, page_len, filters):
from controllers.queries import get_match_cond
return webnotes.conn.sql("""select tabAccount.name from `tabAccount`
where (tabAccount.debit_or_credit="Debit"
or tabAccount.account_type = "Expense Account")
and tabAccount.group_or_ledger="Ledger"
and tabAccount.docstatus!=2
and tabAccount.company = '%(company)s'
and tabAccount.%(key)s LIKE '%(txt)s'
%(mcond)s""" % {'company': filters['company'], 'key': searchfield,
'txt': "%%%s%%" % txt, 'mcond':get_match_cond(doctype, searchfield)})

1
accounts/doctype/sales_invoice/sales_invoice.py
View File

@@ -979,6 +979,7 @@ def get_bank_cash_account(mode_of_payment):
"cash_bank_account": val "cash_bank_account": val
} }
@webnotes.whitelist()
def get_income_account(doctype, txt, searchfield, start, page_len, filters): def get_income_account(doctype, txt, searchfield, start, page_len, filters):
from controllers.queries import get_match_cond from controllers.queries import get_match_cond