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

Merge branch 'unicode' of github.com:webnotes/erpnext into unicode

Browse Source
This commit is contained in:
Nabin Hait 2012-09-12 16:15:09 +05:30
commit b146353db2
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/account/account.py
View File

@ -76,6 +76,10 @@ class DocType:
elif par and not self.doc.is_pl_account: elif par and not self.doc.is_pl_account:
self.doc.is_pl_account = par[0][2] self.doc.is_pl_account = par[0][2]
self.doc.debit_or_credit = par[0][3] self.doc.debit_or_credit = par[0][3]
elif self.doc.account_name not in ['Income','Source of Funds (Liabilities)',\
'Expenses','Application of Funds (Assets)']:
msgprint("Parent Account is mandatory", raise_exception=1)
# Account name must be unique # Account name must be unique
def validate_duplicate_account(self): def validate_duplicate_account(self):

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

@ -18,13 +18,13 @@ cur_frm.add_fetch('employee', 'company', 'company');
//get employee's name based on employee id selected //get employee's name based on employee id selected
cur_frm.cscript.employee = function(doc,cdt,cdn){ cur_frm.cscript.employee = function(doc,cdt,cdn){
if(doc.employee) get_server_fields('get_emp_name', '', '', doc, cdt, cdn, 1); if(doc.employee) get_server_fields('get_emp_name', '', '', doc, cdt, cdn, 1);
refresh_field('employee_name'); refresh_field('employee_name');
} }
//Employee //Employee
//----------------------------- //-----------------------------
cur_frm.fields_dict['employee'].get_query = function(doc,cdt,cdn) { cur_frm.fields_dict['employee'].get_query = function(doc,cdt,cdn) {
return 'SELECT `tabEmployee`.`name` FROM `tabEmployee` WHERE `tabEmployee`.status = "Active" AND `tabEmployee`.`docstatus`!= 2 AND `tabEmployee`.%(key)s LIKE "%s" ORDER BY `tabEmployee`.`name` ASC LIMIT 50'; return 'SELECT `tabEmployee`.`name`, `tabEmployee`.`employee_name` FROM `tabEmployee` WHERE `tabEmployee`.status = "Active" AND `tabEmployee`.`docstatus`!= 2 AND (`tabEmployee`.`employee_name` LIKE "%s" OR `tabEmployee`.`%(key)s` LIKE "%s") ORDER BY `tabEmployee`.`name` ASC LIMIT 50';
} }