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

Activity Cost - Mandatory removed for Employee.

Browse Source
This commit is contained in:
Neil Trini Lasrado 2015-06-16 15:30:08 +05:30
parent 4abf552d7b
commit ae4cc078ea
3 changed files with 56 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
erpnext/projects/doctype/activity_cost/activity_cost.json
View File

@ -9,41 +9,6 @@
"doctype": "DocType", "doctype": "DocType",
"document_type": "Master", "document_type": "Master",
"fields": [ "fields": [
{
"allow_on_submit": 0,
"fieldname": "employee",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Employee",
"no_copy": 0,
"options": "Employee",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0
},
{
"fieldname": "employee_name",
"fieldtype": "Data",
"label": "Employee Name",
"options": "",
"permlevel": 0,
"precision": "",
"read_only": 1
},
{
"fieldname": "column_break_2",
"fieldtype": "Column Break",
"permlevel": 0,
"precision": ""
},
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"fieldname": "activity_type", "fieldname": "activity_type",
@ -64,6 +29,41 @@
"search_index": 0, "search_index": 0,
"set_only_once": 0 "set_only_once": 0
}, },
{
"fieldname": "column_break_2",
"fieldtype": "Column Break",
"permlevel": 0,
"precision": ""
},
{
"allow_on_submit": 0,
"fieldname": "employee",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Employee",
"no_copy": 0,
"options": "Employee",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0
},
{
"fieldname": "employee_name",
"fieldtype": "Data",
"label": "Employee Name",
"options": "",
"permlevel": 0,
"precision": "",
"read_only": 1
},
{ {
"fieldname": "section_break_4", "fieldname": "section_break_4",
"fieldtype": "Section Break", "fieldtype": "Section Break",
@ -136,7 +136,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-06-11 06:50:47.999788", "modified": "2015-06-16 03:12:25.644839",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Projects", "module": "Projects",
"name": "Activity Cost", "name": "Activity Cost",

23
erpnext/projects/doctype/activity_cost/activity_cost.py
View File

@ -15,12 +15,21 @@ class ActivityCost(Document):
self.check_unique() self.check_unique()
def set_title(self): def set_title(self):
if not self.employee_name: if self.employee:
self.employee_name = frappe.db.get_value("Employee", self.employee, "employee_name") if not self.employee_name:
self.title = _("{0} for {1}").format(self.employee_name, self.activity_type) self.employee_name = frappe.db.get_value("Employee", self.employee, "employee_name")
self.title = _("{0} for {1}").format(self.employee_name, self.activity_type)
else:
self.title = self.activity_type
def check_unique(self): def check_unique(self):
if frappe.db.sql("""select name from `tabActivity Cost` where employee_name= %s and activity_type= %s and name != %s""", if self.employee:
(self.employee_name, self.activity_type, self.name)): if frappe.db.sql("""select name from `tabActivity Cost` where employee_name= %s and activity_type= %s and name != %s""",
frappe.throw(_("Activity Cost exists for Employee {0} against Activity Type - {1}") (self.employee_name, self.activity_type, self.name)):
.format(self.employee, self.activity_type), DuplicationError) frappe.throw(_("Activity Cost exists for Employee {0} against Activity Type - {1}")
.format(self.employee, self.activity_type), DuplicationError)
else:
if frappe.db.sql("""select name from `tabActivity Cost` where employee_name IS NULL and activity_type= %s and name != %s""",
(self.activity_type, self.name)):
frappe.throw(_("Default Activity Cost exists for Activity Type - {0}")
.format(self.activity_type), DuplicationError)

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

@ -272,4 +272,7 @@ def get_events(start, end, filters=None):
def get_activity_cost(employee=None, activity_type=None): def get_activity_cost(employee=None, activity_type=None):
rate = frappe.db.sql("""select costing_rate, billing_rate from `tabActivity Cost` where employee= %s rate = frappe.db.sql("""select costing_rate, billing_rate from `tabActivity Cost` where employee= %s
and activity_type= %s""", (employee, activity_type), as_dict=1) and activity_type= %s""", (employee, activity_type), as_dict=1)
if not rate:
rate = frappe.db.sql("""select costing_rate, billing_rate from `tabActivity Cost` where employee IS NULL
and activity_type= %s""", (activity_type), as_dict=1)
return rate[0] if rate else {} return rate[0] if rate else {}