nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-05 21:29:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'i18n' of git://github.com/bperretti/erpnext into bperretti-i18n

Browse Source
This commit is contained in:
Nabin Hait
2013-10-24 11:40:32 +05:30
parent 3eb901f47d 8833c52c02
commit ca8ad210d2
112 changed files with 677 additions and 617 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hr/doctype/employee/employee.js
View File

@@ -21,7 +21,7 @@ erpnext.hr.EmployeeController = wn.ui.form.Controller.extend({
var me = this;
erpnext.hide_naming_series();
if(!this.frm.doc.__islocal) {
cur_frm.add_custom_button('Make Salary Structure', function() {
cur_frm.add_custom_button(wn._('Make Salary Structure'), function() {
me.make_salary_structure(this); });
}
},