nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 16:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

in Time Log - Server side validations added to recalculate cost on save

Browse Source
This commit is contained in:
Neil Trini Lasrado
2015-03-31 13:27:55 +05:30
parent 50234cb0fe
commit a11770f06f
4 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/hr/doctype/expense_claim/expense_claim.py
View File

@@ -46,7 +46,10 @@ class ExpenseClaim(Document):
def update_task(self): def update_task(self):
expense_amount = frappe.db.sql("""select sum(total_sanctioned_amount) from `tabExpense Claim` 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)) where project = %s and task = %s and approval_status = "Approved" and docstatus=1""",(self.project, self.task))
frappe.db.set_value("Project", self.project, "total_expense_claim", expense_amount)
task = frappe.get_doc("Task", self.task)
task.total_expense_claim = expense_amount
task.save()
def validate_task(self): def validate_task(self):
if self.project and not self.task: if self.project and not self.task:

3
erpnext/projects/doctype/task/task.json
View File

@@ -246,8 +246,9 @@
], ],
"icon": "icon-check", "icon": "icon-check",
"idx": 1, "idx": 1,
"istable": 0,
"max_attachments": 5, "max_attachments": 5,
"modified": "2015-03-30 05:50:04.409614", "modified": "2015-03-31 03:31:13.055284",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Projects", "module": "Projects",
"name": "Task", "name": "Task",

18
erpnext/projects/doctype/time_log/time_log.js
View File

@@ -51,11 +51,7 @@ var calculate_cost = function(doc) {
} }
} }
frappe.ui.form.on("Time Log", "hours", function(frm) { var get_activity_cost = function(frm) {
calculate_cost(frm.doc);
});
frappe.ui.form.on("Time Log", "activity_type", function(frm) {
return frappe.call({ return frappe.call({
method: "erpnext.projects.doctype.time_log.time_log.get_activity_cost", method: "erpnext.projects.doctype.time_log.time_log.get_activity_cost",
args: { args: {
@@ -70,9 +66,19 @@ frappe.ui.form.on("Time Log", "activity_type", function(frm) {
} }
} }
}); });
}
frappe.ui.form.on("Time Log", "hours", function(frm) {
calculate_cost(frm.doc);
}); });
cur_frm.cscript.employee = cur_frm.cscript.activity_type; frappe.ui.form.on("Time Log", "activity_type", function(frm) {
get_activity_cost(frm);
});
frappe.ui.form.on("Time Log", "employee", function(frm) {
get_activity_cost(frm);
});
cur_frm.cscript.billable = function(doc) { cur_frm.cscript.billable = function(doc) {
if (doc.billable==1) { if (doc.billable==1) {

3
erpnext/projects/doctype/time_log/time_log.py
View File

@@ -216,6 +216,9 @@ class TimeLog(Document):
self.quantity = None self.quantity = None
def validate_cost(self): def validate_cost(self):
rate = get_activity_cost(self.employee, self.activity_type)
self.internal_rate = rate.get('internal_rate')
self.billing_rate = rate.get('billing_rate')
self.internal_cost = self.internal_rate * self.hours self.internal_cost = self.internal_rate * self.hours
if self.billable: if self.billable:
self.billing_amount = self.billing_rate * self.hours self.billing_amount = self.billing_rate * self.hours