fixes in Expense Claim
diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.py b/erpnext/hr/doctype/expense_claim/expense_claim.py
index eb297f8..fb720b0 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim.py
+++ b/erpnext/hr/doctype/expense_claim/expense_claim.py
@@ -19,7 +19,7 @@
def validate(self):
validate_fiscal_year(self.posting_date, self.fiscal_year, _("Posting Date"), self)
self.validate_exp_details()
- self.validate_cost()
+ self.calculate_total_amount()
self.validate_sanctioned_amount()
self.validate_expense_approver()
self.validate_task()
@@ -32,17 +32,15 @@
self.update_task()
def on_cancel(self):
- if self.project:
+ if self.task:
self.update_task()
- def validate_cost(self):
- total_claimed_amount = 0
- total_sanctioned_amount = 0
+ def calculate_total_amount(self):
+ self.total_claimed_amount = 0
+ self.total_sanctioned_amount = 0
for d in self.expenses:
- total_claimed_amount += d.claim_amount
- total_sanctioned_amount += d.sanctioned_amount
- self.total_claimed_amount = total_claimed_amount
- self.total_sanctioned_amount = total_sanctioned_amount
+ self.total_claimed_amount += d.claim_amount
+ self.total_sanctioned_amount += d.sanctioned_amount
def validate_exp_details(self):
if not self.get('expenses'):
@@ -54,17 +52,15 @@
.format(get_fullname(self.exp_approver), self.exp_approver), InvalidExpenseApproverError)
def update_task(self):
- expense_amount = frappe.db.sql("""select sum(total_sanctioned_amount) from `tabExpense Claim`
- where project = %s and task = %s and approval_status = "Approved" and docstatus=1""",(self.project, self.task))
-
task = frappe.get_doc("Task", self.task)
- task.total_expense_claim = expense_amount
+ task.update_total_expense_claim()
task.save()
def validate_task(self):
if self.project and not self.task:
- frappe.throw(_("Task is Mandatory if Time Log is against a project"))
+ frappe.throw(_("Task is mandatory if Expense Claim is against a Project"))
def validate_sanctioned_amount(self):
- if self.total_sanctioned_amount > self.total_claimed_amount:
- frappe.throw(_("Total sanctioned amount cannot be greater than total claimed amount."))
\ No newline at end of file
+ for d in self.expenses:
+ if d.sanctioned_amount > d.claim_amount:
+ frappe.throw(_("Sanctioned Amount cannot be greater than Claim Amount in Row {0}.").format(d.idx))
\ No newline at end of file
diff --git a/erpnext/hr/doctype/expense_claim/test_expense_claim.py b/erpnext/hr/doctype/expense_claim/test_expense_claim.py
index 9c05383..2867548 100644
--- a/erpnext/hr/doctype/expense_claim/test_expense_claim.py
+++ b/erpnext/hr/doctype/expense_claim/test_expense_claim.py
@@ -8,7 +8,7 @@
test_records = frappe.get_test_records('Expense Claim')
class TestExpenseClaim(unittest.TestCase):
- def test_project_costing(self):
+ def test_total_expense_claim_for_project(self):
frappe.db.sql("delete from `tabTask`")
frappe.db.sql("delete from `tabProject`")
diff --git a/erpnext/hr/doctype/expense_claim_detail/expense_claim_detail.json b/erpnext/hr/doctype/expense_claim_detail/expense_claim_detail.json
index d975189..c6123ee 100644
--- a/erpnext/hr/doctype/expense_claim_detail/expense_claim_detail.json
+++ b/erpnext/hr/doctype/expense_claim_detail/expense_claim_detail.json
@@ -16,6 +16,12 @@
"width": "150px"
},
{
+ "fieldname": "column_break_2",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
"fieldname": "expense_type",
"fieldtype": "Link",
"in_list_view": 1,
@@ -29,6 +35,12 @@
"width": "150px"
},
{
+ "fieldname": "section_break_4",
+ "fieldtype": "Section Break",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
"fieldname": "description",
"fieldtype": "Small Text",
"in_list_view": 1,
@@ -40,6 +52,12 @@
"width": "300px"
},
{
+ "fieldname": "section_break_6",
+ "fieldtype": "Section Break",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
"fieldname": "claim_amount",
"fieldtype": "Currency",
"in_list_view": 1,
@@ -53,6 +71,12 @@
"width": "150px"
},
{
+ "fieldname": "column_break_8",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
"allow_on_submit": 0,
"fieldname": "sanctioned_amount",
"fieldtype": "Currency",
@@ -69,7 +93,7 @@
],
"idx": 1,
"istable": 1,
- "modified": "2014-05-09 02:16:38.529082",
+ "modified": "2015-04-08 06:18:47.539134",
"modified_by": "Administrator",
"module": "HR",
"name": "Expense Claim Detail",
diff --git a/erpnext/projects/doctype/task/task.py b/erpnext/projects/doctype/task/task.py
index 6748ead..4e29d17 100644
--- a/erpnext/projects/doctype/task/task.py
+++ b/erpnext/projects/doctype/task/task.py
@@ -45,6 +45,10 @@
project = frappe.get_doc("Project", self.project)
project.run_method("update_percent_complete")
+ def update_total_expense_claim(self):
+ self.total_expense_claim = frappe.db.sql("""select sum(total_sanctioned_amount) from `tabExpense Claim`
+ where project = %s and task = %s and approval_status = "Approved" and docstatus=1""",(self.project, self.name))
+
def update_project(self):
if self.project:
total_activity_cost = frappe.db.sql("""select sum(actual_cost) from `tabTask`