diff --git a/erpnext/demo/setup_data.py b/erpnext/demo/setup_data.py index 0ac77f46952..0903482468a 100644 --- a/erpnext/demo/setup_data.py +++ b/erpnext/demo/setup_data.py @@ -317,7 +317,10 @@ def setup_account_to_expense_type(): for expense_type in expense_types: doc = frappe.get_doc("Expense Claim Type", expense_type["name"]) - doc.default_account = expense_type["account"] + doc.append("accounts", { + "company" : erpnext.get_default_company(), + "default_account" : expense_type["account"] + }) doc.save(ignore_permissions=True) def setup_user_roles(): diff --git a/erpnext/demo/user/hr.py b/erpnext/demo/user/hr.py index 50bb17369a3..c5cbe6b87a4 100644 --- a/erpnext/demo/user/hr.py +++ b/erpnext/demo/user/hr.py @@ -63,7 +63,9 @@ def work(): def get_expenses(): expenses = [] - expese_types = frappe.db.sql("select name, default_account from `tabExpense Claim Type`",as_dict=1) + expese_types = frappe.db.sql("""select ect.name, eca.default_account from `tabExpense Claim Type` ect, + `tabExpense Claim Account` eca where eca.parent=ect.name + and eca.company=%s """, frappe.flags.company,as_dict=1) for expense_type in expese_types[:random.randint(1,4)]: claim_amount = random.randint(1,20)*10 diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.js b/erpnext/hr/doctype/expense_claim/expense_claim.js index 8e0d3065bc6..bcd8bc09b00 100644 --- a/erpnext/hr/doctype/expense_claim/expense_claim.js +++ b/erpnext/hr/doctype/expense_claim/expense_claim.js @@ -16,6 +16,23 @@ erpnext.hr.ExpenseClaimController = frappe.ui.form.Controller.extend({ frappe.set_route('Form', 'Journal Entry', r.message.name); } }); + }, + + expense_type: function(frm, cdt, cdn) { + var d = locals[cdt][cdn]; + + return frappe.call({ + method: "erpnext.hr.doctype.expense_claim.expense_claim.get_expense_claim_account", + args: { + "expense_claim_type": d.expense_type, + "company": frm.company + }, + callback: function(r) { + if (r.message) { + d.default_account = r.message.account; + } + } + }); } }) @@ -23,7 +40,6 @@ $.extend(cur_frm.cscript, new erpnext.hr.ExpenseClaimController({frm: cur_frm})) cur_frm.add_fetch('employee', 'company', 'company'); 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) { if(!doc.approval_status) diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.py b/erpnext/hr/doctype/expense_claim/expense_claim.py index 65cb73afbb3..efdee97906b 100644 --- a/erpnext/hr/doctype/expense_claim/expense_claim.py +++ b/erpnext/hr/doctype/expense_claim/expense_claim.py @@ -20,6 +20,7 @@ class ExpenseClaim(Document): self.validate_expense_approver() self.calculate_total_amount() set_employee_name(self) + self.set_expense_account() if self.task and not self.project: self.project = frappe.db.get_value("Task", self.task, "project") @@ -59,7 +60,11 @@ class ExpenseClaim(Document): if flt(d.sanctioned_amount) > flt(d.claim_amount): frappe.throw(_("Sanctioned Amount cannot be greater than Claim Amount in Row {0}.").format(d.idx)) - + def set_expense_account(self): + for expense in self.expenses: + if not expense.default_account: + expense.default_account = get_expense_claim_account(expense.expense_type, self.company)["account"] + @frappe.whitelist() def get_expense_approver(doctype, txt, searchfield, start, page_len, filters): return frappe.db.sql(""" @@ -100,3 +105,16 @@ def make_bank_entry(docname): }) return je.as_dict() + +@frappe.whitelist() +def get_expense_claim_account(expense_claim_type, company): + account = frappe.db.get_value("Expense Claim Account", + {"parent": expense_claim_type, "company": company}, "default_account") + + if not account: + frappe.throw(_("Please set default account in Expense Claim Type {0}") + .format(expense_claim_type)) + + return { + "account": account + } \ No newline at end of file diff --git a/erpnext/hr/doctype/expense_claim_account/__init__.py b/erpnext/hr/doctype/expense_claim_account/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/hr/doctype/expense_claim_account/expense_claim_account.json b/erpnext/hr/doctype/expense_claim_account/expense_claim_account.json new file mode 100644 index 00000000000..a2bbe0b86fc --- /dev/null +++ b/erpnext/hr/doctype/expense_claim_account/expense_claim_account.json @@ -0,0 +1,89 @@ +{ + "allow_copy": 0, + "allow_import": 0, + "allow_rename": 0, + "beta": 0, + "creation": "2016-07-18 12:24:16.507860", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "fields": [ + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "company", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_list_view": 1, + "label": "Company", + "length": 0, + "no_copy": 0, + "options": "Company", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "default_account", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_list_view": 1, + "label": "Default Account", + "length": 0, + "no_copy": 0, + "options": "Account", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + } + ], + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "in_dialog": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 1, + "max_attachments": 0, + "modified": "2016-07-18 12:39:29.709848", + "modified_by": "Administrator", + "module": "HR", + "name": "Expense Claim Account", + "name_case": "", + "owner": "Administrator", + "permissions": [], + "quick_entry": 1, + "read_only": 0, + "read_only_onload": 0, + "sort_field": "modified", + "sort_order": "DESC", + "track_seen": 0 +} \ No newline at end of file diff --git a/erpnext/hr/doctype/expense_claim_account/expense_claim_account.py b/erpnext/hr/doctype/expense_claim_account/expense_claim_account.py new file mode 100644 index 00000000000..f34633cf58b --- /dev/null +++ b/erpnext/hr/doctype/expense_claim_account/expense_claim_account.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document + +class ExpenseClaimAccount(Document): + pass diff --git a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.js b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.js index 0771b8c6417..5624570c04c 100644 --- a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.js +++ b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.js @@ -1,9 +1,13 @@ -frappe.ui.form.on("Expense Claim Type", "onload", function(frm, dt, dn){ - frm.fields_dict["default_account"].get_query = function(doc) { - return { - filters:{ - "is_group": 0 - } +// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors +// License: GNU General Public License v3. See license.txt + +cur_frm.set_query("default_account", "accounts", function(doc, cdt, cdn) { + var d = locals[cdt][cdn]; + return{ + filters: { + "is_group": 0, + "root_type": "Expense", + 'company': d.company } } -}) \ No newline at end of file +}); \ No newline at end of file diff --git a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json index 460b3b8f4c3..3d2b251e097 100644 --- a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json +++ b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json @@ -3,11 +3,13 @@ "allow_import": 1, "allow_rename": 0, "autoname": "field:expense_type", + "beta": 0, "creation": "2012-03-27 14:35:55", "custom": 0, "docstatus": 0, "doctype": "DocType", "document_type": "Setup", + "editable_grid": 0, "fields": [ { "allow_on_submit": 0, @@ -17,6 +19,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Expense Claim Type", @@ -26,6 +29,7 @@ "oldfieldtype": "Data", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -33,30 +37,6 @@ "set_only_once": 0, "unique": 0 }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "default_account", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "in_filter": 0, - "in_list_view": 0, - "label": "Default Account", - "length": 0, - "no_copy": 0, - "options": "Account", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, { "allow_on_submit": 0, "bold": 0, @@ -65,6 +45,7 @@ "fieldtype": "Small Text", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Description", @@ -74,6 +55,7 @@ "oldfieldtype": "Small Text", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -81,19 +63,46 @@ "set_only_once": 0, "unique": 0, "width": "300px" + }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "accounts", + "fieldtype": "Table", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Accounts", + "length": 0, + "no_copy": 0, + "options": "Expense Claim Account", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 } ], "hide_heading": 0, "hide_toolbar": 0, "icon": "icon-flag", "idx": 1, + "image_view": 0, "in_create": 0, "in_dialog": 0, "is_submittable": 0, "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2015-11-16 06:29:47.084611", + "modified": "2016-07-18 12:36:10.096252", "modified_by": "Administrator", "module": "HR", "name": "Expense Claim Type", @@ -140,6 +149,9 @@ "write": 0 } ], + "quick_entry": 0, "read_only": 0, - "read_only_onload": 0 + "read_only_onload": 0, + "sort_order": "ASC", + "track_seen": 0 } \ No newline at end of file diff --git a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py index 91f3bcbf106..5e6a7a868d7 100644 --- a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +++ b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py @@ -3,8 +3,25 @@ from __future__ import unicode_literals import frappe - +from frappe import _ from frappe.model.document import Document class ExpenseClaimType(Document): - pass \ No newline at end of file + def validate(self): + self.validate_accounts() + self.validate_repeating_companies() + + def validate_repeating_companies(self): + """Error when Same Company is entered multiple times in accounts""" + accounts_list = [] + for entry in self.accounts: + accounts_list.append(entry.company) + + if len(accounts_list)!= len(set(accounts_list)): + frappe.throw(_("Same Company is entered more than once")) + + def validate_accounts(self): + for entry in self.accounts: + """Error when Company of Ledger account doesn't match with Company Selected""" + if frappe.db.get_value("Account", entry.default_account, "company") != entry.company: + frappe.throw(_("Account does not match with Company")) \ No newline at end of file diff --git a/erpnext/patches.txt b/erpnext/patches.txt index f24b1ce98d3..699a745f240 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -298,3 +298,4 @@ execute:frappe.reload_doc('projects', 'doctype', 'timesheet', force=True) execute:frappe.delete_doc_if_exists("Report", "Employee Holiday Attendance") execute:frappe.delete_doc_if_exists("DocType", "Payment Tool") execute:frappe.delete_doc_if_exists("DocType", "Payment Tool Detail") +erpnext.patches.v7_0.setup_account_table_for_expense_claim_type_if_exists diff --git a/erpnext/patches/v7_0/setup_account_table_for_expense_claim_type_if_exists.py b/erpnext/patches/v7_0/setup_account_table_for_expense_claim_type_if_exists.py new file mode 100644 index 00000000000..e566ac252f9 --- /dev/null +++ b/erpnext/patches/v7_0/setup_account_table_for_expense_claim_type_if_exists.py @@ -0,0 +1,14 @@ +from __future__ import unicode_literals +import frappe + +def execute(): + frappe.reload_doc("hr", "doctype", "expense_claim_type") + + for expense_claim_type in frappe.get_all("Expense Claim Type", fields=["name", "default_account"]): + if expense_claim_type.default_account: + doc = frappe.get_doc("Expense Claim Type", expense_claim_type.name) + doc.append("accounts", { + "company": frappe.db.get_value("Account", expense_claim_type.default_account, "company"), + "default_account": expense_claim_type.default_account, + }) + doc.save(ignore_permissions=True) \ No newline at end of file