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

Merge pull request #3670 from neilLasrado/expense-claim

Browse Source 
Default Expense Account added to Expense Claim Type.
This commit is contained in:
Anand Doshi 2015-07-20 13:04:33 +05:30
commit fc353efeca
3 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,10 +19,13 @@ erpnext.hr.ExpenseClaimController = frappe.ui.form.Controller.extend({
jv.company = cur_frm.doc.company; jv.company = cur_frm.doc.company;
jv.remark = 'Payment against Expense Claim: ' + cur_frm.doc.name; jv.remark = 'Payment against Expense Claim: ' + cur_frm.doc.name;
jv.fiscal_year = cur_frm.doc.fiscal_year; jv.fiscal_year = cur_frm.doc.fiscal_year;
var expense = cur_frm.doc.expenses || [];
var d1 = frappe.model.add_child(jv, 'Journal Entry Account', 'accounts'); for(var i = 0; i < expense.length; i++){
d1.debit = cur_frm.doc.total_sanctioned_amount; var d1 = frappe.model.add_child(jv, 'Journal Entry Account', 'accounts');
d1.against_expense_claim = cur_frm.doc.name; d1.debit = expense[i].sanctioned_amount;
d1.account = expense[i].default_account;
d1.against_expense_claim = cur_frm.doc.name;
}
// credit to bank // credit to bank
var d1 = frappe.model.add_child(jv, 'Journal Entry Account', 'accounts'); var d1 = frappe.model.add_child(jv, 'Journal Entry Account', 'accounts');
@ -43,6 +46,7 @@ $.extend(cur_frm.cscript, new erpnext.hr.ExpenseClaimController({frm: cur_frm}))
cur_frm.add_fetch('employee', 'company', 'company'); cur_frm.add_fetch('employee', 'company', 'company');
cur_frm.add_fetch('employee','employee_name','employee_name'); cur_frm.add_fetch('employee','employee_name','employee_name');
cur_frm.add_fetch('expense_type', 'default_account', 'default_account');
cur_frm.cscript.onload = function(doc,cdt,cdn) { cur_frm.cscript.onload = function(doc,cdt,cdn) {
if(!doc.approval_status) if(!doc.approval_status)

14
erpnext/hr/doctype/expense_claim_detail/expense_claim_detail.json
View File

@ -34,6 +34,18 @@
"reqd": 1, "reqd": 1,
"width": "150px" "width": "150px"
}, },
{
"depends_on": "expense_type",
"fieldname": "default_account",
"fieldtype": "Link",
"hidden": 1,
"label": "Default Account",
"options": "Account",
"permlevel": 0,
"precision": "",
"read_only": 1,
"unique": 0
},
{ {
"fieldname": "section_break_4", "fieldname": "section_break_4",
"fieldtype": "Section Break", "fieldtype": "Section Break",
@ -93,7 +105,7 @@
], ],
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"modified": "2015-04-08 06:18:47.539134", "modified": "2015-07-16 06:13:32.090048",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Expense Claim Detail", "name": "Expense Claim Detail",

12
erpnext/hr/doctype/expense_claim_type/expense_claim_type.json
View File

@ -17,6 +17,14 @@
"reqd": 1, "reqd": 1,
"search_index": 0 "search_index": 0
}, },
{
"fieldname": "default_account",
"fieldtype": "Link",
"label": "Default Account",
"options": "Account",
"permlevel": 0,
"precision": ""
},
{ {
"fieldname": "description", "fieldname": "description",
"fieldtype": "Small Text", "fieldtype": "Small Text",
@ -29,7 +37,7 @@
], ],
"icon": "icon-flag", "icon": "icon-flag",
"idx": 1, "idx": 1,
"modified": "2015-07-13 04:46:38.897484", "modified": "2015-07-15 08:57:23.069980",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Expense Claim Type", "name": "Expense Claim Type",
@ -55,7 +63,7 @@
"print": 0, "print": 0,
"read": 1, "read": 1,
"report": 0, "report": 0,
"role": "Employee", "role": "All",
"share": 0, "share": 0,
"write": 0 "write": 0
} }