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

Translations redesigned webnotes/wnframework#351

Browse Source
This commit is contained in:
Rushabh Mehta
2013-12-19 18:27:48 +05:30
parent 91e9822f65
commit 2b08985e16
19 changed files with 715 additions and 1087 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/hr/doctype/expense_claim/expense_claim.js
View File

@@ -104,11 +104,9 @@ cur_frm.cscript.set_help = function(doc) {
} else {
if(doc.docstatus==0 && doc.approval_status=="Draft") {
if(user==doc.exp_approver) {
cur_frm.set_intro(wn._("You are the Expense Approver for this record. \
Please Update the 'Status' and Save"));
cur_frm.set_intro(wn._("You are the Expense Approver for this record. Please Update the 'Status' and Save"));
} else {
cur_frm.set_intro(wn._("Expense Claim is pending approval. \
Only the Expense Approver can update status."));
cur_frm.set_intro(wn._("Expense Claim is pending approval. Only the Expense Approver can update status."));
}
} else {
if(doc.approval_status=="Approved") {

3
erpnext/hr/doctype/leave_application/leave_application.py
View File

@@ -107,8 +107,7 @@ class DocType(DocListController):
self.doc.total_leave_days = self.get_total_leave_days()["total_leave_days"]
if self.doc.total_leave_days == 0:
msgprint(_("Hurray! The day(s) on which you are applying for leave \
coincide with holiday(s). You need not apply for leave."),
msgprint(_("The day(s) on which you are applying for leave coincide with holiday(s). You need not apply for leave."),
raise_exception=1)
if not is_lwp(self.doc.leave_type):

3
erpnext/hr/doctype/salary_structure/salary_structure.py
View File

@@ -60,8 +60,7 @@ class DocType:
ret = webnotes.conn.sql("""select name from `tabSalary Structure` where is_active = 'Yes'
and employee = %s and name!=%s""", (self.doc.employee,self.doc.name))
if ret and self.doc.is_active=='Yes':
msgprint(_("""Another Salary Structure '%s' is active for employee '%s'.
Please make its status 'Inactive' to proceed.""") %
msgprint(_("""Another Salary Structure '%s' is active for employee '%s'. Please make its status 'Inactive' to proceed.""") %
(cstr(ret), self.doc.employee), raise_exception=1)
def validate_amount(self):