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

month options doesn't get translated.

Browse Source
This commit is contained in:
81552433qqcom 2014-09-12 15:04:10 +08:00 committed by Anand Doshi
parent c5a0ef8399
commit 1c440b3b31
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/hr/doctype/employee/employee.py
View File

@ -200,7 +200,7 @@ def validate_employee_role(doc, method):
# called via User hook # called via User hook
if "Employee" in [d.role for d in doc.get("user_roles")]: if "Employee" in [d.role for d in doc.get("user_roles")]:
if not frappe.db.get_value("Employee", {"user_id": doc.name}): if not frappe.db.get_value("Employee", {"user_id": doc.name}):
frappe.msgprint("Please set User ID field in an Employee record to set Employee Role") frappe.msgprint(_("Please set User ID field in an Employee record to set Employee Role"))
doc.get("user_roles").remove(doc.get("user_roles", {"role": "Employee"})[0]) doc.get("user_roles").remove(doc.get("user_roles", {"role": "Employee"})[0])
def update_user_permissions(doc, method): def update_user_permissions(doc, method):

7
erpnext/public/js/purchase_trends_filters.js
View File

@ -7,7 +7,12 @@ var get_filters = function(){
"fieldname":"period", "fieldname":"period",
"label": __("Period"), "label": __("Period"),
"fieldtype": "Select", "fieldtype": "Select",
"options": ["Monthly", "Quarterly", "Half-Yearly", "Yearly"].join("\n"), "options": [
{ "value": "Monthly", "label": __("Monthly") },
{ "value": "Quarterly", "label": __("Quarterly") },
{ "value": "Half-Yearly", "label": __("Half-Yearly") },
{ "value": "Yearly", "label": __("Yearly") }
],
"default": "Monthly" "default": "Monthly"
}, },
{ {