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

Merge pull request #9858 from mbauskar/expense-claim

Browse Source 
[minor] don't trigger the expense type trigger if value is not set
This commit is contained in:
Nabin Hait 2017-07-14 15:28:34 +05:30 committed by GitHub
commit 35d0de8276
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/payment_entry/payment_entry.js
View File

@ -291,7 +291,7 @@ frappe.ui.form.on('Payment Entry', {
set_account_currency_and_balance: function(frm, account, currency_field, set_account_currency_and_balance: function(frm, account, currency_field,
balance_field, callback_function) { balance_field, callback_function) {
if (frm.doc.posting_date) { if (frm.doc.posting_date && account) {
frappe.call({ frappe.call({
method: "erpnext.accounts.doctype.payment_entry.payment_entry.get_account_details", method: "erpnext.accounts.doctype.payment_entry.payment_entry.get_account_details",
args: { args: {

4
erpnext/hr/doctype/expense_claim/expense_claim.js
View File

@ -27,6 +27,10 @@ erpnext.hr.ExpenseClaimController = frappe.ui.form.Controller.extend({
return; return;
} }
if(!d.expense_type) {
return;
}
return frappe.call({ return frappe.call({
method: "erpnext.hr.doctype.expense_claim.expense_claim.get_expense_claim_account", method: "erpnext.hr.doctype.expense_claim.expense_claim.get_expense_claim_account",
args: { args: {

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

@ -94,6 +94,10 @@ var get_payment_mode_account = function(frm, mode_of_payment, callback) {
frappe.throw(__("Please select the Company first")); frappe.throw(__("Please select the Company first"));
} }
if(!mode_of_payment) {
return;
}
return frappe.call({ return frappe.call({
method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.get_bank_cash_account", method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.get_bank_cash_account",
args: { args: {